x/bansho
Code Issues Proposed changes

Merge "Add true light theme"

Browse Source
This commit is contained in:
Jenkins 2015-06-29 18:44:55 +00:00 committed by Gerrit Code Review
commit a6c9e6fac6
9 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/sass/global/_color-schemes.scss
View File

@ -16,7 +16,7 @@
// For panel and the sidebar
%colorBkgPanel {
background:$_color_light_beta;
background:$_color_light_alpha;
}
%colorLink {
@ -30,20 +30,20 @@
}
%colorBorderThin {
border-color:$_color_light_epsilon;
border-color:$_color_light_alpha;
}
%colorBkgTopbar {
background:$_color_light_alpha;
}
%colorBkgTopbarPanel {
background:$_color_light_beta;
}
%colorBkgTopbarButton {
%colorBkgTopbarPanel {
background:$_color_light_alpha;
}
%colorBkgTopbarButton {
background:$_color_light_beta;
}
}
// Dark Scheme

4
app/assets/sass/modules-interface/_main.scss
View File

@ -17,7 +17,7 @@
}
.color-scheme--light & {
background:$_color_omega;
background:$_color_light_beta;
}
table {width:100%;}
@ -66,7 +66,7 @@
}
.color-scheme--light & {
border-top-color:$_color_light_delta;
border-top-color:$_color_light_beta;
}
}

8
app/assets/sass/modules-objects/_data-table.scss
View File

@ -51,7 +51,7 @@
}
.color-scheme--light & {
border-color:$_color_light_epsilon;
border-color:$_color_light_beta;
}
}
@ -83,7 +83,7 @@
}
.color-scheme--light & {
border-color:$_color_light_epsilon;
border-color:$_color_light_beta;
}
/* &:before { */
@ -128,8 +128,8 @@
}
.color-scheme--light & {
background:$_color_light_alpha;
border-color:$_color_light_epsilon;
background:$_color_light_beta;
border-color:$_color_light_gamma;
&.state--asc,
&.state--desc {background:$_color_light_alpha;}

6
app/assets/sass/modules-objects/_filters.scss
View File

@ -13,7 +13,7 @@
.color-scheme--light & {
background:$_color_light_gamma;
border-color:$_color_light_epsilon;
border-color:$_color_light_beta;
}
}
@ -49,7 +49,7 @@
}
.color-scheme--light & {
border-color:$_color_light_epsilon;
border-color:$_color_light_beta;
}
.filters__item--more &,
@ -80,7 +80,7 @@
}
.color-scheme--light & {
background:$_color_light_epsilon;
background:$_color_light_beta;
color:$_color_alpha;
}
}

2
app/assets/sass/modules-objects/_panes.scss
View File

@ -21,7 +21,7 @@
}
.color-scheme--light & {
background:$_color_light_alpha;
background:$_color_light_gamma;
}
}

15
app/assets/sass/settings/_variables.scss
View File

@ -9,13 +9,12 @@ $_img_path: "../images/" !default;
// Colors
//----------------------------------*/
// Light scheme
$_color_light_alpha: #EEEEEE !default;
$_color_light_beta: #F9F9F9 !default;
$_color_light_alpha: #C6D1D2 !default;
$_color_light_beta: #ECF0F1 !default;
$_color_light_gamma: #FFFFFF !default;
$_color_light_delta: #333333 !default;
$_color_light_delta: #71777C !default;
$_color_light_epsilon: #c0c1c2 !default;
// Dark scheme
$_color_dark_alpha: #252C35 !default;
$_color_dark_beta: #353D48 !default;
@ -31,10 +30,10 @@ $_color_schemes: (
),
light: (
alpha: #252C35,
beta: #353D48,
gamma: #49515C,
delta: #A2AAB4
alpha: #C6D1D2,
beta: #ECF0F1,
gamma: #FFFFFF,
delta: #71777C
)
);

4
app/assets/sass/temporary.scss
View File

@ -71,11 +71,11 @@ md-checkbox.md-checked .md-icon:after {
.subcomponent__live {
.color-scheme--dark & {
background-color:$_color_dark_alpha;
background-color:$_color_dark_beta;
}
.color-scheme--light & {
background-color:$_color_light_alpha;
background-color:$_color_light_beta;
}
padding: 0px 15px;

28
app/components/sidebar/_sidebar.scss
View File

@ -28,7 +28,7 @@
.color-scheme--light & {
background:$_color_light_beta;
color:$_color_alpha;
color:$_color_dark_alpha;
}
.no-js & {display:none;}
@ -65,7 +65,7 @@
}
.color-scheme--light & {
color:$_color_light_epsilon;
color:$_color_light_gamma;
}
}
@ -81,7 +81,7 @@
}
.color-scheme--light & {
border-top-color:$_color_light_epsilon;
border-top-color:$_color_light_gamma;
}
&:first-child {border:0;}
@ -108,7 +108,7 @@
}
.color-scheme--light & {
color:$_color_light_epsilon;
color:$_color_light_gamma
}
.sidebar__item:first-child & {padding-top:0;}
@ -135,7 +135,7 @@
}
.color-scheme--light & {
color:$_color_light_epsilon;
color:$_color_light_gamma;
}
&:focus,
@ -144,7 +144,7 @@
color:$_color_omega;
}
.color-scheme--light & {
color:$_color_alpha;
color:$_color_dark_alpha;
}
}
@ -170,7 +170,7 @@
color:$_color_omega;
}
.color-scheme--light & {
color:$_color_alpha;
color:$_color_dark_alpha;
}
position:relative;
@ -204,12 +204,18 @@
}
.color-scheme--light & {
background:$_color_light_epsilon;
background:$_color_light_beta;
}
.sidebar__profile__toggle {
@extend %typo-more-info--little;
color:$_color_omega;
.color-scheme--dark & {
color:$_color_omega;
}
.color-scheme--light & {
color:$_color_dark_alpha;
}
display:block;
line-height:72px;
min-height:72px;
@ -229,7 +235,7 @@
}
.color-scheme--light & {
color:$_color_alpha;
color:$_color_dark_alpha;
}
}
}
@ -275,7 +281,7 @@
}
.color-scheme--light & {
color:$_color_light_delta;
color:$_color_light_alpha;
}
}

3
app/components/topbar/_topbar.scss
View File

@ -13,6 +13,7 @@
.topbar__item {
@extend %colorBorderThin;
height:80px;
border:0 solid;
display:inline-block;
position:relative;
@ -70,7 +71,7 @@
}
.color-scheme--light & {
color:$_color_alpha;
color:$_color_dark_alpha;
}
}