anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2659 from bechi/layout-details-14

Browse source 
Layout details 14
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-30 18:21:34 -03:00
commit 9b7be559f1
14 changed files with 133 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
public/font/icomoon.eot
View file

Binary file not shown.

10
public/font/icomoon.svg
View file

@ -46,7 +46,13 @@
<glyph unicode="&#xe624;" d="M449.248 577.472v318.528l-449.248-448 449.248-448v321.344c228.32 0 453.664-39.744 574.752-228.352-12.608 343.712-269.76 425.536-574.752 484.48z" />
<glyph unicode="&#xe625;" d="M680.75 729.25h-337.5l-281.25-337.5v-225.001c0-31.066 25.184-56.25 56.25-56.25h787.5c31.068 0 56.25 25.184 56.25 56.25v225.001l-281.25 337.5zM737.001 391.75l-112.5-112.5h-225.001l-112.5 112.5h-151.778l234.374 281.25h284.807l234.374-281.25h-151.778z" />
<glyph unicode="&#xe626;" d="M362.451 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.614q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.614q7.572 0 12.44 4.868t4.868 12.44zM500.913 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.615q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.615q7.572 0 12.44 4.868t4.868 12.44zM639.374 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.615q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.615q7.572 0 12.44 4.868t4.868 12.44zM345.143 724.923h242.307l-25.962 63.281q-3.787 4.868-9.194 5.95h-171.455q-5.408-1.082-9.194-5.95zM847.067 707.615v-34.615q0-7.572-4.868-12.44t-12.44-4.868h-51.923v-512.739q0-44.892-25.42-77.615t-61.117-32.722h-450q-35.697 0-61.117 31.641t-25.42 76.533v514.904h-51.923q-7.572 0-12.44 4.868t-4.868 12.44v34.615q0 7.572 4.868 12.44t12.44 4.868h167.126l37.861 90.325q8.112 20.012 29.207 34.074t42.728 14.063h173.077q21.635 0 42.728-14.063t29.207-34.074l37.861-90.325h167.126q7.572 0 12.44-4.868t4.868-12.44z" horiz-adv-x="933" />
<glyph unicode="&#xe627;" d="M1024 463.238c0-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="&#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-73.143c-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 950.857c-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="&#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="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" />
<glyph unicode="&#xe62e;" d="M512 894c-247.4 0-448-200.6-448-448s200.6-448 448-448c247.4 0 448 200.6 448 448s-200.6 448-448 448zM728.6 295c3-3 4.6-7 4.6-11.2s-1.6-8.4-4.6-11.2l-43.2-43.4c-3.2-3.2-7.2-4.6-11.2-4.6s-8.2 1.6-11.2 4.6l-151 151.2-150.8-151.4c-3-3.2-7.2-4.6-11.2-4.6s-8.2 1.6-11.2 4.6l-43.2 43.4c-3 3-4.6 7-4.6 11.2s1.6 8.4 4.6 11.2l151.4 152-151.8 150c-6.2 6.2-6.2 16.4 0 22.6l43.2 43.4c3 3 7 4.6 11.2 4.6s8.2-1.6 11.2-4.6l151.4-149.4 151.4 149.4c3 3 7 4.6 11.2 4.6s8.2-1.6 11.2-4.6l43.2-43.4c6.2-6.2 6.2-16.4 0-22.6l-151.8-150 151.2-151.8z" />
<glyph unicode="&#xe62f;" d="M990.208 279.347l-163.021 109.67h-100.506l174.080-133.53h-181.504c-5.222 0-9.882-2.662-12.288-6.81l-41.779-114.432h-306.381l-41.83 114.432c-2.304 4.147-7.066 6.81-12.288 6.81h-181.453l174.131 133.53h-100.557l-162.97-109.67c-24.269-14.49-38.758-47.923-32.256-74.189l28.723-157.389c6.502-26.317 35.379-47.872 64.051-47.872h835.226c28.774 0 57.6 21.555 64.102 47.872l28.723 157.389c6.605 26.317-7.936 59.699-32.205 74.189zM778.291 608.154h-169.011v262.144h-194.56v-262.144h-168.96l266.24-249.856 266.291 249.856z" />
</font></defs></svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Before After
Before After

