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

Adwaita: add borders to menus in a non composited env

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=738800
This commit is contained in:
Lapo Calamandrei 2014-10-22 20:46:54 +02:00 committed by Matthias Clasen
parent 2873195644
commit 264cab2b52
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/resources/theme/Adwaita/_common.scss
View File

@ -1530,6 +1530,8 @@ column-header.button.dnd { // for treeview-like derive widgets
margin: 4px;
padding: 0px;
background-color: $base_color;
border: 1px solid $borders_color; // adds borders in a non composited env
.csd & { border: none; } // axes borders in a composited env
.menuitem {
text-shadow: none;
padding: 4px;
@ -3078,6 +3080,8 @@ GtkVolumeButton.button { padding: 8px; }
box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
0 0 0 1px $_wm_border; //doing borders with box-shadow
// FIXME rationalize window-frame shadows
/* this is used for the resize cursor area */
margin: 10px;
@ -3088,8 +3092,11 @@ GtkVolumeButton.button { padding: 8px; }
&.tiled {
border-radius: 0;
}
&.csd {
&.popup {
box-shadow: none;
}
&.csd {
.popup {
border-radius: 0;
box-shadow: 0 1px 2px transparentize(black, 0.8),
0 0 0 1px transparentize($_wm_border,0.1);

9
gtk/resources/theme/Adwaita/gtk-contained-dark.css
View File

@ -2048,7 +2048,10 @@ column-header .titlebar .button.titlebutton,
.menu {
margin: 4px;
padding: 0px;
background-color: #292929; }
background-color: #292929;
border: 1px solid #1c1f1f; }
.csd .menu {
border: none; }
.menu .menuitem {
text-shadow: none;
padding: 4px; }
@ -4215,7 +4218,9 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); }
.window-frame.tiled {
border-radius: 0; }
.window-frame.csd.popup {
.window-frame.popup {
box-shadow: none; }
.window-frame.csd .popup {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
.window-frame.csd.tooltip {

9
gtk/resources/theme/Adwaita/gtk-contained.css
View File

@ -2045,7 +2045,10 @@ column-header .titlebar .button.titlebutton,
.menu {
margin: 4px;
padding: 0px;
background-color: #ffffff; }
background-color: #ffffff;
border: 1px solid #a1a1a1; }
.csd .menu {
border: none; }
.menu .menuitem {
text-shadow: none;
padding: 4px; }
@ -4376,7 +4379,9 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
.window-frame.tiled {
border-radius: 0; }
.window-frame.csd.popup {
.window-frame.popup {
box-shadow: none; }
.window-frame.csd .popup {
border-radius: 0;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
.window-frame.csd.tooltip {