Permalink
Browse files

Restore dark menus for Gtk3 applications.

This was manually merged from r167 in bzr branch lp:light-themes and
the stock theme.

Special cases where menus were styled dark only in certain UI elements
has been removed. Where improvements have been made, those were kept.
  • Loading branch information...
StanAngeloff committed Apr 28, 2012
1 parent d5b1800 commit 99835042fcf1dc037134b9c7330f905451eccc9d
Showing with 10 additions and 88 deletions.
  1. +10 −88 gtk-3.0/gtk-widgets.css
View
@@ -1028,24 +1028,6 @@ GtkImage:insensitive {
* menu *
********/
.menu {
background-image: none;
border-bottom-color: shade (@bg_color, 0.66);
border-left-color: shade (@bg_color, 0.7);
border-right-color: shade (@bg_color, 0.7);
border-top-color: shade (@bg_color, 0.8);
border-style: solid;
padding: 0;
color: @fg_color;
-unico-inner-stroke-gradient: none;
-unico-inner-stroke-width: 1px 1px 0 1px;
}
Genericmenuitem .menu,
DbusmenuGtkMenu .menu,
.menubar .menu,
.primary-toolbar .menu {
background-color: shade (@dark_bg_color, 1.08);
border-bottom-color: shade (@dark_bg_color, 0.96);
border-left-color: shade (@dark_bg_color, 0.8);
@@ -1065,12 +1047,7 @@ DbusmenuGtkMenu .menu,
.menubar .menu.button:active,
.menubar .menu.button:active:insensitive,
.menubar .menu.button:insensitive,
.menubar .menu.button,
.primary-toolbar .menu.button:hover,
.primary-toolbar .menu.button:active,
.primary-toolbar .menu.button:active:insensitive,
.primary-toolbar .menu.button:insensitive,
.primary-toolbar .menu.button {
.menubar .menu.button {
background-color: shade (@dark_bg_color, 1.08);
background-image: none;
border-radius: 0;
@@ -1128,32 +1105,15 @@ DbusmenuGtkMenu .menu,
/************
* menuitem *
************/
.menuitem {
color: @fg_color;
}
.menuitem {
border-radius: 0;
border-style: solid;
border-width: 1px;
padding: 3px 2px 3px 2px;
-unico-inner-stroke-width: 1px;
}
Genericmenuitem .menuitem,
DbusmenuGtkMenu .menuitem,
.menubar .menuitem,
.primary-toolbar .menuitem {
color: @dark_fg_color;
}
/* Workaround for lp:949368 */
GtkComboBox .menuitem * {
color: @fg_color;
}
GtkComboBox .menuitem *:hover {
color: @selected_fg_color;
-unico-inner-stroke-width: 1px;
}
.menuitem:hover,
@@ -1186,30 +1146,12 @@ GtkComboBox .menuitem *:hover {
.menuitem:insensitive,
.menuitem *:insensitive {
color: mix (@fg_color, @bg_color, 0.5);
text-shadow: 0 1 shade (@bg_color, 1.14);
}
Genericmenuitem .menuitem:insensitive,
Genericmenuitem .menuitem *:insensitive,
DbusmenuGtkMenu .menuitem:insensitive,
DbusmenuGtkMenu .menuitem *:insensitive,
.menubar .menuitem:insensitive,
.menubar .menuitem *:insensitive,
.primary-toolbar .menuitem:insensitive,
.primary-toolbar .menuitem *:insensitive {
color: mix (@dark_fg_color, @dark_bg_color, 0.5);
text-shadow: 0 -1 shade (@dark_bg_color, 0.6);
}
Genericmenuitem .menuitem.check:active,
Genericmenuitem .menuitem.radio:active,
DbusmenuGtkMenu .menuitem.check:active,
DbusmenuGtkMenu .menuitem.radio:active,
.menubar .menuitem.check:active,
.menubar .menuitem.radio:active,
.primary-toolbar .menuitem.check:active,
.primary-toolbar .menuitem.radio:active {
.menuitem.check:active,
.menuitem.radio:active {
color: @dark_fg_color;
-unico-bullet-color: @dark_fg_color;
@@ -1225,11 +1167,7 @@ DbusmenuGtkMenu .menuitem.radio:active,
.menubar .menuitem GtkCalendar,
.menubar .menuitem GtkCalendar.button,
.menubar .menuitem GtkCalendar.header,
.menubar .menuitem GtkCalendar.view,
.primary-toolbar .menuitem GtkCalendar,
.primary-toolbar .menuitem GtkCalendar.button,
.primary-toolbar .menuitem GtkCalendar.header,
.primary-toolbar .menuitem GtkCalendar.view {
.menubar .menuitem GtkCalendar.view {
background-color: @dark_bg_color;
background-image: none;
border-radius: 0;
@@ -1240,14 +1178,12 @@ DbusmenuGtkMenu .menuitem.radio:active,
color: @dark_fg_color;
}
.menubar .menuitem GtkCalendar,
.primary-toolbar .menuitem GtkCalendar {
.menubar .menuitem GtkCalendar {
background-color: shade (@dark_bg_color, 1.3);
background-image: none;
}
.menubar .menuitem .entry,
.primary-toolbar .menuitem .entry {
.menubar .menuitem .entry {
background-color: shade (@dark_bg_color, 1.3);
background-image: none;
@@ -1270,24 +1206,15 @@ DbusmenuGtkMenu .menuitem.radio:active,
to (shade (@dark_bg_color, 1.15)));
}
Genericmenuitem .menuitem .accelerator,
DbusmenuGtkMenu .menuitem .accelerator,
.menubar .menuitem .accelerator,
.primary-toolbar .menuitem .accelerator {
.menuitem .accelerator {
color: alpha (@dark_fg_color, 0.5);
}
Genericmenuitem .menuitem .accelerator:hover,
DbusmenuGtkMenu .menuitem .accelerator:hover,
.menubar .menuitem .accelerator:hover,
.primary-toolbar .menuitem .accelerator:hover {
.menuitem .accelerator:hover {
color: alpha (@selected_fg_color, 0.8);
}
Genericmenuitem .menuitem .accelerator:insensitive,
DbusmenuGtkMenu .menuitem .accelerator:insensitive,
.menubar .menuitem .accelerator:insensitive,
.primary-toolbar .menuitem .accelerator:insensitive {
.menuitem .accelerator:insensitive {
color: alpha (mix (@dark_fg_color, @dark_bg_color, 0.5), 0.5);
text-shadow: 0 -1 shade (@dark_bg_color, 0.7);
}
@@ -1703,12 +1630,7 @@ GtkScrolledWindow.frame {
.menuitem.separator {
-GtkMenuItem-horizontal-padding: 0;
-GtkWidget-separator-height: 4;
}
Genericmenuitem .menuitem.separator,
DbusmenuGtkMenu .menuitem.separator,
.menubar .menuitem.separator,
.primary-toolbar .menuitem.separator {
border-color: shade (@dark_bg_color, 0.96);
-unico-inner-stroke-color: alpha (shade (@dark_bg_color, 1.26), 0.5);

0 comments on commit 9983504

Please sign in to comment.