incorprating changes from #315 0a8fca7

pull/327/head
Dustin Falgout 2016-04-12 01:48:04 -05:00
parent 87a8b50bf5
commit 284ca2b5a0
2 changed files with 28 additions and 20 deletions

View File

@ -48,6 +48,7 @@
}
.frame, frame { border-width: 0; }
.sidebar-icon {
padding-left: $spacing * 2;
padding-right: $spacing * 2;

View File

@ -166,40 +166,48 @@
&.progressbar { // progress bar in treeviews
@if $variant == light { color: $base_color; }
border-radius: $roundness;
border: 1px solid $selected_borders_color;
border-radius: 4px;
background-color: $selected_bg_color;
background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color,10%));
box-shadow: inset 0 1px if($variant == 'light', transparentize(white,0.7), transparentize(white,0.85)),
0 1px if($variant == 'light', transparentize(black, 0.8), transparentize(black,0.9));
//background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1));
box-shadow: inset 0 1px if($variant == 'light', transparentize(white, .7), transparentize(white, .85)),
0 1px if($variant == 'light', transparentize(black, .8), transparentize(black, .9));
&:selected {
&:focus, & {
border-radius: 4px;
@if $variant == 'light' {
color: $selected_bg_color;
color: $selected_fg_color;
box-shadow: none;
} @else { box-shadow: inset 0 1px transparentize(white, 0.95); }
} @else {
box-shadow: inset 0 1px transparentize(white, .95);
}
background-image: linear-gradient(to bottom,
$base_color,
darken($base_color,10%));
background-color: linear-gradient(to bottom, $base_color, darken($base_color, .1));
&:backdrop {
@if $variant == 'light' {
color: $selected_bg_color;
border-color: $selected_borders_color; // otherwise it gets inherited by .view(?!?)
} @else { border-color: $backdrop_base_color; }
} @else {
border-color: $backdrop_base_color;
}
background-color: $backdrop_base_color;
}
}
}
&:disabled {
@include linear-gradient($bg_color);
border-color: border_disabled($bg_color);
}
&:backdrop {
@if $variant == 'light' { color: $backdrop_base_color;
} @else { border-color: $backdrop_base_color; }
@if $variant == 'light' {
color: $backdrop_base_color;
} @else {
border-color: $backdrop_base_color;
}
background-image: none;
box-shadow: none;
@ -207,15 +215,12 @@
}
&.trough { // progress bar trough in treeviews
background-color: transparentize($fg_color,0.9);
border-radius: 4px;
background-color: transparentize($fg_color, .9);
border-radius: $roundness;
&:selected {
&:focus, & {
background-color: if($variant == 'light',
transparentize($selected_fg_color, 0.7),
darken($selected_bg_color, 10%));
border-radius: 4px;
background-color: if($variant == 'light', transparentize($selected_fg_color, .7), darken($selected_bg_color, .1));
@if $variant == 'light' {
border-width: 1px 0;
@ -224,6 +229,8 @@
}
}
}
&:disabled { background-color: $base_color; }
}
header {