From 61cb4c87a90f7fac37258d11e594dc1608d9f287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Wed, 21 Oct 2015 11:34:12 +0200 Subject: [PATCH] Replace ascribe-green-color with new ascribe-blue-color --- .../accordion_list_item.js | 2 +- js/components/search_bar.js | 2 +- sass/ascribe_accordion_list.scss | 6 ++--- sass/ascribe_custom_style.scss | 26 +------------------ sass/ascribe_footer.scss | 3 ++- sass/ascribe_media_player.scss | 4 +-- sass/ascribe_notification_list.scss | 2 +- sass/ascribe_uploader.scss | 2 +- sass/ascribe_variables.scss | 26 +++++++++++++++++-- sass/main.scss | 6 ++--- sass/variables.scss | 18 ++++++------- 11 files changed, 48 insertions(+), 49 deletions(-) diff --git a/js/components/ascribe_accordion_list/accordion_list_item.js b/js/components/ascribe_accordion_list/accordion_list_item.js index 67e4fcf1..38cb77b1 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item.js +++ b/js/components/ascribe_accordion_list/accordion_list_item.js @@ -13,7 +13,7 @@ let AccordionListItem = React.createClass({ subheading: React.PropTypes.object, subsubheading: React.PropTypes.object, buttons: React.PropTypes.object, - linkData: React.PropTypes.func, + linkData: React.PropTypes.string, children: React.PropTypes.oneOfType([ React.PropTypes.arrayOf(React.PropTypes.element), React.PropTypes.element diff --git a/js/components/search_bar.js b/js/components/search_bar.js index a82724b8..bb1b2375 100644 --- a/js/components/search_bar.js +++ b/js/components/search_bar.js @@ -118,7 +118,7 @@ const SearchBar = React.createClass({ }, render() { - let searchIcon = ; + let searchIcon = ; const { className } = this.props; const { loading, searchQuery } = this.state; diff --git a/sass/ascribe_accordion_list.scss b/sass/ascribe_accordion_list.scss index 9e86d3c2..fcac7bac 100644 --- a/sass/ascribe_accordion_list.scss +++ b/sass/ascribe_accordion_list.scss @@ -178,7 +178,7 @@ $ascribe-accordion-list-item-height: 100px; -webkit-user-select: none; &:hover { - color: $ascribe-color-green; + color: $ascribe-dark-blue; cursor: pointer; } } @@ -194,7 +194,7 @@ $ascribe-accordion-list-item-height: 100px; } .request-action-badge { - color: $ascribe-color-green; + color: $ascribe-dark-blue; font-size: 1.2em; padding: .8em; position: absolute; @@ -211,7 +211,7 @@ $ascribe-accordion-list-item-height: 100px; -webkit-user-select: none; &:hover { - color: $ascribe-color-green; + color: $ascribe-dark-blue; } .glyphicon { diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss index 27f174ea..758bf0ef 100644 --- a/sass/ascribe_custom_style.scss +++ b/sass/ascribe_custom_style.scss @@ -1,28 +1,3 @@ -$ascribe-black: #1E1E1E; -$ascribe-dark-blue: #003C69; -$ascribe-blue: #65CFE9; -$ascribe-light-blue: #D3DEE4; -$ascribe-white: #F8F8F8; -$ascribe-pink: #D10074; -$ascribe-blue-border: rgba(0, 60, 105, 0.1); -$ascribe-red-error: rgb(169, 68, 66); - - -$ascribe--fg-color: $ascribe-dark-blue; -$ascribe--bg-color: $ascribe-dark-blue; - -$ascribe--nav-fg-prim-color: $ascribe-dark-blue; -$ascribe--nav-fg-sec-color: lighten($ascribe-dark-blue, 20%); -$ascribe--nav-bg-color: white; - -$ascribe--button-default-color: $ascribe--bg-color; -$ascribe--button-secondary-fg-color: $ascribe--bg-color; -$ascribe--button-secondary-bg-color: white; - -$ascribe--font: 'canada-type-gibson', sans-serif !important; -$ascribe--font-weight-light: 300 !important; -$ascribe--font-weight-normal: normal; - html, body { font-family: $ascribe--font; @@ -289,6 +264,7 @@ fieldset[disabled] .btn-default.active { .btn-default { background-color: $ascribe--button-default-color; border-color: $ascribe--button-default-color; + font-weight: $ascribe--font-weight-light; &:hover, &:active, diff --git a/sass/ascribe_footer.scss b/sass/ascribe_footer.scss index e4526c97..173839bd 100644 --- a/sass/ascribe_footer.scss +++ b/sass/ascribe_footer.scss @@ -22,7 +22,8 @@ } a:hover { - color: #48DACB; + text-decoration: none; + color: lighten($ascribe-dark-blue, 20%); } } } diff --git a/sass/ascribe_media_player.scss b/sass/ascribe_media_player.scss index 213fbafa..25d4aa64 100644 --- a/sass/ascribe_media_player.scss +++ b/sass/ascribe_media_player.scss @@ -31,7 +31,7 @@ } .audiojs .loaded { - background-color: $ascribe-color-green; + background-color: $ascribe-dark-blue; background-image: none; } .audiojs .progress { @@ -58,7 +58,7 @@ .vjs-default-skin .vjs-play-progress, .vjs-default-skin .vjs-volume-level { - background: $ascribe-color-green; + background: $ascribe-dark-blue; } .vjs-default-skin .vjs-big-play-button { diff --git a/sass/ascribe_notification_list.scss b/sass/ascribe_notification_list.scss index 17be8f60..a09f7049 100644 --- a/sass/ascribe_notification_list.scss +++ b/sass/ascribe_notification_list.scss @@ -53,7 +53,7 @@ $break-medium: 1200px; white-space: nowrap; } .notification-action{ - color: $ascribe-color-green; + color: $ascribe-dark-blue; } } diff --git a/sass/ascribe_uploader.scss b/sass/ascribe_uploader.scss index 45bda62e..7819eda0 100644 --- a/sass/ascribe_uploader.scss +++ b/sass/ascribe_uploader.scss @@ -169,7 +169,7 @@ .ascribe-progress-bar { margin-bottom: 0; > .progress-bar { - background-color: $ascribe-color-green; + background-color: $ascribe-dark-blue; } } diff --git a/sass/ascribe_variables.scss b/sass/ascribe_variables.scss index 2af5c6d3..c3263f4d 100644 --- a/sass/ascribe_variables.scss +++ b/sass/ascribe_variables.scss @@ -1,3 +1,25 @@ -$ascribe-color-green: rgba(2, 182, 163, 1); +$ascribe-black: #1E1E1E; +$ascribe-dark-blue: #003C69; +$ascribe-blue: #65CFE9; +$ascribe-light-blue: #D3DEE4; +$ascribe-white: #F8F8F8; +$ascribe-pink: #D10074; +$ascribe-blue-border: rgba(0, 60, 105, 0.1); +$ascribe-red-error: rgb(169, 68, 66); -$ascribe-brand-danger: #fc535f; + + +$ascribe--fg-color: $ascribe-dark-blue; +$ascribe--bg-color: $ascribe-dark-blue; + +$ascribe--nav-fg-prim-color: $ascribe-dark-blue; +$ascribe--nav-fg-sec-color: lighten($ascribe-dark-blue, 20%); +$ascribe--nav-bg-color: white; + +$ascribe--button-default-color: $ascribe--bg-color; +$ascribe--button-secondary-fg-color: $ascribe--bg-color; +$ascribe--button-secondary-bg-color: white; + +$ascribe--font: 'canada-type-gibson', sans-serif !important; +$ascribe--font-weight-light: 300 !important; +$ascribe--font-weight-normal: normal; diff --git a/sass/main.scss b/sass/main.scss index 03d927eb..4b9e0f71 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -98,7 +98,7 @@ hr { } .ascribe-color { - color: $ascribe-color-green; + color: $ascribe-dark-blue; } .ascribe-subheader { @@ -140,8 +140,8 @@ hr { color: #888; &:hover { - background-color: $ascribe-brand-danger !important; - border: 1px solid $ascribe-brand-danger !important; + background-color: $ascribe-red-error !important; + border: 1px solid $ascribe-red-error !important; } } diff --git a/sass/variables.scss b/sass/variables.scss index f4b3f30a..ccd48864 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -19,7 +19,7 @@ $brand-primary: darken(#428bca, 6.5%) !default; // #337ab7 $brand-success: #5cb85c !default; $brand-info: #5bc0de !default; $brand-warning: #ccc !default; -$brand-danger: $ascribe-brand-danger !default; +$brand-danger: $ascribe-red-error !default; //== Scaffolding @@ -150,8 +150,8 @@ $table-border-color: #ddd !default; $btn-font-weight: normal !default; $btn-default-color: white !default; -$btn-default-bg: $ascribe-color-green !default; -$btn-default-border: $ascribe-color-green !default; +$btn-default-bg: $ascribe-dark-blue !default; +$btn-default-border: $ascribe-dark-blue !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; @@ -219,7 +219,7 @@ $legend-color: $gray-dark !default; $legend-border-color: #e5e5e5 !default; //** Background color for textual input addons -$input-group-addon-bg: $ascribe-color-green !default; +$input-group-addon-bg: $ascribe-dark-blue !default; //** Border color for textual input addons $input-group-addon-border-color: transparent !default; @@ -468,14 +468,14 @@ $pagination-disabled-border: #ddd !default; // //## -$pager-bg: $ascribe-color-green !default; -$pager-border: $ascribe-color-green !default; +$pager-bg: $ascribe-dark-blue !default; +$pager-border: $ascribe-dark-blue !default; $pager-border-radius: 0 !default; -$pager-hover-bg: darken($ascribe-color-green, 10%) !default; +$pager-hover-bg: darken($ascribe-dark-blue, 10%) !default; -$pager-active-bg: $ascribe-color-green !default; -$pager-active-color: $ascribe-color-green !default; +$pager-active-bg: $ascribe-dark-blue !default; +$pager-active-color: $ascribe-dark-blue !default; $pager-disabled-color: #CCC !default; $pager-disabled-border: 1px solid #CCC !default;