From 900dbc8cb95792f2c92c807bc9f9bf39de78f0e4 Mon Sep 17 00:00:00 2001 From: Mario Volke Date: Thu, 30 Oct 2014 10:55:16 +0100 Subject: [PATCH 01/17] make error color more present --- src/sass/base/_config.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/base/_config.scss b/src/sass/base/_config.scss index d870f53..eeb8d8f 100755 --- a/src/sass/base/_config.scss +++ b/src/sass/base/_config.scss @@ -16,7 +16,7 @@ $line-height-base: 20 / 16; $color-black: #000; $color-white: #fff; $color-blue: #00c6ff; -$color-red: #ff878d; +$color-red: #ff3f49; $color-grey: #666; $color-grey-input: #949494; $color-grey-dark: #333; From e34da3bdbf331afe429fc41057ec86c1d0aa7f60 Mon Sep 17 00:00:00 2001 From: Mario Volke Date: Thu, 30 Oct 2014 11:28:26 +0100 Subject: [PATCH 02/17] refactored waiting cursor class to utility class --- src/sass/all.scss | 2 +- src/sass/utilities/_others.scss | 3 +++ src/sass/views/_shared.scss | 3 --- src/tpl/login-initial.html | 2 +- src/tpl/login.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/sass/utilities/_others.scss delete mode 100644 src/sass/views/_shared.scss diff --git a/src/sass/all.scss b/src/sass/all.scss index f32dd07..eb7660a 100755 --- a/src/sass/all.scss +++ b/src/sass/all.scss @@ -17,13 +17,13 @@ // Utilities classes @import "utilities/responsive"; +@import "utilities/others"; // Components (TODO: refactor to BEM) @import "components/lightbox"; @import "components/dialog"; // Views (TODO: refactor to BEM) -@import "views/shared"; @import "views/add-account"; @import "views/account"; @import "views/privatekey-upload"; diff --git a/src/sass/utilities/_others.scss b/src/sass/utilities/_others.scss new file mode 100644 index 0000000..a052a4b --- /dev/null +++ b/src/sass/utilities/_others.scss @@ -0,0 +1,3 @@ +.u-waiting-cursor { + cursor: wait !important; +} \ No newline at end of file diff --git a/src/sass/views/_shared.scss b/src/sass/views/_shared.scss deleted file mode 100644 index 33463be..0000000 --- a/src/sass/views/_shared.scss +++ /dev/null @@ -1,3 +0,0 @@ -.waiting-cursor { - cursor: wait; -} \ No newline at end of file diff --git a/src/tpl/login-initial.html b/src/tpl/login-initial.html index 2734727..c91d2ba 100644 --- a/src/tpl/login-initial.html +++ b/src/tpl/login-initial.html @@ -1,4 +1,4 @@ -