From 6a90d25056c3e69ed6631168682227e8a84b552d Mon Sep 17 00:00:00 2001 From: Jasu Koponen Date: Fri, 22 Sep 2017 11:08:10 +0300 Subject: [PATCH] smaller menus, merged look --- gtk-2.0/main.rc | 6 +++--- gtk-3.0/gtk-dark.css | 28 ++++++++++++++++++++-------- gtk-3.0/gtk.css | 25 +++++++++++++++++++------ 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/gtk-2.0/main.rc b/gtk-2.0/main.rc index 66cc15a..0641615 100644 --- a/gtk-2.0/main.rc +++ b/gtk-2.0/main.rc @@ -1524,8 +1524,8 @@ style "menu" { style "menu_item" { - xthickness = 3 - ythickness = 4 + xthickness = 1 + ythickness = 2 bg[PRELIGHT] = @selected_bg_color # Chromium uses this setting @@ -1763,7 +1763,7 @@ style "separator_menu_item" { style "button" { xthickness = 2 - ythickness = 3 + ythickness = 2 # For the sake of sanity style buttons this way engine "pixmap" { diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 7bfb736..3e6bf92 100644 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -3,6 +3,7 @@ window.csd .titlebar:not(headerbar), window.csd .titlebar { + background: linear-gradient(to bottom, rgba(69, 70, 70, 1), rgba(44, 52, 55, 1)); min-height: 0; padding-top: 0; padding-bottom: 0; @@ -21,20 +22,20 @@ window.csd .titlebar:backdrop { headerbar, headerbar.titlebar { - background: linear-gradient(to bottom, rgba(46, 51, 53, 1), rgba(38, 42, 44, 1)); + background: linear-gradient(to bottom, rgba(69, 70, 70, 1), rgba(51, 57, 59, 1)); min-height: 22px; padding-top: 0; padding-bottom: 0; box-shadow: none; border: none; - border-bottom: 1px solid #14191C; + border-bottom: 1px solid #33393B; } headerbar:backdrop, headerbar.titlebar:backdrop { background: #33393B; box-shadow: none; - border-bottom: 1px solid #14191C; + border-bottom: 1px solid #33393B; } headerbar button.titlebutton, @@ -51,6 +52,7 @@ headerbar entry, headerbar spinbutton, headerbar widget, headerbar switch { + background: linear-gradient(to bottom, rgba(69, 70, 70, 1), rgba(44, 52, 55, 1)); min-height: 26px; min-width: 26px; padding: 0; @@ -71,9 +73,8 @@ button > box > label.counter-label { } button { - background: linear-gradient(to bottom, rgba(46, 51, 53, 1), rgba(38, 42, 44, 1)); - padding: 3px 4px; - min-height: 10px; + padding: 4px 4px; + min-height: 12px; min-width: 12px; } @@ -94,6 +95,18 @@ menubar > menuitem, margin: 0; } +menu, +.menu { + padding: 0; + margin: 0; +} + +menu menuitem, +.menu menuitem { + min-height: 12px; + min-width: 24px; + padding: 3px; +} notebook { padding: 0; @@ -107,7 +120,7 @@ notebook > header > tabs > tab { } decoration { - background: #2C3133; + background: #444545; border-radius: 2px 2px 0 0; } @@ -166,4 +179,3 @@ list row { padding: 0; min-height: 28px; } - diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 0b70b91..096755d 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -3,6 +3,7 @@ window.csd .titlebar:not(headerbar), window.csd .titlebar { + background: linear-gradient(to bottom, rgba(242, 242, 242, 1), rgba(222, 222, 221, 1)); min-height: 0; padding-top: 0; padding-bottom: 0; @@ -21,20 +22,20 @@ window.csd .titlebar:backdrop { headerbar, headerbar.titlebar { - background: linear-gradient(to bottom, rgba(244, 244, 244, 1), rgba(207, 207, 207, 1)); + background: linear-gradient(to bottom, rgba(242, 242, 242, 1), rgba(232, 232, 231, 1)); min-height: 22px; padding-top: 0; padding-bottom: 0; box-shadow: none; border: none; - border-bottom: 1px solid #B6B6B3; + border-bottom: 1px solid #E8E8E7; } headerbar:backdrop, headerbar.titlebar:backdrop { background: #E8E8E7; box-shadow: none; - border-bottom: 1px solid #B6B6B3; + border-bottom: 1px solid #E8E8E7; } headerbar button.titlebutton, @@ -51,7 +52,7 @@ headerbar entry, headerbar spinbutton, headerbar widget, headerbar switch { - background: linear-gradient(to bottom, rgba(244, 244, 244, 1), rgba(207, 207, 207, 1)); + background: linear-gradient(to bottom, rgba(242, 242, 242, 1), rgba(222, 222, 221, 1)); min-height: 26px; min-width: 26px; padding: 0; @@ -83,8 +84,8 @@ button > box > label.counter-label { button { background: linear-gradient(to bottom, rgba(244, 244, 244, 1), rgba(207, 207, 207, 1)); - padding: 3px 4px; - min-height: 10px; + padding: 4px 4px; + min-height: 12px; min-width: 12px; } @@ -105,6 +106,18 @@ menubar > menuitem, margin: 0; } +menu, +.menu { + padding: 0; + margin: 0; +} + +menu menuitem, +.menu menuitem { + min-height: 12px; + min-width: 24px; + padding: 3px; +} notebook { padding: 0;