callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adwaita: Update levelbar rendering

Browse Source 
Adapt to the changes in the previous commit.
This commit is contained in:
Matthias Clasen 2015-11-11 00:26:32 -05:00
parent 17f110433d
commit 2a0024ebe2
3 changed files with 81 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gtk/theme/Adwaita/_common.scss
View File

@ -2422,7 +2422,7 @@ progressbar.vertical progress {
* Level Bar * * Level Bar *
*************/ *************/
.level-bar { levelbar {
box-shadow: _widget_edge(); // needs to be set here to avoid clipping box-shadow: _widget_edge(); // needs to be set here to avoid clipping
-GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-width: 34;
-GtkLevelBar-min-block-height: 3; -GtkLevelBar-min-block-height: 3;
@ -2430,7 +2430,7 @@ progressbar.vertical progress {
-GtkLevelBar-min-block-width: 3; -GtkLevelBar-min-block-width: 3;
-GtkLevelBar-min-block-height: 34; -GtkLevelBar-min-block-height: 34;
} }
&.trough { & trough {
border: 1px solid; border: 1px solid;
padding: 2px; padding: 2px;
border-radius: 3px; border-radius: 3px;
@ -2439,11 +2439,11 @@ progressbar.vertical progress {
@include entry(backdrop); @include entry(backdrop);
} }
} }
&.fill-block { &.horizontal block.discrete { margin: 0 1px; }
// FIXME: it would be nice to set make fill blocks bigger, but we'd need &.vertical block.discrete { margin: 1px 0; }
// :nth-child working on discrete indicators & block.filled {
border: 1px solid if($variant=='light', darken($selected_bg_color,10%), border: 1px solid if($variant=='light', darken($selected_bg_color,10%),
darken($selected_bg_color,5%)); darken($selected_bg_color,5%));
background-color: $selected_bg_color; background-color: $selected_bg_color;
box-shadow: 0 1px transparentize(black, 0.9); box-shadow: 0 1px transparentize(black, 0.9);
border-radius: 1px; border-radius: 1px;
@ -2451,27 +2451,26 @@ progressbar.vertical progress {
border-color: $selected_bg_color; border-color: $selected_bg_color;
box-shadow: none; box-shadow: none;
} }
&.indicator-discrete { }
&.horizontal { margin: 0 1px; } & block.level-high {
&.vertical { margin: 1px 0; } border-color: darken($success_color,10%);
} background-color: $success_color;
&.level-high { &:backdrop { border-color: $success_color; }
border-color: darken($success_color,10%); }
background-color: $success_color; & block.level-low {
&:backdrop { border-color: $success_color; } border-color: darken($warning_color,10%);
} background-color: $warning_color;
&.level-low { &:backdrop { border-color: $warning_color; };
border-color: darken($warning_color,10%); }
background-color: $warning_color; & block.empty {
&:backdrop { border-color: $warning_color; }; border: 1px solid if($variant=='light', darken($selected_bg_color,10%),
} darken($selected_bg_color,5%));
&.empty-fill-block { border-radius: 1px;
background-color: transparent; background-color: transparent;
border-color: if($variant=='light', transparentize($fg_color,0.8), border-color: if($variant=='light', transparentize($fg_color,0.8),
transparentize($fg_color,0.9)); transparentize($fg_color,0.9));
box-shadow: none; box-shadow: none;
&:backdrop { border-color: transparentize($backdrop_fg_color,0.85); } &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); }
}
} }
} }

