ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity

Replace ascribe-green-color with new ascribe-blue-color

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-10-21 11:34:12 +02:00
parent f4b0952806
commit 61cb4c87a9
11 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_accordion_list/accordion_list_item.js
View File

@ -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

2
js/components/search_bar.js
View File

@ -118,7 +118,7 @@ const SearchBar = React.createClass({
},
render() {
let searchIcon = <Glyphicon glyph='search' className="filter-glyph"/>;
let searchIcon = <span className='ascribe-icon icon-ascribe-search'/>;
const { className } = this.props;
const { loading, searchQuery } = this.state;

6
sass/ascribe_accordion_list.scss
View File

@ -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 {

26
sass/ascribe_custom_style.scss
View File

@ -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,

3
sass/ascribe_footer.scss
View File

@ -22,7 +22,8 @@
}
a:hover {
color: #48DACB;
text-decoration: none;
color: lighten($ascribe-dark-blue, 20%);
}
}
}

4
sass/ascribe_media_player.scss
View File

@ -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 {

2
sass/ascribe_notification_list.scss
View File

@ -53,7 +53,7 @@ $break-medium: 1200px;
white-space: nowrap;
}
.notification-action{
color: $ascribe-color-green;
color: $ascribe-dark-blue;
}
}

2
sass/ascribe_uploader.scss
View File

@ -169,7 +169,7 @@
.ascribe-progress-bar {
margin-bottom: 0;
> .progress-bar {
background-color: $ascribe-color-green;
background-color: $ascribe-dark-blue;
}
}

26
sass/ascribe_variables.scss
View File

@ -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;

6
sass/main.scss
View File

@ -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;
}
}

18
sass/variables.scss
View File

@ -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;