From 4e144cf907cee7bad756b794a7436cb29929a11e Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 23 Jan 2015 17:12:00 -0300 Subject: [PATCH 1/7] change notification styles --- css/src/main.css | 79 ++++++++++++++++++++++------------------------ css/src/mobile.css | 9 ++---- 2 files changed, 41 insertions(+), 47 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index 3374c92cc..f975dc348 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -724,7 +724,7 @@ input[type=number]::-webkit-outer-spin-button { } .dr-notification-container.top { - top: 60px; + top: 70px; } .dr-notification-container.center { @@ -733,44 +733,40 @@ input[type=number]::-webkit-outer-spin-button { } .dr-notification-wrapper { - width: 400px; + width: 375px; position: relative; margin: 0 0 1px 0; } -.dr-notification { - width: 400px; - clear: both; - overflow: hidden; -} - .dr-notification-close-btn { - -webkit-border-radius: 20px; - -moz-border-radius: 20px; - -ms-border-radius: 20px; - border-radius: 20px; + color: #A5B2BF; + border: 1px solid #CED5DC; + border-radius: 100%; display: inline-block; - padding: 5px; + padding: 4px 7px; font-size: 18px; position: absolute; right: 5px; top: 5px; cursor: pointer; z-index: 10; + margin: 13px 8px 0; } .dr-notification-image { float: left; display: block; - font-size: 40px; + padding: 0.8rem; color: white; text-align: center; - border-right: 1px dashed #415970; } .dr-notification-image i { + height: 40px; + width: 40px; + padding: 0.3rem 0.5rem; display: block; - width: 100%; - padding: 20px; + border-radius: 100%; + font-size: 30px; } .dr-notification-image img { margin: 15px; @@ -779,48 +775,48 @@ input[type=number]::-webkit-outer-spin-button { } .dr-notification-content { - padding-left: 80px; - padding-right: 30px; - padding-top: 5px; - padding-bottom: 5px; + padding: 7px 70px 5px 65px; } .dr-notification-title { - color: white; + color: #4B6178; padding: 0px; font-size: 16px; - margin-top: 0; + margin-bottom: 3px; + font-weight: 700; } .dr-notification { - background-color: #34495E; - color: #eee; - border: 1px solid #2C3E50; -} -.dr-notification-close-btn { - background-color: #34495E; - color: #fff; - border: 1px solid #3C5269; + background: rgba(255,255,255,0.90); + box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.20); + width: 400px; + clear: both; + overflow: hidden; + border-radius: 3px 0 0 3px; } -.dr-notification-image.dr-notification-type-info { - color: #FFF; +.dr-notification-image.dr-notification-type-funds i { + background-color: #7A8C9E; } -.dr-notification-image.dr-notification-type-warning { - color: #FFA226; +.dr-notification-image.dr-notification-type-info i { + background-color: #7A8C9E; } -.dr-notification-image.dr-notification-type-error { - color: #FF4B4F; +.dr-notification-image.dr-notification-type-warning i { + background-color: #FFA226; } -.dr-notification-image.dr-notification-type-success { - color: #1ABC9C; +.dr-notification-image.dr-notification-type-error i { + background-color: #FF4B4F; } -.dr-notification-image.success { - color: #1ABC9C; +.dr-notification-image.dr-notification-type-success i { + background-color: #1ABC9C; +} + +.dr-notification-image.success i { + background-color: #1ABC9C; } .success { @@ -875,6 +871,7 @@ input[type=number]::-webkit-outer-spin-button { .dr-notification-text { font-size: 12px; line-height: 120%; + color: #7A8C9E; } .ellipsis { diff --git a/css/src/mobile.css b/css/src/mobile.css index f9b1f3e20..8d3fad6d3 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -369,6 +369,7 @@ .dr-notification { width: 100%; + border-radius: 0; } .dr-notification-container { @@ -393,12 +394,8 @@ } .dr-notification-text { - font-size: 10px; - line-height: 100%; - } - - .dr-notification-image i { - padding: 15px; + font-size: 12px; + line-height: 120%; } } From 40ec1142bd68069d69d195a213b5f3813bf65af8 Mon Sep 17 00:00:00 2001 From: bechi Date: Fri, 23 Jan 2015 17:28:15 -0300 Subject: [PATCH 2/7] remove shadow for mobile --- css/src/mobile.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/src/mobile.css b/css/src/mobile.css index 8d3fad6d3..e6ca4b22a 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -370,6 +370,8 @@ .dr-notification { width: 100%; border-radius: 0; + box-shadow: none; + border-bottom: 2px solid #E4E8EC; } .dr-notification-container { From fd0502ee0a3dd7746c9adc215aab8e8ad0e3d850 Mon Sep 17 00:00:00 2001 From: bechi Date: Wed, 28 Jan 2015 17:59:26 -0300 Subject: [PATCH 3/7] fix outline button style --- css/src/main.css | 45 +++++++++++++++++++++++++--------------- css/src/mobile.css | 11 ---------- views/create.html | 2 +- views/createProfile.html | 6 +++--- views/home.html | 14 ++++++------- views/import.html | 2 +- views/importProfile.html | 4 ++-- views/join.html | 2 +- views/more.html | 2 +- views/profile.html | 2 +- views/settings.html | 6 +++--- 11 files changed, 47 insertions(+), 49 deletions(-) diff --git a/css/src/main.css b/css/src/main.css index f975dc348..75844c607 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -534,23 +534,6 @@ ul.tx-copayers { background-color: #213140; } -a.button-setup { - border-radius: 3px; - border: 1px solid #ccc; - display: block; - padding: 0.5rem; - background: transparent; - color: #A0A3A6; -} - -.createProfile a.button-setup, .home a.button-setup, .settings a.button-setup, .import-profile a.button-setup { - border-radius: 3px; - border: 1px solid #3E5366; - display: block; - padding: 0.5rem; - background: transparent; -} - .dn {display: none;} .dni {display: none !important;} .pr {position: relative;} @@ -989,6 +972,34 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e font-size: 13px; } +/*//////////////////////////// BUTTON OUTLINE ////////////////////////////*/ + +.button.outline { + border-radius: 3px; + background: transparent; + text-transform: none; +} + +.button.outline.dark-gray { + border: 1px solid #A5B2BF; + color: #A5B2BF; +} + +.button.outline.light-gray { + border: 1px solid #CED5DC; + color: #7A8C9E; +} + +.button.outline.light-gray:hover { + background: rgba(206,213,220,0.40); + color: #4B6178; +} + +.button.outline.dark-gray:hover { + background: rgba(255,255,255,.1); + color: #fff; +} + /* SECONDARY */ button.secondary, .button.secondary { diff --git a/css/src/mobile.css b/css/src/mobile.css index e6ca4b22a..6443f2654 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -328,17 +328,6 @@ -webkit-tap-highlight-color:rgba(0,0,0,0); } - .add-wallet .button-setup { - border: 1px solid #A5B2BF; - border-radius: 5px; - color: #7A8C9E; - text-align: center; - padding: 2rem; - margin: 2rem 0; - text-transform: uppercase; - font-size: 16px; - } - .modal.fade, .reveal-modal-bg { opacity: 1; } diff --git a/views/create.html b/views/create.html index e3cadd62e..084769dda 100644 --- a/views/create.html +++ b/views/create.html @@ -47,7 +47,7 @@
- + Show Hide diff --git a/views/createProfile.html b/views/createProfile.html index fa970ea3d..ed2865995 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -97,13 +97,13 @@
- - + + Back
- Learn more about this option diff --git a/views/home.html b/views/home.html index b11fd38f9..3ce87afe4 100644 --- a/views/home.html +++ b/views/home.html @@ -181,8 +181,6 @@ {{hideAll}} - -aasdas
* Using this device storage. Change to cloud storage on 'settings'.
@@ -192,21 +190,21 @@ aasdas
- - + + Settings
- - + + Create profile
- - + + Import
diff --git a/views/import.html b/views/import.html index 495e9fda0..a47532a6e 100644 --- a/views/import.html +++ b/views/import.html @@ -55,7 +55,7 @@
- + Show Hide diff --git a/views/importProfile.html b/views/importProfile.html index 591a36eac..cc0908c03 100644 --- a/views/importProfile.html +++ b/views/importProfile.html @@ -53,8 +53,8 @@
- - + + Back
diff --git a/views/join.html b/views/join.html index a9ef7b069..873042cb8 100644 --- a/views/join.html +++ b/views/join.html @@ -46,7 +46,7 @@
- + Show Hide diff --git a/views/more.html b/views/more.html index 2bcb1cccd..194a33349 100644 --- a/views/more.html +++ b/views/more.html @@ -76,7 +76,7 @@
- + Show Hide diff --git a/views/profile.html b/views/profile.html index 96577c9a5..3cc2a4fe5 100644 --- a/views/profile.html +++ b/views/profile.html @@ -50,7 +50,7 @@
- + Show Hide diff --git a/views/settings.html b/views/settings.html index 69d554098..9f9ed7334 100644 --- a/views/settings.html +++ b/views/settings.html @@ -71,13 +71,13 @@
- - + + Back
- + Reset settings From 53b4375fb7c22d6e61577106705b2a8490c9de19 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 29 Jan 2015 12:57:11 -0300 Subject: [PATCH 4/7] style & change icon --- css/src/animation.css | 8 +++--- css/src/main.css | 45 +++++++------------------------ css/src/mobile.css | 2 +- js/services/notifications.js | 2 +- views/includes/notifications.html | 4 +-- 5 files changed, 17 insertions(+), 44 deletions(-) diff --git a/css/src/animation.css b/css/src/animation.css index 3c86fca2b..7bb6e5238 100644 --- a/css/src/animation.css +++ b/css/src/animation.css @@ -43,10 +43,10 @@ } .dr-notification-close-btn:hover { - -webkit-transform: scale3d(1.25, 1.25, 1); - -moz-transform: scale3d(1.25, 1.25, 1); - -ms-transform: scale3d(1.25, 1.25, 1); - transform: scale3d(1.25, 1.25, 1); + -webkit-transform: scale3d(1.1, 1.1, 1); + -moz-transform: scale3d(1.1, 1.1, 1); + -ms-transform: scale3d(1.1, 1.1, 1); + transform: scale3d(1.1, 1.1, 1); } .slideDown{ diff --git a/css/src/main.css b/css/src/main.css index 75844c607..e8a252476 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -718,7 +718,7 @@ input[type=number]::-webkit-outer-spin-button { .dr-notification-wrapper { width: 375px; position: relative; - margin: 0 0 1px 0; + margin: 0 0 5px 0; } .dr-notification-close-btn { @@ -738,19 +738,15 @@ input[type=number]::-webkit-outer-spin-button { .dr-notification-image { float: left; - display: block; padding: 0.8rem; - color: white; + color: #7A8C9E; text-align: center; -} -.dr-notification-image i { - height: 40px; - width: 40px; - padding: 0.3rem 0.5rem; - display: block; - border-radius: 100%; + background-color: #E4E8EC; font-size: 30px; + width: 50px; + height: 100%; } + .dr-notification-image img { margin: 15px; max-width: 70px; @@ -770,36 +766,13 @@ input[type=number]::-webkit-outer-spin-button { } .dr-notification { - background: rgba(255,255,255,0.90); - box-shadow: 0px 2px 3px 0px rgba(0,0,0,0.20); + background: rgba(255,255,255,0.95); + box-shadow: 0 1px 5px 0 rgba(0,0,0,0.15); width: 400px; clear: both; overflow: hidden; border-radius: 3px 0 0 3px; -} - -.dr-notification-image.dr-notification-type-funds i { - background-color: #7A8C9E; -} - -.dr-notification-image.dr-notification-type-info i { - background-color: #7A8C9E; -} - -.dr-notification-image.dr-notification-type-warning i { - background-color: #FFA226; -} - -.dr-notification-image.dr-notification-type-error i { - background-color: #FF4B4F; -} - -.dr-notification-image.dr-notification-type-success i { - background-color: #1ABC9C; -} - -.dr-notification-image.success i { - background-color: #1ABC9C; + height: 60px; } .success { diff --git a/css/src/mobile.css b/css/src/mobile.css index 6443f2654..725b7f0e0 100644 --- a/css/src/mobile.css +++ b/css/src/mobile.css @@ -360,7 +360,7 @@ width: 100%; border-radius: 0; box-shadow: none; - border-bottom: 2px solid #E4E8EC; + border-bottom: 1.5px solid #D6DBE0; } .dr-notification-container { diff --git a/js/services/notifications.js b/js/services/notifications.js index cf97cdd26..4f4ef1e99 100644 --- a/js/services/notifications.js +++ b/js/services/notifications.js @@ -145,7 +145,7 @@ factory('notification', ['$timeout', }, funds: function(title, content, userData) { - return this.awesomeNotify('funds', 'bitcoin', title, content, userData); + return this.awesomeNotify('funds', 'bitcoin-circle', title, content, userData); }, version: function(title, content, severe) { diff --git a/views/includes/notifications.html b/views/includes/notifications.html index 2fe5a803d..2259822a3 100644 --- a/views/includes/notifications.html +++ b/views/includes/notifications.html @@ -3,13 +3,13 @@
-
+

{{noti.title|translate}}

-
{{noti.content|translate}}
+
{{noti.content|translate}}
From 34430a74baae8f61b2b47ffb9f0cad8fade3a313 Mon Sep 17 00:00:00 2001 From: bechi Date: Thu, 29 Jan 2015 15:50:21 -0300 Subject: [PATCH 5/7] fix icon home --- views/home.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/home.html b/views/home.html index 3ce87afe4..6cb347ee1 100644 --- a/views/home.html +++ b/views/home.html @@ -191,20 +191,20 @@
- + Settings
- + Create profile
- + Import
From f0d7984da69eb9c3e62e1937e9bd9df341d78d33 Mon Sep 17 00:00:00 2001 From: bechi Date: Mon, 2 Feb 2015 11:06:25 -0300 Subject: [PATCH 6/7] remove hover on mobile --- css/src/desktop.css | 10 ++++++++++ css/src/main.css | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/css/src/desktop.css b/css/src/desktop.css index be2e39728..21db4ac7a 100644 --- a/css/src/desktop.css +++ b/css/src/desktop.css @@ -56,6 +56,16 @@ table tr:hover { cursor: pointer; } +.button.outline.light-gray:hover { + background: rgba(206,213,220,0.40); + color: #4B6178; +} + +.button.outline.dark-gray:hover { + background: rgba(255,255,255,.1); + color: #fff; +} + button.secondary:hover, button.secondary:focus, .button.secondary:hover, diff --git a/css/src/main.css b/css/src/main.css index e8a252476..c0192f16f 100644 --- a/css/src/main.css +++ b/css/src/main.css @@ -963,16 +963,6 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e color: #7A8C9E; } -.button.outline.light-gray:hover { - background: rgba(206,213,220,0.40); - color: #4B6178; -} - -.button.outline.dark-gray:hover { - background: rgba(255,255,255,.1); - color: #fff; -} - /* SECONDARY */ button.secondary, .button.secondary { From df92a9b87136a4223dff1d3b4ed2ddaf65d6c2ce Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 2 Feb 2015 11:26:22 -0300 Subject: [PATCH 7/7] Replacement href by ngclick --- views/createProfile.html | 2 +- views/errors/404.html | 7 ++++++- views/importProfile.html | 2 +- views/settings.html | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/views/createProfile.html b/views/createProfile.html index ed2865995..1bdb294bc 100644 --- a/views/createProfile.html +++ b/views/createProfile.html @@ -97,7 +97,7 @@
- + Back diff --git a/views/errors/404.html b/views/errors/404.html index aa9f768a2..59fb733c9 100644 --- a/views/errors/404.html +++ b/views/errors/404.html @@ -6,6 +6,11 @@

404

Page not found

-

« Back

+

+ + + Back + +

diff --git a/views/importProfile.html b/views/importProfile.html index cc0908c03..c7fa07c03 100644 --- a/views/importProfile.html +++ b/views/importProfile.html @@ -53,7 +53,7 @@
- + Back diff --git a/views/settings.html b/views/settings.html index 9f9ed7334..1d323bed7 100644 --- a/views/settings.html +++ b/views/settings.html @@ -71,7 +71,7 @@
- + Back