From d0d21ba9a60500c41b862d114cb677756da2088e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Feb 2016 15:29:43 +0100 Subject: [PATCH] ux(): updated orange color and fixed sidemenu background on dark theme --- package.json | 1 + public/sass/_variables.dark.scss | 4 ++-- public/sass/_variables.light.scss | 2 +- public/sass/pages/_styleguide.scss | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 04a41301a77..f47a59799e3 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "dependencies": { "es5-shim": "^4.4.1", "grunt-jscs": "~1.5.x", + "grunt-sass-lint": "^0.1.0", "grunt-sync": "^0.4.1", "karma-sinon": "^1.0.3", "lodash": "^2.4.1", diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index fa185a27abf..f94cab08b43 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -33,7 +33,7 @@ $yellow: #ECBB13; $pink: #FF4444; $purple: #9933CC; $variable: #32D1DF; -$orange: #FF8800; +$orange: #dF7518; $brand-primary: $orange; $brand-success: $green; @@ -205,7 +205,7 @@ $navbarButtonBackgroundHighlight: lighten($navbarBackground, 5%); // Sidemenu // ------------------------- -$side-menu-bg: $dark-3; +$side-menu-bg: $body-bg; $side-menu-item-hover-bg: $dark-4; // Pagination diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 16a85acdc7b..e2c8fb06c8a 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -35,7 +35,7 @@ $blue-dark: #75CAEB; $green: #28B62C; $red: #FF4136; $yellow: #FF851B; -$orange: #FF7518; +$orange: #Ff7941; $pink: #E671B8; $purple: #9954BB; $variable: #2AB2E4; diff --git a/public/sass/pages/_styleguide.scss b/public/sass/pages/_styleguide.scss index 3aed004a7f6..dd8c0775c8b 100644 --- a/public/sass/pages/_styleguide.scss +++ b/public/sass/pages/_styleguide.scss @@ -1,9 +1,9 @@ .style-guide-color-card { list-style: none; - margin: 0; + margin: 0; padding: $spacer; - width: 100%; - text-align: center; + width: 100%; + text-align: left; text-shadow: 0 0 8px #fff; color: $black; font-size: $font-size-sm;