From af3bcc6adc0617febb8084188e5a6eaec31765a1 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Mon, 4 Feb 2019 15:01:41 +0100 Subject: [PATCH] Revert "HighContrast: Add menu padding" Revert conflicting patches to rebase adwaita-3-32 easily. will apply afterwards. This reverts commit a7ea8248ce8ac208477a855b68472b752587a7ac. --- gtk/theme/HighContrast/_common.scss | 2 +- gtk/theme/HighContrast/gtk-contained-inverse.css | 2 +- gtk/theme/HighContrast/gtk-contained.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss index dc60321644..f6a24b5741 100644 --- a/gtk/theme/HighContrast/_common.scss +++ b/gtk/theme/HighContrast/_common.scss @@ -1568,7 +1568,7 @@ menubar, menu, .menu { margin: 4px; - padding: 1px; + padding: 0px; background-color: $base_color; border: 1px solid $borders_color; & menuitem { diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css index 2eed2934bd..52bef1b215 100644 --- a/gtk/theme/HighContrast/gtk-contained-inverse.css +++ b/gtk/theme/HighContrast/gtk-contained-inverse.css @@ -633,7 +633,7 @@ menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px # menubar > menuitem:disabled, .menubar > menuitem:disabled { color: gray; box-shadow: none; } -menu, .menu { margin: 4px; padding: 1px; background-color: #111; border: 1px solid gray; } +menu, .menu { margin: 4px; padding: 0px; background-color: #111; border: 1px solid gray; } menu menuitem, .menu menuitem { text-shadow: none; padding: 4px; min-width: 40px; } diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css index e6552a5f46..c3fd1e5750 100644 --- a/gtk/theme/HighContrast/gtk-contained.css +++ b/gtk/theme/HighContrast/gtk-contained.css @@ -637,7 +637,7 @@ menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px # menubar > menuitem:disabled, .menubar > menuitem:disabled { color: gray; box-shadow: none; } -menu, .menu { margin: 4px; padding: 1px; background-color: #fff; border: 1px solid gray; } +menu, .menu { margin: 4px; padding: 0px; background-color: #fff; border: 1px solid gray; } menu menuitem, .menu menuitem { text-shadow: none; padding: 4px; min-width: 40px; }