From db18590f1e09a784e28d08046b7c6507a43f8a9f Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Thu, 23 Apr 2015 22:11:31 -0400 Subject: [PATCH] Fixed a few oddities. --- Paper/gtk-3.0/widgets/header-bar.css | 13 ++++++------- Paper/gtk-3.0/widgets/menu-button.css | 27 +++++++++++++++++++++++++++ Paper/gtk-3.0/widgets/menus.css | 3 +-- Paper/gtk-3.0/widgets/titlebar.css | 8 ++++---- 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css index 99eb7fc..0ba0cb9 100644 --- a/Paper/gtk-3.0/widgets/header-bar.css +++ b/Paper/gtk-3.0/widgets/header-bar.css @@ -58,7 +58,7 @@ .header-bar .title { padding-left: 13px; padding-right: 13px; - font: Bold 9; + font: Bold; color: @header_text; } @@ -66,7 +66,6 @@ color: @backdrop_header_text; } - /* Subtitle */ .header-bar .subtitle { font: 9; @@ -104,7 +103,7 @@ background-image: none; box-shadow: none; border: none; - padding: 12px 15px; + padding: 13px 15px; } /* Normal Button */ @@ -140,7 +139,7 @@ } .header-bar .text-button:active { - font: Bold 9; + font: Bold; } /* Checked Button */ @@ -156,11 +155,11 @@ /*background-color: alpha(#000, 0.1);*/ border: none; color: @header_text; - box-shadow: 0 -2px 0 0 @header_text; + box-shadow:inset 0 -2px 0 0 @header_text; } .header-bar .text-button:checked { - font: Bold 9; + font: Bold; } /* Focus Button */ @@ -250,7 +249,7 @@ } .header-bar .text-button:active:backdrop { - font: Bold 9; + font: Bold; } /* Backdrop:Hover Button */ diff --git a/Paper/gtk-3.0/widgets/menu-button.css b/Paper/gtk-3.0/widgets/menu-button.css index f0738d5..e385ac8 100644 --- a/Paper/gtk-3.0/widgets/menu-button.css +++ b/Paper/gtk-3.0/widgets/menu-button.css @@ -21,15 +21,42 @@ ***************/ .menu-button { + color: @text; +} + +.menu-button .menu, +.menu-button .menu GtkLabel { + color: @text; +} + +.menu-button .menu:backdrop GtkLabel, +.menu-button .menuitem:backdrop GtkLabel { + color: @backdrop_text; +} + +.menu-button .menu:insensitive GtkLabel, +.menu-button .menuitem:insensitive GtkLabel { + color: @insensitive_text; +} + +.menu-button .menu .accelerator, +.menu-button .menu .accelerator:insensitive, +.menu-button .menuitem .accelerator, +.menu-button .menuitem .accelerator:insensitive +.menu-button .menu .menuitem .accelerator, +.menu-button .menu .menuitem .accelerator:insensitive { + color: @insensitive_text; } .menu-button.separator { + color: @separator; } .menu-button:hover { } .menu-button:insensitive { + color: @insensitive_text; } .menu-button:hover, diff --git a/Paper/gtk-3.0/widgets/menus.css b/Paper/gtk-3.0/widgets/menus.css index ce87f5a..74b81fe 100644 --- a/Paper/gtk-3.0/widgets/menus.css +++ b/Paper/gtk-3.0/widgets/menus.css @@ -22,8 +22,7 @@ .menu { box-shadow: 0 2px 3px 2px @menu_shadow, - inset 0 1px 0 0 rgba(255,255,255,0.1), - inset 0 -3px 3px -4px alpha(#000, 0.4); + inset 0 1px 0 0 rgba(255,255,255,0.1); } .content-view .menu, diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css index de17089..7e0d1ee 100644 --- a/Paper/gtk-3.0/widgets/titlebar.css +++ b/Paper/gtk-3.0/widgets/titlebar.css @@ -59,7 +59,7 @@ padding-left: 13px; padding-right: 13px; color: @header_text; - font: Bold 9; + font: Bold; } /* Subtitle */ @@ -133,7 +133,7 @@ } .titlebar .text-button:active { - font: Bold 9; + font: Bold; } /* Checked Button */ @@ -154,7 +154,7 @@ } .titlebar .text-button:checked { - font: Bold 9; + font: Bold; } /* Focus Button */ @@ -247,7 +247,7 @@ .titlebar .text-button:active:backdrop { - font: Bold 9; + font: Bold; } /* Backdrop:Hover; Button */