Skip to content

Commit

Permalink
Merge pull request #75 from tomaszrondio/master
Browse files Browse the repository at this point in the history
fix: last new UI issues
  • Loading branch information
takeit authored Nov 22, 2018
2 parents d42f960 + 13d980c commit 6536555
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions client/views/settings/website-management/manage.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2 class="sd-page__page-heading">{{webPublisherSettings.selectedSite.name}}</h2
translate>Save</button>
</div>
</div>
<div class="sd-page__content sd-page__content--d-flex-column no-padding">
<div class="sd-page__content sd-display-flex-column sd-page__content--d-flex-column no-padding">
<ul class="nav-tabs">
<li ng-class="{'nav-tabs__tab--active': !webPublisherSettings.manageTab || webPublisherSettings.manageTab === 'general'}" class="nav-tabs__tab">
<button ng-click="webPublisherSettings.changeManageTab('general')"
Expand Down Expand Up @@ -62,19 +62,19 @@ <h2 class="sd-page__page-heading">{{webPublisherSettings.selectedSite.name}}</h2
class="nav-tabs__link"><span translate="">Theme Customization</span></button>
</li>
</ul>
<div class="nav-tabs__content no-padding relative">
<div class="sd-loader" ng-if="webPublisherSettings.loading"></div>
<div class="nav-tabs__content no-padding relative sd-display-flex-column">
<div class="sd-loader" ng-if="webPublisherSettings.loading"></div>
<div ng-if="!webPublisherSettings.manageTab || webPublisherSettings.manageTab === 'general'"
class="nav-tabs__pane nav-tabs__pane--padding"
ng-include="'settings/website-management/manage-general.html'">
</div>
<div ng-if="webPublisherSettings.manageTab === 'routes'" class="nav-tabs__pane"
<div ng-if="webPublisherSettings.manageTab === 'routes'" class="nav-tabs__pane sd-display-flex-column"
ng-include="'settings/website-management/manage-routes.html'">
</div>
<div ng-if="webPublisherSettings.manageTab === 'navigation'" class="nav-tabs__pane"
<div ng-if="webPublisherSettings.manageTab === 'navigation'" class="nav-tabs__pane sd-display-flex-column"
ng-include="'settings/website-management/manage-navigation.html'">
</div>
<div ng-if="webPublisherSettings.manageTab === 'navigation-menu'" class="nav-tabs__pane"
<div ng-if="webPublisherSettings.manageTab === 'navigation-menu'" class="nav-tabs__pane sd-display-flex-column"
ng-include="'settings/website-management/manage-navigation-menu.html'">
</div>
<div ng-if="webPublisherSettings.manageTab === 'theme-settings'" class="nav-tabs__pane"
Expand Down

0 comments on commit 6536555

Please sign in to comment.