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

Merge pull request #379 from megax/patch15 

[gtk3.20] Redesign windows csd decoration
pull/345/head
Khurshid Alam 2016-04-23 23:29:33 +05:30
parent 0a2db9eaa1 081e3162d0
commit dbdd6edc64
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk-3.0/scss/widgets/_window.scss
View File

@ -51,6 +51,9 @@
} }
&.ssd { &.ssd {
// Fixed gtk-3.18 Unity bug (https://github.com/numixproject/numix-gtk-theme/issues/270)
box-shadow: 0 0 0 1px $wm_border_focused;
&.maximized { border-radius: 0; } &.maximized { border-radius: 0; }
} }
} }

31
gtk-3.20/scss/widgets/_window.scss
View File

@ -3,44 +3,44 @@
***************/ ***************/
@include exports("window") { @include exports("window") {
%window {
box-shadow: 0 19px 38px rgba(0, 0, 0, .2), 0 15px 12px rgba(0, 0, 0, .1), 0 0 0 1px $wm_border_focused;
&:backdrop {
box-shadow: 0 10px 20px rgba(0, 0, 0, .19), 0 6px 6px rgba(0, 0, 0, .23), 0 0 0 1px $wm_border_unfocused;
}
}
decoration { decoration {
@extend %window; $_wm_border: if($variant == 'light', transparentize($black, .77), transparentize($borders_color, .1));
border-radius: $roundness $roundness 0 0; border-radius: $roundness $roundness 0 0;
// lamefun trick to get rounded borders regardless of CSD use // lamefun trick to get rounded borders regardless of CSD use
border-width: 0px; border-width: 0;
box-shadow: 0 3px 9px 1px transparentize($black, .3), 0 0 0 1px $wm_border_focused; //doing borders with box-shadow
/* this is used for the resize cursor area */ /* this is used for the resize cursor area */
margin: $spacing * 3; margin: $spacing * 3;
.fullscreen &, .tiled & { border-radius: 0; } &:backdrop {
box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px transparentize($black, .6), 0 0 0 1px $wm_border_unfocused;
transition: 200ms ease-out;
}
.maximized &, .fullscreen &, .tiled & { border-radius: 0; }
.popup & { box-shadow: none; } .popup & { box-shadow: none; }
// this needs to be transparent // this needs to be transparent
// see bug #722563 // see bug #722563
// server-side decorations as used by mutter // server-side decorations as used by mutter
.ssd & { box-shadow: 0 0 0 1px if($variant=='light', transparentize(black, .77), transparentize($borders_color, .1)); } //just doing borders, wm draws actual shadows // Fixed gtk-3.18 Unity bug (https://github.com/numixproject/numix-gtk-theme/issues/270)
.ssd & { box-shadow: 0 0 0 1px $wm_border_focused; } //just doing borders, wm draws actual shadows
.solid-csd & { .solid-csd & {
border-radius: 0; border-radius: 0;
margin: 1px; margin: 1px;
background-color: $bg_color; background-color: $bg_color;
// Unity/compiz regression: Issue: https://github.com/numixproject/numix-gtk-theme/issues/206
box-shadow: none; box-shadow: none;
} }
.csd.popup & { .csd.popup & {
@extend %window;
border-radius: 0; border-radius: 0;
box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($_wm_border, .1);
} }
tooltip.csd & { tooltip.csd & {
@ -49,9 +49,8 @@
} }
messagedialog.csd & { messagedialog.csd & {
@extend %window;
border-radius: $roundness; border-radius: $roundness;
box-shadow: 0 1px 2px transparentize($black, .8), 0 0 0 1px transparentize($_wm_border, .1);
} }
} }
} }