AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: Update window styling

Browse Source 
We no longer inherit the style classes on the decoration subnodes,
so we have to adjust some selectors.
This commit is contained in:
Matthias Clasen 2015-11-05 16:07:29 -05:00
parent b4c650ae85
commit 5d62c808b1
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3254,33 +3254,31 @@ decoration {
box-shadow: 0 2px 6px 2px transparentize(black, 0.8), box-shadow: 0 2px 6px 2px transparentize(black, 0.8),
0 0 0 1px $_wm_border_backdrop; 0 0 0 1px $_wm_border_backdrop;
} }
&.tiled { .tiled & {
border-radius: 0; border-radius: 0;
} }
&.popup { .popup & {
box-shadow: none; box-shadow: none;
} }
// server-side decorations as used by mutter // server-side decorations as used by mutter
&.ssd { &.ssd {
box-shadow: 0 0 0 1px $_wm_border; //just doing borders, wm draws actual shadows box-shadow: 0 0 0 1px $_wm_border; //just doing borders, wm draws actual shadows
} }
&.csd { .csd.popup & {
&.popup { border-radius: 0;
border-radius: 0; box-shadow: 0 1px 2px transparentize(black, 0.8),
box-shadow: 0 1px 2px transparentize(black, 0.8), 0 0 0 1px transparentize($_wm_border,0.1);
0 0 0 1px transparentize($_wm_border,0.1);
}
&.tooltip {
border-radius: 5px;
box-shadow: none;
}
messagedialog & {
border-radius: 7px;
box-shadow: 0 1px 2px transparentize(black, 0.8),
0 0 0 1px transparentize($_wm_border,0.1);
}
} }
&.solid-csd { .csd.tooltip & {
border-radius: 5px;
box-shadow: none;
}
messagedialog.csd & {
border-radius: 7px;
box-shadow: 0 1px 2px transparentize(black, 0.8),
0 0 0 1px transparentize($_wm_border,0.1);
}
.solid-csd & {
border-radius: 0; border-radius: 0;
margin: 4px; margin: 4px;
background-color: $backdrop_bg_color; background-color: $backdrop_bg_color;

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

@ -4442,22 +4442,22 @@ decoration {
margin: 10px; } margin: 10px; }
decoration:backdrop { decoration:backdrop {
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); } box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); }
decoration.tiled { .tiled decoration {
border-radius: 0; } border-radius: 0; }
decoration.popup { .popup decoration {
box-shadow: none; } box-shadow: none; }
decoration.ssd { decoration.ssd {
box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); } box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
decoration.csd.popup { .csd.popup decoration {
border-radius: 0; border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); } box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
decoration.csd.tooltip { .csd.tooltip decoration {
border-radius: 5px; border-radius: 5px;
box-shadow: none; } box-shadow: none; }
messagedialog decoration.csd { messagedialog.csd decoration {
border-radius: 7px; border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); } box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
decoration.solid-csd { .solid-csd decoration {
border-radius: 0; border-radius: 0;
margin: 4px; margin: 4px;
background-color: #393f3f; background-color: #393f3f;

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

@ -4614,22 +4614,22 @@ decoration {
margin: 10px; } margin: 10px; }
decoration:backdrop { decoration:backdrop {
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); } box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
decoration.tiled { .tiled decoration {
border-radius: 0; } border-radius: 0; }
decoration.popup { .popup decoration {
box-shadow: none; } box-shadow: none; }
decoration.ssd { decoration.ssd {
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); } box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
decoration.csd.popup { .csd.popup decoration {
border-radius: 0; border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
decoration.csd.tooltip { .csd.tooltip decoration {
border-radius: 5px; border-radius: 5px;
box-shadow: none; } box-shadow: none; }
messagedialog decoration.csd { messagedialog.csd decoration {
border-radius: 7px; border-radius: 7px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
decoration.solid-csd { .solid-csd decoration {
border-radius: 0; border-radius: 0;
margin: 4px; margin: 4px;
background-color: #ededed; background-color: #ededed;