diff --git a/src/html/colors.html b/src/html/colors.html index 90c7be6..72d07e1 100755 --- a/src/html/colors.html +++ b/src/html/colors.html @@ -2,20 +2,64 @@ Colors + Brand Colors - + - - + + $green + + #3ccb5a + + + + + + $purple + + #71438f + + + + + + $orange + + #f5a11b + + + + + + $red + + #f25058 + + + + + + $blue + + #0ca6f2 + + + + + Monochrome + + + + + $black #000 - - + $white @@ -23,8 +67,7 @@ Colors - - + $gray-lighterest @@ -32,8 +75,7 @@ Colors - - + $gray-lightest @@ -41,8 +83,7 @@ Colors - - + $gray-lighter @@ -50,8 +91,7 @@ Colors - - + $gray-light @@ -59,35 +99,35 @@ Colors - - - + + $gray #888 - - - + + $gray-dark #555 - - - + + $gray-darker #333 + + + Green - - + + $green-lighter @@ -95,17 +135,15 @@ Colors - - - + + $green-light #2bd94f - - + $green @@ -113,35 +151,36 @@ Colors - - - + + $green-dark #31b74d - - - + + $green-darker #2a9f43 - - - + + $green-darkest #09200e + - - + Purple + + + + $purple-lightest @@ -149,62 +188,60 @@ Colors - - - + + $purple-lighter #b6a6bd - - - + + $purple-light #834fab - - - + + $purple - #5b3777 + #71438f - - - + + $purple-dark #402754 - - - + + $purple-darker #261731 - - - + + $purple-darkest #1b0f24 + + + Orange - - + + + $orange-lightest @@ -212,8 +249,7 @@ Colors - - + $orange-lighter @@ -221,8 +257,7 @@ Colors - - + $orange-light @@ -230,44 +265,44 @@ Colors - - + $orange - #f2ae24 + #f5a11b - - - + + $orange-dark #db970d - - - + + $orange-darker #cd8d0c - - - + + $orange-darkest #3d2b05 + - - + Red + + + + $red-lighter @@ -275,8 +310,7 @@ Colors - - + $red-light @@ -284,26 +318,20 @@ Colors - - - + + $red #f25058 + - - - - $blue-lighter - - #f5fcff - - + Blue - - + + + $blue-light @@ -311,23 +339,20 @@ Colors - - - + + $blue #0ca6f2 - - - + + $blue-dark #1e7daf - - \ No newline at end of file + diff --git a/src/styles/angular/globals/var.scss b/src/styles/angular/globals/var.scss index eae8936..4408200 100755 --- a/src/styles/angular/globals/var.scss +++ b/src/styles/angular/globals/var.scss @@ -21,6 +21,7 @@ $gray-light: #bbb; $gray: #888; $gray-dark: #555; $gray-darker: #222; +$gray-logo: #ccc; $green: #3ccb5a; // #1DD156 $green-light: #2bd94f; @@ -64,7 +65,7 @@ $red-darker: darken($red-dark,10%); $blue: #0ca6f2; // previously #2ab0f6; $blue-light: #8bd5f9; // previously #86cff6; $blue-lighter: #f5fcff; // previously #f1faff; -$blue-dark: #0a9be2; +$blue-dark: #1e7daf; // ********** // log themes diff --git a/src/styles/scss/colors.scss b/src/styles/scss/colors.scss deleted file mode 100644 index ac30381..0000000 --- a/src/styles/scss/colors.scss +++ /dev/null @@ -1,42 +0,0 @@ -// list 39 colors -$color-array: black white gray-lighterest gray-lightest gray-lighter gray-light gray gray-dark gray-darker green green-light green-lighter green-dark green-darker green-darkest purple purple-logo purple-light purple-lighter purple-lightest purple-dark purple-darker purple-darkest orange orange-light orange-lighter orange-lightest orange-dark orange-darker orange-darkest red red-light red-lighter red-dark blue blue-light blue-lighter blue-dark; -$color-array-values: $black $white $gray-lighterest $gray-lightest $gray-lighter $gray-light $gray $gray-dark $gray-darker $green $green-light $green-lighter $green-dark $green-darker $green-darkest $purple $purple-logo $purple-light $purple-lighter $purple-lightest $purple-dark $purple-darker $purple-darkest $orange $orange-light $orange-lighter $orange-lightest $orange-dark $orange-darker $orange-darkest $red $red-light $red-lighter $red-dark $blue $blue-light $blue-lighter $blue-dark; - -@mixin colors() { - // 39 colors in total - @for $i from 1 to 39 { - // background - .color-#{nth($color-array,$i)} { - background: nth($color-array-values,$i); - } - } -} - -@include colors(); - -.figure-colors-wrapper { - - .figure { - background: none; - border: 0; - display: block; - margin: 0; - padding: 0; - text-align: left; - } - - .figure-color, - .figcaption { - float: left; - margin: 0; - } - - .figcaption { - margin-left: 9px; - } -} - -.figure-color { - height: 90px; - width: 150px; -} diff --git a/src/styles/scss/figures.scss b/src/styles/scss/figures.scss index 303845c..dfba6be 100644 --- a/src/styles/scss/figures.scss +++ b/src/styles/scss/figures.scss @@ -72,7 +72,6 @@ } .figcaption { - color: $gray-dark; font-weight: bold; margin-top: 15px; margin-bottom: 10px;