diff --git a/css/src/icons.css b/css/src/icons.css index 914f2857c..6395244b7 100644 --- a/css/src/icons.css +++ b/css/src/icons.css @@ -50,6 +50,78 @@ -moz-osx-font-smoothing: grayscale; } +.icon-trash:before { + content: "\e626"; +} +.icon-history:before { + content: "\e623"; +} +.icon-reference:before { + content: "\e621"; +} +.icon-bell:before { + content: "\e61c"; +} +.icon-receive:before { + content: "\e625"; +} +.icon-wrench:before { + content: "\e61d"; +} +.icon-download:before { + content: "\e61e"; +} +.icon-upload:before { + content: "\e61f"; +} +.icon-power:before { + content: "\e620"; +} +.icon-forward:before { + content: "\e624"; +} +.icon-wallet:before { + content: "\e622"; +} +.icon-compose:before { + content: "\e610"; +} +.icon-contact:before { + content: "\e611"; +} +.icon-email:before { + content: "\e612"; +} +.icon-gear:before { + content: "\e613"; +} +.icon-home:before { + content: "\e614"; +} +.icon-locked:before { + content: "\e615"; +} +.icon-paperplane:before { + content: "\e617"; +} +.icon-people:before { + content: "\e618"; +} +.icon-person:before { + content: "\e619"; +} +.icon-pricetag:before { + content: "\e61a"; +} +.icon-pricetags:before { + content: "\e61b"; +} +.icon-bitcoin:before { + content: "\e60f"; +} +.icon-usd:before { + content: "\e616"; +} .icon-arrow-left:before { content: "\e600"; } diff --git a/css/src/main.css b/css/src/main.css index 68a8abb54..cbfa2f220 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -159,10 +159,12 @@ header .alt-currency { .head .menu ul li a { display: block; padding: 5px 10px; + color: #8597A7; } .head .menu ul li a:hover { - background-color: #fff; + background-color: #F8F8FB; + color: #2C3E50; } .col1 { @@ -949,6 +951,7 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e -moz-box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05); box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05); border: none; + padding-left: 45px; } button.secondary, @@ -1180,13 +1183,22 @@ button.gray:focus, width: 38px; height: 28px; right: 7px; - top: 28px; + top: 7px; -moz-box-shadow: none; box-shadow: none; line-height: 1.7rem; border-radius: 2px; } +.postfix.button i, .prefix.button i { + left: 12px; + top: 0; + border: none; + -moz-box-shadow: none; + box-shadow: none; + color: #fff; +} + label.postfix, span.postfix { height: 40px; border: none; @@ -1291,6 +1303,21 @@ a:hover .photo-container { float: left; } +.input { position: relative;} + +.input i { + position: absolute; + top: 10px; + left: 10px; + font-size: 20px; + color: #7A8C9E; + border-right: 1px solid #ccc; + padding-right: 8px; + border-right: 1px solid #E5E8EB; + -moz-box-shadow: 1px 0px 0px 0px #FFFFFF; + box-shadow: 1px 0px 0px 0px #FFFFFF; +} + .icon-input { font-size: 9px; color: #fff; diff --git a/font/icomoon.eot b/font/icomoon.eot index b8ff229bc..19b49bb20 100755 Binary files a/font/icomoon.eot and b/font/icomoon.eot differ diff --git a/font/icomoon.svg b/font/icomoon.svg index 5504c7b77..fb732957e 100755 --- a/font/icomoon.svg +++ b/font/icomoon.svg @@ -22,4 +22,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/font/icomoon.ttf b/font/icomoon.ttf index 3ac922071..3e6866512 100755 Binary files a/font/icomoon.ttf and b/font/icomoon.ttf differ diff --git a/font/icomoon.woff b/font/icomoon.woff index 86fcfb928..5872bef2a 100755 Binary files a/font/icomoon.woff and b/font/icomoon.woff differ diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 4ee22cc00..e64de73db 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -4,23 +4,23 @@ angular.module('copayApp.controllers').controller('SidebarController', function( $scope.menu = [{ 'title': 'Home', - 'icon': 'fi-home', + 'icon': 'icon-home', 'link': 'homeWallet' }, { 'title': 'Receive', - 'icon': 'fi-download', + 'icon': 'icon-receive', 'link': 'receive' }, { 'title': 'Send', - 'icon': 'fi-arrow-right', + 'icon': 'icon-paperplane', 'link': 'send' }, { 'title': 'History', - 'icon': 'fi-clipboard-pencil', + 'icon': 'icon-history', 'link': 'history' }, { 'title': 'Settings', - 'icon': 'fi-widget', + 'icon': 'icon-gear', 'link': 'more' }]; diff --git a/views/create.html b/views/create.html index 8eb69a1bf..b7ff312ff 100644 --- a/views/create.html +++ b/views/create.html @@ -21,7 +21,10 @@
diff --git a/views/createProfile.html b/views/createProfile.html index 776deab6b..dd034d5ff 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -28,27 +28,31 @@
-
-
- - - - Not valid - - - -
- +
+ + + + Not valid + + +
+
+ +
- - -
+ +
+ + +
+ +
@@ -56,12 +60,16 @@ {{'Passwords must match'|translate}} - + !profileForm.repeatpassword.$invalid">
+
+ + +
+
{{username}} - + -
diff --git a/views/join.html b/views/join.html index b7bd203e6..cbd22bce7 100644 --- a/views/join.html +++ b/views/join.html @@ -33,10 +33,11 @@ +
- -
- +
+ +
 
@@ -48,9 +49,8 @@
- -
+ ng-include="'views/includes/scanner.html'"> +
diff --git a/views/modals/address-book.html b/views/modals/address-book.html index f490ec877..994c9be8c 100644 --- a/views/modals/address-book.html +++ b/views/modals/address-book.html @@ -1,21 +1,28 @@

Address Book

- - - - Not valid - - - - + + + + Not valid + + +
+
+ + +
Cancel - -
- -
- -
-
- -
-
- -
-
+
+ + +
+ +
+
+ +
+
+ +
+
+ +
@@ -80,20 +82,22 @@ -
+
- +
+ + +
Use all funds {{$root.wallet.settings.unitName}}
-
{{$root.wallet.settings.unitName}}
@@ -103,12 +107,12 @@
- +
+ + +
{{alternativeIsoCode}} @@ -158,8 +162,11 @@ optional too long! - + +
diff --git a/views/settings.html b/views/settings.html index bdbe204c4..9c2d20fdd 100644 --- a/views/settings.html +++ b/views/settings.html @@ -22,19 +22,29 @@
Insight API server - +
+
Not valid
- - - -
- - Not valid
- +
+ + +
+ +
+ +
+ + Not valid +
+
+
+ + +
Insight API server is open-source software. You can run your own instances, check Insight API Homepage @@ -63,7 +73,7 @@
- + Back