fix topbar align

This commit is contained in:
bechi 2015-04-30 16:52:27 -03:00
parent 072464f3f8
commit 97fcfdf5fa
7 changed files with 32 additions and 7 deletions

Binary file not shown.

View File

@ -49,7 +49,7 @@
<glyph unicode="&#xe627;" d="M1024 448c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 282.77 229.23 512 512 512s512-229.23 512-512z" />
<glyph unicode="&#xe628;" d="M921.6 819.2h-489.165c-22.528 0-54.835-12.134-71.782-26.982l-347.955-304.435c-16.947-14.848-16.947-39.117 0-53.965l347.955-304.486c16.947-14.797 49.254-26.931 71.782-26.931h489.165c56.371 0 102.4 46.080 102.4 102.4v512c0 56.32-46.029 102.4-102.4 102.4zM777.779 256l-130.918 130.918-130.816-130.918-73.933 73.882 130.867 130.918-130.867 130.867 73.933 73.933 130.867-130.867 130.867 130.867 73.882-73.933-130.816-130.867 130.867-130.867-73.933-73.933z" />
<glyph unicode="&#xe629;" d="M536.381-88.381c-297.448 0-536.381 238.933-536.381 536.381s238.933 536.381 536.381 536.381 536.381-238.933 536.381-536.381c0-297.448-238.933-536.381-536.381-536.381zM536.381 935.619c-268.19 0-487.619-219.429-487.619-487.619s219.429-487.619 487.619-487.619c268.19 0 487.619 219.429 487.619 487.619s-219.429 487.619-487.619 487.619z" horiz-adv-x="1073" />
<glyph unicode="&#xe62a;" d="M0 846.222v-227.556h113.778v227.556h227.556v113.778h-227.556c-62.578 0-113.778-51.2-113.778-113.778v0zM113.778 277.333h-113.778v-227.556c0-62.578 51.2-113.778 113.778-113.778h227.556v113.778h-227.556v227.556zM910.222 49.778h-227.556v-113.778h227.556c62.578 0 113.778 51.2 113.778 113.778v227.556h-113.778v-227.556zM910.222 960h-227.556v-113.778h227.556v-227.556h113.778v227.556c0 62.578-51.2 113.778-113.778 113.778v0zM631.467 430.933h-102.4v-102.4h-34.133v102.4h-102.4v34.133h102.4v102.4h34.133v-102.4h102.4v-34.133z" />
<glyph unicode="&#xe62a;" d="M102.030 745.532v-182.209h91.103v182.209h182.209v91.103h-182.209c-50.108 0-91.103-40.997-91.103-91.103v0zM193.135 290.010h-91.103v-182.209c0-50.108 40.997-91.104 91.103-91.104h182.209v91.104h-182.209v182.209zM830.865 107.802h-182.209v-91.103h182.209c50.108 0 91.103 40.997 91.103 91.103v182.209h-91.103v-182.209zM830.865 836.637h-182.209v-91.103h182.209v-182.209h91.103v182.209c0 50.108-40.997 91.103-91.103 91.103v0zM607.66 413.002h-81.995v-81.995h-27.331v81.995h-81.995v27.331h81.995v81.995h27.331v-81.995h81.995v-27.331z" horiz-adv-x="1013" />
<glyph unicode="&#xe62b;" d="M512 896c-247.4 0-448-200.6-448-448s200.6-448 448-448c247.4 0 448 200.6 448 448s-200.6 448-448 448zM741.8 597.8l-278.2-357c-2.2-2.2-5.8-7-10.2-7-4.6 0-7.6 3.2-10.2 5.8s-157.8 151.8-157.8 151.8l-3 3c-1.2 1.8-2.2 4-2.2 6.4s1 4.6 2.2 6.4c0.8 0.8 1.4 1.4 2.2 2.4 15.4 16.2 46.6 49 48.6 51 2.6 2.6 4.8 6 9.6 6 5 0 8.2-4.2 10.6-6.6s90-86.6 90-86.6l222.6 286c2 1.6 4.4 2.8 7 2.8s5-1 7-2.6l61.2-48.2c1.6-2 2.6-4.4 2.6-7 0.2-2.6-0.8-4.8-2-6.6z" />
<glyph unicode="&#xe62c;" d="M512 896c-247.4 0-448-200.6-448-448s200.6-448 448-448 448 200.6 448 448-200.6 448-448 448zM768 416h-512v64h512v-64z" />
<glyph unicode="&#xe62d;" d="M512 896c-247.4 0-448-200.6-448-448s200.6-448 448-448 448 200.6 448 448-200.6 448-448 448zM768 416h-224v-224h-64v224h-224v64h224v224h64v-224h224v-64z" />

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
<nav ng-controller="topbarController as topbar" class="tab-bar">
<section class="left-small">
<a id="hamburger" class="p10 ng-animate-disabled" ng-show="!goBackToState && !closeToHome && !index.noFocusedWallet"
ng-click="index.openMenu()"><i class="fi-list size-24"></i>
ng-click="index.openMenu()"><i class="fi-list size-24 vt"></i>
</a>
<a ng-show="goBackToState" class="ng-animate-disabled"
ng-click="$root.go(goBackToState); goBackToState = null"><i class="icon-arrow-left3 icon-back"></i>
@ -11,7 +11,7 @@
<section class="right-small" ng-show="!goBackToState">
<a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
ng-click="topbar.openScanner()"><i class="icon-scan size-21 vt"></i></a>
<a ng-show="closeToHome" class="p10 ng-animate-disabled"
ng-click="topbar.goHome(); closeToHome = null">
<span class="text-close">{{'Close'|translate}}</span>

View File

@ -40,10 +40,6 @@
content: "\e62b";
}
.icon-scan:before {
content: "\e62a";
}
.icon-circle:before {
content: "\e629";
}
@ -52,6 +48,30 @@
content: "\e627";
}
.icon-scan:before {
content: "\e62a";
}
.icon-trash:before {
content: "\e626";
}
.icon-wallet:before {
content: "\e622";
}
.icon-history:before {
content: "\e623";
}
.icon-reference:before {
content: "\e621";
}
.icon-bell:before {
content: "\e61c";
}
.icon-trash:before {
content: "\e626";
}

View File

@ -384,6 +384,7 @@ ul.manage li {
.lh140 {line-height: 140%;}
.oh {overflow:hidden;}
.vm {vertical-align: middle;}
.vt {vertical-align: top;}
.ma { margin: 0 auto;}
.tu {text-transform: uppercase;}
@ -412,6 +413,10 @@ ul.manage li {
font-weight: 300;
}
.tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4, .tab-bar h5, .tab-bar h6 {
line-height: 2.5rem;
}
.sidebar li.nav-item.selected .name-wallet {
font-weight: 700;
}