BIN
public/font/icomoon.ttf
View file

Binary file not shown.

BIN
public/font/icomoon.woff
View file

Binary file not shown.

BIN
public/img/logo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

5
public/views/includes/menu.html
View file

@ -1,7 +1,7 @@
<div class="bottom-bar row collapse">
<div class="medium-3 small-3 columns text-center bottombar-item" ng-repeat="item in index.menu">
<a ng-click="index.setTab(item.link)" ng-class="{'active': index.tab == item.link}" id="menu-{{item.link}}">
<i class="size-36 {{item.icon}} db"></i>
<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
@ -11,4 +11,3 @@
</a>
</div>
</div>

6
public/views/includes/topbar.html
View file

@ -1,6 +1,6 @@
<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"
<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>
</a>
<a ng-show="goBackToState" class="ng-animate-disabled"
@ -10,8 +10,8 @@
</section>
<section class="right-small" ng-show="!goBackToState">
<a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="fi-camera size-24"></i></a>
<a id="camera-icon" ng-show="!closeToHome && index.isComplete" class="p10"
ng-click="topbar.openScanner()"><i class="icon-scan size-21"></i></a>
<a ng-show="closeToHome" class="p10 ng-animate-disabled"
ng-click="topbar.goHome(); closeToHome = null">
<span class="text-close">{{'Close'|translate}}</span>

23
public/views/join.html
View file

@ -20,7 +20,7 @@
{{join.error|translate}}
</span>
</div>
<form name="joinForm" ng-submit="join.join(joinForm)" novalidate>
<label><span translate>Your nickname</span>
<div class="input">
@ -29,7 +29,7 @@
</label>
<div class="row collapse">
<label for="secret" class="left"><span translate>Wallet Invitation</span>
<label for="secret" class="left"><span translate>Wallet Invitation</span>
<small translate ng-show="joinForm.secret.$pristine">Required</small>
</label>
<span class="has-error right size-12" ng-show="joinForm.secret.$invalid
@ -44,34 +44,34 @@
<div class="input">
<input id="secret" type="text" placeholder="{{'Paste invitation here'|translate}}" name="secret" ng-model="secret" wallet-secret required>
<div ng-hide="showScanner || disableScanner">
<a class="postfix" ng-click="join.openScanner()"><i class="fi-camera size-24">&nbsp;</i></a>
<a class="postfix text-right" ng-click="join.openScanner()"><i class="icon-scan size-18">&nbsp;</i></a>
</div>
<div ng-show="showScanner">
<a class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x">&nbsp;</i></a>
</div>
</div>
<div id="scanner"
class="row"
<div id="scanner"
class="row"
ng-if="showScanner"
ng-include="'views/includes/scanner.html'">
</div>
<a class="button outline light-gray tiny expand" ng-click="join.hideAdv=!join.hideAdv">
<i class="fi-widget m3r"></i>
<span translate ng-show="!join.hideAdv">Show</span>
<span translate ng-show="join.hideAdv">Hide</span>
<span translate ng-show="!join.hideAdv">Show</span>
<span translate ng-show="join.hideAdv">Hide</span>
<span translate>advanced options</span>
<i ng-show="!join.hideAdv" class="icon-arrow-down4"></i>
<i ng-show="join.hideAdv" class="icon-arrow-up4"></i>
</a>
<div ng-show="join.hideAdv" class="row">
<div class="large-12 columns">
<label for="ext-master">Master extended private key
<label for="ext-master">Master extended private key
<small translate>If not given, a secure key will be generated</small>
<input id="ext-master"
type="text"
placeholder="BIP32 master extended private key"
<input id="ext-master"
type="text"
placeholder="BIP32 master extended private key"
name="privateKey" ng-model="privateKey">
</label>
</div>
@ -83,4 +83,3 @@
</div>
<div class="extra-margin-bottom"></div>

3
public/views/splash/1.html
View file

