kirbylife
/
numix-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GTKHEADERB 3.22 :: Create global OSD file (#628) 

* * Create global OSD file.

* * Fixed code.
pull/629/head
Khurshid Alam 2016-11-01 13:58:47 +05:30 committed by GitHub
parent a4cefd6ad3 4d332568bf
commit 9ec47abc20
4 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk-3.20/scss/widgets/_choosers.scss
View File

@ -155,8 +155,6 @@
&:checked { colorswatch:only-child { box-shadow: none; } } &:checked { colorswatch:only-child { box-shadow: none; } }
} }
} }
colorchooser .popover.osd { border-radius: $roundness; }
} }

11
src/gtk-3.20/scss/widgets/_menu.scss
View File

@ -232,17 +232,6 @@
&:backdrop { box-shadow: none; } &:backdrop { box-shadow: none; }
.osd & {
box-shadow: 0 2px 7px 3px alpha($black, .5);
> toolbar button {
border-radius: 0;
border-width: 0;
background-color: transparent;
background-image: none;
}
}
treeview.view { treeview.view {
&:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; } &:hover, &:selected, &:selected:focus, &:backdrop:selected, &:backdrop:selected:focus { border-top-color: $selected_bg_color; }

61
src/gtk-3.20/scss/widgets/_osd.scss
View File

@ -8,6 +8,8 @@
@include exports("osd") { @include exports("osd") {
overlay.osd { background-color: transparent; } overlay.osd { background-color: transparent; }
colorchooser .popover.osd { border-radius: $roundness; }
button.osd, button.osd,
#XfceNotifyWindow button { #XfceNotifyWindow button {
@include button($osd_bg, $osd_fg); @include button($osd_bg, $osd_fg);
@ -38,6 +40,26 @@
&.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
} }
progressbar.osd { // progressbar.osd used for epiphany page loading progress
margin: 2px;
min-height: 2px;
min-width: 2px;
trough {
border-style: none;
border-radius: 0;
background-image: none;
background-color: transparent;
}
progress {
border-style: none;
border-radius: 0;
background-color: $selected_bg_color;
background-image: none;
}
}
.osd, .osd,
#XfceNotifyWindow { #XfceNotifyWindow {
background-color: $osd_bg; background-color: $osd_bg;
@ -62,6 +84,7 @@
progressbar { background-color: $osd_fg; } progressbar { background-color: $osd_fg; }
// Old GTK 3.0 code
scale { scale {
slider { slider {
@include linear-gradient(shade($osd_bg, 1.08)); @include linear-gradient(shade($osd_bg, 1.08));
@ -89,6 +112,33 @@
} }
} }
// New GTK 3.20 code
scale {
//OSD troughs
trough {
background-color: lighten($osd_bg, 7%);
highlight { background-color: $selected_bg_color; }
}
// OSD sliders
slider {
background-clip: border-box;
background-color: $selected_bg_color;
border-color: $selected_bg_color;
&:hover {
background-color: lighten($selected_bg_color, 10%);
border-color: lighten($selected_bg_color, 10%);
}
&:active {
background-color: darken($selected_bg_color, 10%);
border-color: darken($selected_bg_color, 10%);
}
}
}
&.view, .view, view { background-color: $osd_bg; } &.view, .view, view { background-color: $osd_bg; }
scrollbar { scrollbar {
@ -127,6 +177,17 @@
background-color: $osd_bg; background-color: $osd_bg;
} }
popover.background {
box-shadow: 0 2px 7px 3px alpha($black, .5);
> toolbar button {
border-radius: 0;
border-width: 0;
background-color: transparent;
background-image: none;
}
}
spinbutton { spinbutton {
// OSD horizontal // OSD horizontal
&:not(.vertical) { &:not(.vertical) {

44
src/gtk-3.20/scss/widgets/_progress.scss
View File

@ -52,26 +52,6 @@
border-top-right-radius: $roundness; border-top-right-radius: $roundness;
} }
} }
&.osd { // progressbar.osd used for epiphany page loading progress
margin: 2px;
min-height: 2px;
min-width: 2px;
trough {
border-style: none;
border-radius: 0;
background-image: none;
background-color: transparent;
}
progress {
border-style: none;
border-radius: 0;
background-color: $selected_bg_color;
background-image: none;
}
}
} }
levelbar { levelbar {
@ -194,13 +174,6 @@
&:disabled { background-color: transparentize($_scale_trough_bg, .45); } &:disabled { background-color: transparentize($_scale_trough_bg, .45); }
//OSD troughs
.osd & {
background-color: lighten($osd_bg, 7%);
highlight { background-color: $selected_bg_color; }
}
// Troughs in selected list-rows and infobars // Troughs in selected list-rows and infobars
menuitem:hover &, menuitem:hover &,
row:selected &, row:selected &,
@ -280,23 +253,6 @@
border-color: mix($selected_fg_color, $selected_bg_color, .55); border-color: mix($selected_fg_color, $selected_bg_color, .55);
} }
} }
// OSD sliders
.osd & {
background-clip: border-box;
background-color: $selected_bg_color;
border-color: $selected_bg_color;
&:hover {
background-color: lighten($selected_bg_color, 10%);
border-color: lighten($selected_bg_color, 10%)
}
&:active {
background-color: darken($selected_bg_color, 10%);
border-color: darken($selected_bg_color, 10%);
}
}
} }
value { color: alpha(currentColor, .4); } value { color: alpha(currentColor, .4); }