From 8a69c04dd7c9abefdf2ee1f032d21e3553c5f2a4 Mon Sep 17 00:00:00 2001 From: Gabriel Albo Date: Wed, 20 Aug 2014 18:15:29 -0300 Subject: Fixing hard-coded colors and typefaces for the style guide; adding the action_buttons color variable --- web-ui/app/scss/_colors.scss | 1 + web-ui/app/scss/style-guide.scss | 23 ++++++++++++++++++++++- web-ui/app/style-guide.html | 28 ++++++++++++++-------------- 3 files changed, 37 insertions(+), 15 deletions(-) (limited to 'web-ui') diff --git a/web-ui/app/scss/_colors.scss b/web-ui/app/scss/_colors.scss index 97c883a5..903ecb94 100644 --- a/web-ui/app/scss/_colors.scss +++ b/web-ui/app/scss/_colors.scss @@ -11,3 +11,4 @@ $contrast: #F2F3ED; $top_pane: #EAEAEA; $secondary: #3E3A37; $primary_color: #EF4E2F; +$action_buttons: #2ba6cb; diff --git a/web-ui/app/scss/style-guide.scss b/web-ui/app/scss/style-guide.scss index f1b31ddd..6d73b185 100644 --- a/web-ui/app/scss/style-guide.scss +++ b/web-ui/app/scss/style-guide.scss @@ -49,7 +49,7 @@ section.guide-section { padding: 66px 32px; } -.color-swatch { +.color-card { width: 160px; height: 230px; background-color: #344a5f; @@ -77,3 +77,24 @@ section.guide-section { font-size: small; } +/* Color Cards definition */ + +.color-grid { + #primary-color-card { background-color: $primary_color; } + #secondary-color-card { background-color: $secondary;} + #top-pane-card { background-color: $top_pane;} + #contrast-card { background-color: $contrast;} + #action-buttons-card { background-color: $action_buttons; } + #success-card { background-color: $success;} + #attention-card { background-color: $attention; } + #warning-card { background-color: $warning; } + #error-card { background-color: $error; } + #search-highlight-card { background-color: $search_highlight; } + #count-background-card { background-color: $total_count_bg; } +} +/* Typeface cards definition*/ +ul.typography li h2 { + &.bold-header { font-weight: bold; } + &.extra-bold-header { font-weight: 800; } + &.lighter-header { font-weight: lighter; } +} \ No newline at end of file diff --git a/web-ui/app/style-guide.html b/web-ui/app/style-guide.html index 39a4cdfe..354d9307 100644 --- a/web-ui/app/style-guide.html +++ b/web-ui/app/style-guide.html @@ -48,31 +48,31 @@

Color Palette


-
+

PRIMARY COLOR
#EF4E2F

-
+

SECONDARY COLOR
#3E3A37

-
+

TOP PANE
#EAEAEA

-
+

CONTRAST
#F2F3ED

-
+

ACTION BUTTONS
#2ba6cb @@ -82,37 +82,37 @@

-
+

SUCCESS
#2DAB49

-
+

ATTENTION
#F6A40A

-
+

WARNING
#F7E8AF

-
+

ERROR
#D72A25

-
+

SEARCH HIGHLIGHT
#FFEF29

-
+

COUNT BACKGROUND
#C0B9B9 @@ -132,15 +132,15 @@ Regular

  • -

    Aa

    +

    Aa

    Bold
  • -

    Aa

    +

    Aa

    Extra Bold
  • -

    Aa

    +

    Aa

    Lighter
  • -- cgit v1.2.3