From be0b5e3d96c247d315519614f403e578fd95f065 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 21 Oct 2018 18:47:30 +0800 Subject: [PATCH] Add 2px border-radius for menu --- src/gtk-3.0/gtk-aliz.css | 9 ++++++--- src/gtk-3.0/gtk-azul.css | 9 ++++++--- src/gtk-3.0/gtk-dark-aliz.css | 9 ++++++--- src/gtk-3.0/gtk-dark-azul.css | 9 ++++++--- src/gtk-3.0/gtk-dark-sea.css | 9 ++++++--- src/gtk-3.0/gtk-sea.css | 9 ++++++--- src/gtk-3.0/sass/_common.scss | 10 +++++++--- 7 files changed, 43 insertions(+), 21 deletions(-) diff --git a/src/gtk-3.0/gtk-aliz.css b/src/gtk-3.0/gtk-aliz.css index 7bef699c..a57000e3 100644 --- a/src/gtk-3.0/gtk-aliz.css +++ b/src/gtk-3.0/gtk-aliz.css @@ -38,6 +38,10 @@ background-color: rgba(247, 247, 247, 0.999); } +.popup.background { + border-radius: 2px; +} + *:disabled { -gtk-icon-effect: dim; } @@ -2295,7 +2299,7 @@ menu, .csd menu, .csd .menu { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -2409,7 +2413,6 @@ menu > arrow:disabled, popover, popover.background { padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: #ffffff; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.07); @@ -4450,7 +4453,7 @@ decoration:backdrop { } .csd.popup decoration { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.12); } diff --git a/src/gtk-3.0/gtk-azul.css b/src/gtk-3.0/gtk-azul.css index bd06cfd2..e1dde172 100644 --- a/src/gtk-3.0/gtk-azul.css +++ b/src/gtk-3.0/gtk-azul.css @@ -38,6 +38,10 @@ background-color: rgba(247, 247, 247, 0.999); } +.popup.background { + border-radius: 2px; +} + *:disabled { -gtk-icon-effect: dim; } @@ -2295,7 +2299,7 @@ menu, .csd menu, .csd .menu { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -2409,7 +2413,6 @@ menu > arrow:disabled, popover, popover.background { padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: #ffffff; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.07); @@ -4450,7 +4453,7 @@ decoration:backdrop { } .csd.popup decoration { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.12); } diff --git a/src/gtk-3.0/gtk-dark-aliz.css b/src/gtk-3.0/gtk-dark-aliz.css index 7e4b70f8..f64b0eb4 100644 --- a/src/gtk-3.0/gtk-dark-aliz.css +++ b/src/gtk-3.0/gtk-dark-aliz.css @@ -38,6 +38,10 @@ background-color: rgba(34, 34, 34, 0.999); } +.popup.background { + border-radius: 2px; +} + *:disabled { -gtk-icon-effect: dim; } @@ -2295,7 +2299,7 @@ menu, .csd menu, .csd .menu { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -2409,7 +2413,6 @@ menu > arrow:disabled, popover, popover.background { padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: #222222; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.35); @@ -4450,7 +4453,7 @@ decoration:backdrop { } .csd.popup decoration { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.18); } diff --git a/src/gtk-3.0/gtk-dark-azul.css b/src/gtk-3.0/gtk-dark-azul.css index 3f243a2b..af9b1a81 100644 --- a/src/gtk-3.0/gtk-dark-azul.css +++ b/src/gtk-3.0/gtk-dark-azul.css @@ -38,6 +38,10 @@ background-color: rgba(27, 29, 36, 0.999); } +.popup.background { + border-radius: 2px; +} + *:disabled { -gtk-icon-effect: dim; } @@ -2295,7 +2299,7 @@ menu, .csd menu, .csd .menu { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -2409,7 +2413,6 @@ menu > arrow:disabled, popover, popover.background { padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: #1b1d24; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.35); @@ -4450,7 +4453,7 @@ decoration:backdrop { } .csd.popup decoration { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.18); } diff --git a/src/gtk-3.0/gtk-dark-sea.css b/src/gtk-3.0/gtk-dark-sea.css index fdff8c04..5e2d7ac5 100644 --- a/src/gtk-3.0/gtk-dark-sea.css +++ b/src/gtk-3.0/gtk-dark-sea.css @@ -38,6 +38,10 @@ background-color: rgba(27, 34, 36, 0.999); } +.popup.background { + border-radius: 2px; +} + *:disabled { -gtk-icon-effect: dim; } @@ -2295,7 +2299,7 @@ menu, .csd menu, .csd .menu { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -2409,7 +2413,6 @@ menu > arrow:disabled, popover, popover.background { padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: #1b2224; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.35); @@ -4450,7 +4453,7 @@ decoration:backdrop { } .csd.popup decoration { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.18); } diff --git a/src/gtk-3.0/gtk-sea.css b/src/gtk-3.0/gtk-sea.css index 785719ca..fc588ac5 100644 --- a/src/gtk-3.0/gtk-sea.css +++ b/src/gtk-3.0/gtk-sea.css @@ -38,6 +38,10 @@ background-color: rgba(247, 247, 247, 0.999); } +.popup.background { + border-radius: 2px; +} + *:disabled { -gtk-icon-effect: dim; } @@ -2295,7 +2299,7 @@ menu, .csd menu, .csd .menu { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -2409,7 +2413,6 @@ menu > arrow:disabled, popover, popover.background { padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: #ffffff; box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.07); @@ -4450,7 +4453,7 @@ decoration:backdrop { } .csd.popup decoration { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.12); } diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss index 38817a6e..2386e062 100644 --- a/src/gtk-3.0/sass/_common.scss +++ b/src/gtk-3.0/sass/_common.scss @@ -38,6 +38,11 @@ $asset_suffix: if($variant=='dark', '-dark', ''); // use dark assets in dark var background-color: if($transparency == 'true', transparentize($bg_color, 0.001), $bg_color); // without this headerbar transparency doesn't seem to work } +.popup.background { + border-radius: 2px; // menus background +} + + *:disabled { -gtk-icon-effect: dim; } .gtkstyle-fallback { @@ -1712,7 +1717,7 @@ menu, .csd & { padding: 4px 0; - border-radius: 0; + border-radius: 2px; border: none; } @@ -1802,7 +1807,6 @@ popover, popover.background { $_popover_bg: if($variant=='light', $base_color, $bg_color); padding: 2px; - border-radius: 3px; background-clip: border-box; background-color: $_popover_bg; @@ -3281,7 +3285,7 @@ decoration { &.maximized { border-radius: 0; } } .csd.popup & { - border-radius: 0; + border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px $borders_color; } tooltip.csd & {