fix align close and icon

This commit is contained in:
bechi 2015-04-30 17:57:05 -03:00
commit f37f27adea
3 changed files with 43 additions and 46 deletions

View file

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

View file

@ -414,7 +414,7 @@ ul.manage li {
} }
.tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4, .tab-bar h5, .tab-bar h6 { .tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4, .tab-bar h5, .tab-bar h6 {
line-height: 2.5rem; line-height: 2.7rem;
} }
.sidebar li.nav-item.selected .name-wallet { .sidebar li.nav-item.selected .name-wallet {

View file

@ -40,10 +40,10 @@ body, div, .row {
.inner-wrap { .inner-wrap {
-webkit-transition-duration: 200ms; -webkit-transition-duration: 200ms;
transition-duration: 200ms; transition-duration: 200ms;
-webkit-transition-delay: 0; -webkit-transition-delay: 0;
transition-delay: 0; transition-delay: 0;
} }
body { body {
overflow: hidden; overflow: hidden;
@ -109,11 +109,15 @@ _:-ms-fullscreen, :root .main {
.left-small { .left-small {
width: 4.7rem; width: 4.7rem;
line-height: 2.95rem;
border-right: none;
} }
.right-small { .right-small {
width: 4.7rem; width: 4.7rem;
text-align: right; text-align: right;
line-height: 2.7rem;
border-left: none;
} }
.tab-bar .icon-back { .tab-bar .icon-back {
@ -135,6 +139,7 @@ _:-ms-fullscreen, :root .main {
.tab-bar .text-close { .tab-bar .text-close {
font-size: 1rem; font-size: 1rem;
font-weight: 400; font-weight: 400;
line-height: 2.95rem;
} }
.bottom-bar { .bottom-bar {
@ -229,13 +234,7 @@ ul.copayer-list img {
background-color: #213140; background-color: #213140;
} }
.left-small {
border-right: none;
}
.right-small {
border-left: none;
}
.right-small a, .left-small a { .right-small a, .left-small a {
color: #A5B2BF; color: #A5B2BF;
@ -568,39 +567,39 @@ a.pin-button:active {
.reveal-modal, .reveal-modal,
.reveal-modal .fade, .reveal-modal .fade,
.reveal-modal .fade .out, .reveal-modal .fade .out,
.reveal-modal .fade .in, .reveal-modal .fade .in,
.reveal-modal.fade.full.in, .reveal-modal.fade.full.in,
.reveal-modal.fade.full.out, .reveal-modal.fade.full.out,
.reveal-modal.fade.full, .reveal-modal.fade.full,
input[type="color"], input[type="color"],
input[type="date"], input[type="date"],
input[type="datetime-local"], input[type="datetime-local"],
input[type="datetime"], input[type="datetime"],
input[type="email"], input[type="email"],
input[type="month"], input[type="month"],
input[type="number"], input[type="number"],
input[type="password"], input[type="password"],
input[type="search"], input[type="search"],
input[type="tel"], input[type="tel"],
input[type="text"], input[type="text"],
input[type="time"], input[type="time"],
input[type="url"], input[type="url"],
input[type="week"], input[type="week"],
textarea, textarea,
input[type="text"]:focus, input[type="text"]:focus,
input[type="password"]:focus, input[type="password"]:focus,
input[type="date"]:focus, input[type="date"]:focus,
input[type="datetime"]:focus, input[type="datetime"]:focus,
input[type="datetime-local"]:focus, input[type="datetime-local"]:focus,
input[type="month"]:focus, input[type="month"]:focus,
input[type="week"]:focus, input[type="week"]:focus,
input[type="email"]:focus, input[type="email"]:focus,
input[type="number"]:focus, input[type="number"]:focus,
input[type="search"]:focus, input[type="search"]:focus,
input[type="tel"]:focus, input[type="tel"]:focus,
input[type="time"]:focus, input[type="time"]:focus,
input[type="url"]:focus, input[type="url"]:focus,
input[type="color"]:focus, input[type="color"]:focus,
textarea:focus textarea:focus
{ {
opacity: 1; opacity: 1;
@ -692,10 +691,10 @@ textarea:focus
} }
.animation-left, .animation-right { .animation-left, .animation-right {
position: absolute; position: absolute;
background: #fff; background: #fff;
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
top: 0; top: 0;
left: 0; left: 0;
@ -776,5 +775,3 @@ textarea:focus
/* removes 300ms in IE */ /* removes 300ms in IE */
-ms-touch-action: manipulation; /* IE10 / -ms-touch-action: manipulation; /* IE10 /
touch-action: manipulation; /* IE11+ */ touch-action: manipulation; /* IE11+ */