@ -3,7 +3,7 @@
<div class="medium-6 large-4 medium-centered small-centered large-centered columns">
<div class="m50b p20">
<h4 class="text-bold size-14" translate>WELCOME TO</h4>
<img src="img/logo.svg" alt="tour1" width="100">
<img src="img/logo.png" alt="tour1" width="100">
</div>
<div class="line-b"></div>
<span class="text-gray size-14 db m10b m10t" translate>
@ -16,4 +16,3 @@
<button ng-click="$root.go('createProfile')" class="button black expand radius " translate> START </button>
</div>
</div>

18
public/views/walletHome.html
View file

@ -277,13 +277,11 @@
<span ng-hide="sendForm.address.$pristine">
<span class="has-error right size-12" ng-show="sendForm.address.$invalid && _address">
<span class="icon-input">
<i class="fi-x"></i>
</span>
<span translate>Not valid</span>
<i class="icon-close-circle size-14"></i>
<span class="vm" translate>Not valid</span>
</span>
<small class="icon-input right" ng-show="!sendForm.address.$invalid">
<i class="fi-check"></i>
<small class="right text-primary" ng-show="!sendForm.address.$invalid">
<i class="icon-checkmark-circle size-14"></i>
</small>
</span>
</div>
@ -311,11 +309,11 @@
<div class="large-12 medium-12 columns">
<div class="right" ng-hide="sendForm.amount.$pristine && !sendForm.amount.$modelValue ">
<span class="has-error right size-12" ng-if="sendForm.amount.$invalid">
<span class="icon-input"><i class="fi-x"></i></span>
<span translate>Not valid</span>
<i class="icon-close-circle size-14"></i>
<span clas="vm" translate>Not valid</span>
</span>
<small class="icon-input right" ng-if="!sendForm.amount.$invalid">
<i class="fi-check"></i>
<small class="text-primary right" ng-if="!sendForm.amount.$invalid">
<i class="icon-checkmark-circle size-14"></i>
</small>
</div>
<div ng-if="!home.canShowAlternative()">

44
src/css/icons.css
View file

@ -24,6 +24,22 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-minus-circle:before {
content: "\e62c";
}
.icon-plus-circle:before {
content: "\e62d";
}
.icon-close-circle:before {
content: "\e62e";
}
.icon-checkmark-circle:before {
content: "\e62b";
}
.icon-circle:before {
content: "\e629";
}
@ -32,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";
}
@ -132,6 +172,10 @@
content: "\e628";
}
.icon-receive2:before {
content: "\e62f";
}
.icon-arrow-left:before {
content: "\e600";
}

11
src/css/main.css
View file

@ -41,7 +41,7 @@ h4.title {
text-transform: uppercase;
color: #2C3E50;
font-weight: 700;
font-size: 0.8rem;
font-size: 0.7rem;
}
body, html{
@ -140,7 +140,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.main {
background-color: #fff;
padding: 45px 0 80px 0;
padding: 45px 0 58px 0;
position: relative;
}
@ -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.7rem;
}
.sidebar li.nav-item.selected .name-wallet {
font-weight: 700;
}
@ -550,7 +555,7 @@ label {
font-weight: 700;
font-size: 11px;
color: #34495E;
margin-bottom: 2px;
margin-bottom: 3px;
}
button.radius, .button.radius {

90
src/css/mobile.css
View file

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

8
src/js/controllers/index.js
View file

@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
'link': 'walletHome'
}, {
'title': gettext('Receive'),
'icon': 'icon-receive',
'icon': 'icon-receive2',
'link': 'receive'
}, {
'title': gettext('Send'),
@ -82,7 +82,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.noFocusedWallet = false;
self.onGoingProcess = {};
// Credentials Shortcuts
// Credentials Shortcuts
self.m = fc.credentials.m;
self.n = fc.credentials.n;
self.network = fc.credentials.network;
@ -567,7 +567,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}, 4000, {leading: false, trailing: true});
// No need ot listing to Local/Resume since
// No need ot listing to Local/Resume since
// reconnection and Local/Online will be triggered
lodash.each(['Local/Online', 'Local/Resume'], function(eventName) {
$rootScope.$on(eventName, function(event) {
@ -720,7 +720,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
lodash.each(['NewCopayer', 'CopayerUpdated'], function(eventName) {
$rootScope.$on(eventName, function() {
// Re try to open wallet (will triggers)
// Re try to open wallet (will triggers)
self.setFocusedWallet();
});
});