54
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -3367,14 +3367,14 @@ progressbar.vertical progress {
/************* /*************
* Level Bar * * Level Bar *
*************/ *************/
.level-bar { levelbar {
box-shadow: 0 1px rgba(238, 238, 236, 0.1); box-shadow: 0 1px rgba(238, 238, 236, 0.1);
-GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-width: 34;
-GtkLevelBar-min-block-height: 3; } -GtkLevelBar-min-block-height: 3; }
.level-bar.vertical { levelbar.vertical {
-GtkLevelBar-min-block-width: 3; -GtkLevelBar-min-block-width: 3;
-GtkLevelBar-min-block-height: 34; } -GtkLevelBar-min-block-height: 34; }
.level-bar.trough { levelbar trough {
border: 1px solid; border: 1px solid;
padding: 2px; padding: 2px;
border-radius: 3px; border-radius: 3px;
@ -3383,41 +3383,43 @@ progressbar.vertical progress {
color: white; color: white;
border-color: #1c1f1f; border-color: #1c1f1f;
box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
.level-bar.trough:backdrop { levelbar trough:backdrop {
background-color: transparent; background-color: transparent;
background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%); background-image: linear-gradient(to bottom, #1d2020, #242525 3px, #292929 90%);
color: #d5d5d5; color: #d5d5d5;
border-color: #1f2222; border-color: #1f2222;
background-image: linear-gradient(to bottom, #2c2c2c); background-image: linear-gradient(to bottom, #2c2c2c);
box-shadow: 0 1px rgba(238, 238, 236, 0); } box-shadow: 0 1px rgba(238, 238, 236, 0); }
.level-bar.fill-block { levelbar.horizontal block.discrete {
margin: 0 1px; }
levelbar.vertical block.discrete {
margin: 1px 0; }
levelbar block.filled {
border: 1px solid #1c5187; border: 1px solid #1c5187;
background-color: #215d9c; background-color: #215d9c;
box-shadow: 0 1px rgba(0, 0, 0, 0.1); box-shadow: 0 1px rgba(0, 0, 0, 0.1);
border-radius: 1px; } border-radius: 1px; }
.level-bar.fill-block:backdrop { levelbar block.filled:backdrop {
border-color: #215d9c; border-color: #215d9c;
box-shadow: none; } box-shadow: none; }
.level-bar.fill-block.indicator-discrete.horizontal { levelbar block.level-high {
margin: 0 1px; } border-color: #40760c;
.level-bar.fill-block.indicator-discrete.vertical { background-color: #5aa411; }
margin: 1px 0; } levelbar block.level-high:backdrop {
.level-bar.fill-block.level-high { border-color: #5aa411; }
border-color: #40760c; levelbar block.level-low {
background-color: #5aa411; } border-color: #c26000;
.level-bar.fill-block.level-high:backdrop { background-color: #f57900; }
border-color: #5aa411; } levelbar block.level-low:backdrop {
.level-bar.fill-block.level-low { border-color: #f57900; }
border-color: #c26000; levelbar block.empty {
background-color: #f57900; } border: 1px solid #1c5187;
.level-bar.fill-block.level-low:backdrop { border-radius: 1px;
border-color: #f57900; } background-color: transparent;
.level-bar.fill-block.empty-fill-block { border-color: rgba(238, 238, 236, 0.1);
background-color: transparent; box-shadow: none; }
border-color: rgba(238, 238, 236, 0.1); levelbar block.empty:backdrop {
box-shadow: none; } border-color: rgba(148, 151, 150, 0.15); }
.level-bar.fill-block.empty-fill-block:backdrop {
border-color: rgba(148, 151, 150, 0.15); }
/********** /**********
* Frames * * Frames *

54
gtk/theme/Adwaita/gtk-contained.css
View File

@ -3529,14 +3529,14 @@ progressbar.vertical progress {
/************* /*************
* Level Bar * * Level Bar *
*************/ *************/
.level-bar { levelbar {
box-shadow: 0 1px white; box-shadow: 0 1px white;
-GtkLevelBar-min-block-width: 34; -GtkLevelBar-min-block-width: 34;
-GtkLevelBar-min-block-height: 3; } -GtkLevelBar-min-block-height: 3; }
.level-bar.vertical { levelbar.vertical {
-GtkLevelBar-min-block-width: 3; -GtkLevelBar-min-block-width: 3;
-GtkLevelBar-min-block-height: 34; } -GtkLevelBar-min-block-height: 34; }
.level-bar.trough { levelbar trough {
border: 1px solid; border: 1px solid;
padding: 2px; padding: 2px;
border-radius: 3px; border-radius: 3px;
@ -3545,41 +3545,43 @@ progressbar.vertical progress {
color: black; color: black;
border-color: #a1a1a1; border-color: #a1a1a1;
box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
.level-bar.trough:backdrop { levelbar trough:backdrop {
background-color: transparent; background-color: transparent;
background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%);
color: #333333; color: #333333;
border-color: darkgray; border-color: darkgray;
background-image: linear-gradient(to bottom, white); background-image: linear-gradient(to bottom, white);
box-shadow: 0 1px rgba(255, 255, 255, 0); } box-shadow: 0 1px rgba(255, 255, 255, 0); }
.level-bar.fill-block { levelbar.horizontal block.discrete {
margin: 0 1px; }
levelbar.vertical block.discrete {
margin: 1px 0; }
levelbar block.filled {
border: 1px solid #2a76c6; border: 1px solid #2a76c6;
background-color: #4a90d9; background-color: #4a90d9;
box-shadow: 0 1px rgba(0, 0, 0, 0.1); box-shadow: 0 1px rgba(0, 0, 0, 0.1);
border-radius: 1px; } border-radius: 1px; }
.level-bar.fill-block:backdrop { levelbar block.filled:backdrop {
border-color: #4a90d9; border-color: #4a90d9;
box-shadow: none; } box-shadow: none; }
.level-bar.fill-block.indicator-discrete.horizontal { levelbar block.level-high {
margin: 0 1px; } border-color: #5aa411;
.level-bar.fill-block.indicator-discrete.vertical { background-color: #73d216; }
margin: 1px 0; } levelbar block.level-high:backdrop {
.level-bar.fill-block.level-high { border-color: #73d216; }
border-color: #5aa411; levelbar block.level-low {
background-color: #73d216; } border-color: #c26000;
.level-bar.fill-block.level-high:backdrop { background-color: #f57900; }
border-color: #73d216; } levelbar block.level-low:backdrop {
.level-bar.fill-block.level-low { border-color: #f57900; }
border-color: #c26000; levelbar block.empty {
background-color: #f57900; } border: 1px solid #2a76c6;
.level-bar.fill-block.level-low:backdrop { border-radius: 1px;
border-color: #f57900; } background-color: transparent;
.level-bar.fill-block.empty-fill-block { border-color: rgba(46, 52, 54, 0.2);
background-color: transparent; box-shadow: none; }
border-color: rgba(46, 52, 54, 0.2); levelbar block.empty:backdrop {
box-shadow: none; } border-color: rgba(142, 145, 146, 0.15); }
.level-bar.fill-block.empty-fill-block:backdrop {
border-color: rgba(142, 145, 146, 0.15); }
/********** /**********
* Frames * * Frames *