Fix empty space in menu bar with one addon

This commit is contained in:
Kosta Korenkov 2015-09-01 06:52:54 +03:00
parent deba8f12af
commit dcafad99a7
3 changed files with 20 additions and 18 deletions

View File

@ -0,0 +1,9 @@
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}" id="menu-{{item.link}}">
<i class="size-24 {{item.icon}} db"></i>
<div class="size-10 tu">
{{ item.title|translate }}
<span class="label alert round" ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">
{{ index.pendingTxProposalsCountForUs }}
</span>
</div>
</a>

View File

@ -1,11 +1,6 @@
<div class="bottom-bar second-bottom-bar row collapse animated slideInRight" ng-class="{ 'slideOutRight': !showPlugins }" ng-show="index.menu.length > 6">
<div class="medium-{{index.menuItemSize}} small-{{index.menuItemSize}} columns text-center bottombar-item" ng-repeat="item in index.menu | limitTo: 5 - index.menu.length">
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}" id="menu-{{item.link}}">
<i class="size-24 {{item.icon}} db"></i>
<div class="size-10 tu">
{{item.title|translate}}
</div>
</a>
<span ng-include="'views/includes/menu-item.html'"/>
</div>
<div class="medium-{{index.menuItemSize}} small-{{index.menuItemSize}} columns text-center bottombar-item" ng-repeat="n in index.menu | limitTo: 4 - index.menu.length % 6">
<a></a>
@ -15,23 +10,21 @@
</div>
<div class="bottom-bar row collapse">
<div class="medium-{{index.menuItemSize}} small-{{index.menuItemSize}} columns text-center bottombar-item" ng-repeat="item in index.menu | limitTo: (index.menu.length > 6 ? 5 : 6)">
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}" id="menu-{{item.link}}">
<i class="size-24 {{item.icon}} db"></i>
<div class="size-10 tu">
{{item.title|translate}}
<span
class="label alert round"
ng-if="item.link=='walletHome' && index.pendingTxProposalsCountForUs > 0">{{index.pendingTxProposalsCountForUs}}</span>
<div ng-class="{ 'medium-10 small-10 columns': index.menu.length == 5 }">
<div class="row collapse">
<div class="medium-{{index.menuItemSize}} small-{{index.menuItemSize}} columns text-center bottombar-item"
ng-repeat="item in index.menu | limitTo: (index.menu.length > 6 ? 5 : (index.menu.length == 5 ? 4 : index.menu.length))">
<span ng-include="'views/includes/menu-item.html'"/>
</div>
<menu-toggle ng-show="index.menu.length > 6"/>
</div>
</a>
</div>
<div class="medium-2 small-2 columns text-center bottombar-item" ng-show="index.menu.length == 5">
<a></a>
<span ng-include="'views/includes/menu-item.html'" ng-init="item = index.menu[4]"/>
</div>
<menu-toggle ng-show="index.menu.length > 6"/>
</div>

View File

@ -34,7 +34,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.addonViews = addonManager.addonViews();
self.menu = self.menu.concat(addonManager.addonMenuItems());
self.menuItemSize = self.menu.length > 4 ? 2 : 3;
self.menuItemSize = self.menu.length > 5 ? 2 : 3;
self.tab = 'walletHome';