From a77cd0c71e392b808404b122518a514bfe362124 Mon Sep 17 00:00:00 2001 From: Peter Cornelis Date: Mon, 21 Aug 2017 01:17:55 +0200 Subject: [PATCH] gtk: Some more tweaks --- EvoPop-Azure/gtk-3.0/gtk-dark.css | 22 ++++++++++++++-------- EvoPop-Azure/gtk-3.0/gtk.css | 22 ++++++++++++++-------- EvoPop/gtk-3.0/gtk-dark.css | 22 ++++++++++++++-------- EvoPop/gtk-3.0/gtk.css | 22 ++++++++++++++-------- sass/apps/_budgie.scss | 25 +++++++++++++++---------- 5 files changed, 71 insertions(+), 42 deletions(-) diff --git a/EvoPop-Azure/gtk-3.0/gtk-dark.css b/EvoPop-Azure/gtk-3.0/gtk-dark.css index f918f41..50668b5 100755 --- a/EvoPop-Azure/gtk-3.0/gtk-dark.css +++ b/EvoPop-Azure/gtk-3.0/gtk-dark.css @@ -4739,6 +4739,7 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec .budgie-popover list, .budgie-popover row { padding: 0; + margin: 0; background: none; border: none; box-shadow: none; @@ -4756,6 +4757,15 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec background-clip: border-box; box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.35); border: 1px solid @borders; } + .budgie-popover list:hover, + .budgie-popover row:hover, + .budgie-popover.background list:hover, + .budgie-popover.background row:hover { + background: none; } + .budgie-popover > frame.container, + .budgie-popover.background > frame.container { + margin: 0 -1px -1px; + padding: 2px 0 0; } .budgie-popover > .container { padding: 2px; } @@ -4831,16 +4841,12 @@ button.budgie-menu-launcher { box-shadow: none; background-color: transparent; } -.user-menu list:hover, -.user-menu row:hover { - background: none; } -.user-menu button { - margin-top: 4px; - margin-bottom: 4px; } .user-menu .content-box separator { + margin-left: 6px; + margin-right: 6px; background-color: rgba(254, 254, 254, 0.1); } -.user-menu .container { - padding: 6px; } +.user-menu button { + margin: 5px; } .user-menu > box.vertical row.activatable:first-child .indicator-item, .user-menu > frame.container > box.vertical row.activatable:first-child .indicator-item { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); diff --git a/EvoPop-Azure/gtk-3.0/gtk.css b/EvoPop-Azure/gtk-3.0/gtk.css index e9a0b9d..6ff40bd 100755 --- a/EvoPop-Azure/gtk-3.0/gtk.css +++ b/EvoPop-Azure/gtk-3.0/gtk.css @@ -4760,6 +4760,7 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec .budgie-popover list, .budgie-popover row { padding: 0; + margin: 0; background: none; border: none; box-shadow: none; @@ -4777,6 +4778,15 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec background-clip: border-box; box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.35); border: 1px solid @borders; } + .budgie-popover list:hover, + .budgie-popover row:hover, + .budgie-popover.background list:hover, + .budgie-popover.background row:hover { + background: none; } + .budgie-popover > frame.container, + .budgie-popover.background > frame.container { + margin: 0 -1px -1px; + padding: 2px 0 0; } .budgie-popover > .container { padding: 2px; } @@ -4852,16 +4862,12 @@ button.budgie-menu-launcher { box-shadow: none; background-color: transparent; } -.user-menu list:hover, -.user-menu row:hover { - background: none; } -.user-menu button { - margin-top: 4px; - margin-bottom: 4px; } .user-menu .content-box separator { + margin-left: 6px; + margin-right: 6px; background-color: rgba(40, 49, 65, 0.1); } -.user-menu .container { - padding: 6px; } +.user-menu button { + margin: 5px; } .user-menu > box.vertical row.activatable:first-child .indicator-item, .user-menu > frame.container > box.vertical row.activatable:first-child .indicator-item { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); diff --git a/EvoPop/gtk-3.0/gtk-dark.css b/EvoPop/gtk-3.0/gtk-dark.css index 437b605..f249739 100755 --- a/EvoPop/gtk-3.0/gtk-dark.css +++ b/EvoPop/gtk-3.0/gtk-dark.css @@ -4739,6 +4739,7 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec .budgie-popover list, .budgie-popover row { padding: 0; + margin: 0; background: none; border: none; box-shadow: none; @@ -4756,6 +4757,15 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec background-clip: border-box; box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.35); border: 1px solid @borders; } + .budgie-popover list:hover, + .budgie-popover row:hover, + .budgie-popover.background list:hover, + .budgie-popover.background row:hover { + background: none; } + .budgie-popover > frame.container, + .budgie-popover.background > frame.container { + margin: 0 -1px -1px; + padding: 2px 0 0; } .budgie-popover > .container { padding: 2px; } @@ -4831,16 +4841,12 @@ button.budgie-menu-launcher { box-shadow: none; background-color: transparent; } -.user-menu list:hover, -.user-menu row:hover { - background: none; } -.user-menu button { - margin-top: 4px; - margin-bottom: 4px; } .user-menu .content-box separator { + margin-left: 6px; + margin-right: 6px; background-color: rgba(254, 254, 254, 0.1); } -.user-menu .container { - padding: 6px; } +.user-menu button { + margin: 5px; } .user-menu > box.vertical row.activatable:first-child .indicator-item, .user-menu > frame.container > box.vertical row.activatable:first-child .indicator-item { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); diff --git a/EvoPop/gtk-3.0/gtk.css b/EvoPop/gtk-3.0/gtk.css index 893b508..e3d7d71 100755 --- a/EvoPop/gtk-3.0/gtk.css +++ b/EvoPop/gtk-3.0/gtk.css @@ -4760,6 +4760,7 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec .budgie-popover list, .budgie-popover row { padding: 0; + margin: 0; background: none; border: none; box-shadow: none; @@ -4777,6 +4778,15 @@ entry selection, row:selected, treeview.view:selected:focus, treeview.view:selec background-clip: border-box; box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.35); border: 1px solid @borders; } + .budgie-popover list:hover, + .budgie-popover row:hover, + .budgie-popover.background list:hover, + .budgie-popover.background row:hover { + background: none; } + .budgie-popover > frame.container, + .budgie-popover.background > frame.container { + margin: 0 -1px -1px; + padding: 2px 0 0; } .budgie-popover > .container { padding: 2px; } @@ -4852,16 +4862,12 @@ button.budgie-menu-launcher { box-shadow: none; background-color: transparent; } -.user-menu list:hover, -.user-menu row:hover { - background: none; } -.user-menu button { - margin-top: 4px; - margin-bottom: 4px; } .user-menu .content-box separator { + margin-left: 6px; + margin-right: 6px; background-color: rgba(49, 55, 61, 0.1); } -.user-menu .container { - padding: 6px; } +.user-menu button { + margin: 5px; } .user-menu > box.vertical row.activatable:first-child .indicator-item, .user-menu > frame.container > box.vertical row.activatable:first-child .indicator-item { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.06), 0 1px 2px rgba(0, 0, 0, 0.2), inset 0px 1px 0px 0px rgba(255, 255, 255, 0.1); diff --git a/sass/apps/_budgie.scss b/sass/apps/_budgie.scss index cb04131..c5b7cb1 100755 --- a/sass/apps/_budgie.scss +++ b/sass/apps/_budgie.scss @@ -50,6 +50,7 @@ $pos_list: ((top, bottom),(bottom,top),(left,right),(right,left)); %reset_style { padding: 0; + margin: 0; background: none; border: none; box-shadow: none; @@ -68,6 +69,15 @@ $pos_list: ((top, bottom),(bottom,top),(left,right),(right,left)); background-clip: border-box; box-shadow: 0 2px 3px 1px transparentize(black, 0.65); border: 1px solid #{"@borders"}; + list, + row { + &:hover { background: none; } + } + + > frame.container { + margin: 0 -1px -1px; // remove gap + padding: 2px 0 0; + } } .budgie-popover > .container { @@ -163,18 +173,13 @@ button.budgie-menu-launcher { // User Menu .user-menu { - list, - row { - &:hover { background: none; } - } - - button { - margin-top: 4px; - margin-bottom: 4px; + .content-box separator { + margin-left: 6px; + margin-right: 6px; + background-color: transparentize($fg_color, 0.9); } - .content-box separator { background-color: transparentize($fg_color, 0.9); } - .container { padding: 6px; } + button { margin: 5px; } // top-row (user-name and avatar) > box.vertical row.activatable:first-child,