From 9047b20712193d174fb3277c5252ce86f54b50c1 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 25 Nov 2016 16:34:48 +0100 Subject: [PATCH] cinnamon 3.2: fix panel launcher styling (#695) --- common/cinnamon/cinnamon-dark.css | 20 ++++++++++++++++---- common/cinnamon/cinnamon.css | 20 ++++++++++++++++---- common/cinnamon/sass/_common.scss | 5 ++++- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index 8ea7793..488f54b 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -1282,17 +1282,29 @@ StScrollBar { #panel-launchers-box.vertical { padding: 2px 0; } -.panel-launcher { +.panel-launcher, +.launcher { margin: 1px; padding: 1px; transition-duration: 200; } - .panel-launcher:hover { + .panel-launcher:hover, + .launcher:hover { background-gradient-direction: none; border: 0px solid #5294e2; } - .panel-bottom .panel-launcher:hover { + .panel-bottom .panel-launcher:hover, .panel-bottom + .launcher:hover { border-bottom-width: 1px; } - .panel-top .panel-launcher:hover { + .panel-top .panel-launcher:hover, .panel-top + .launcher:hover { border-top-width: 1px; } + .panel-left .panel-launcher:hover, .panel-left + .launcher:hover { + border-left-width: 1px; + padding-left: 0; } + .panel-right .panel-launcher:hover, .panel-right + .launcher:hover { + border-right-width: 1px; + padding-right: 0; } #overview-corner { background-image: url("common-assets/misc/overview.png"); } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 4b683c3..036f39d 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -1282,17 +1282,29 @@ StScrollBar { #panel-launchers-box.vertical { padding: 2px 0; } -.panel-launcher { +.panel-launcher, +.launcher { margin: 1px; padding: 1px; transition-duration: 200; } - .panel-launcher:hover { + .panel-launcher:hover, + .launcher:hover { background-gradient-direction: none; border: 0px solid #5294e2; } - .panel-bottom .panel-launcher:hover { + .panel-bottom .panel-launcher:hover, .panel-bottom + .launcher:hover { border-bottom-width: 1px; } - .panel-top .panel-launcher:hover { + .panel-top .panel-launcher:hover, .panel-top + .launcher:hover { border-top-width: 1px; } + .panel-left .panel-launcher:hover, .panel-left + .launcher:hover { + border-left-width: 1px; + padding-left: 0; } + .panel-right .panel-launcher:hover, .panel-right + .launcher:hover { + border-right-width: 1px; + padding-right: 0; } #overview-corner { background-image: url("common-assets/misc/overview.png"); } diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index e83a08a..51dd4bc 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -1497,7 +1497,8 @@ StScrollBar { } } -.panel-launcher { +.panel-launcher, +.launcher { margin: 1px; padding: 1px; transition-duration: 200; @@ -1508,6 +1509,8 @@ StScrollBar { .panel-bottom & { border-bottom-width: 1px; } .panel-top & { border-top-width: 1px; } + .panel-left & { border-left-width: 1px; padding-left: 0; } + .panel-right & { border-right-width: 1px; padding-right: 0; } } }