From ed6f3af1e22f4ce97465e9e96da575880473594d Mon Sep 17 00:00:00 2001 From: Chabam Date: Tue, 14 Nov 2017 08:27:52 -0500 Subject: [PATCH] Applied the fix on the Sass files instead of the CSS files --- common/cinnamon/cinnamon-dark.css | 60 +++++++++++++++---------------- common/cinnamon/cinnamon.css | 60 +++++++++++++++---------------- common/cinnamon/sass/_common.scss | 9 +++++ 3 files changed, 69 insertions(+), 60 deletions(-) diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index d002a01..6187acd 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -1282,36 +1282,36 @@ StScrollBar { #panel-launchers-box.vertical { padding: 2px 0; } - .panel-launcher, - .launcher { - margin: 1px; - padding: 1px; - transition-duration: 200; } - .panel-launcher:hover, - .launcher:hover { - background-gradient-direction: none; - border: 0px solid #5294e2; } - .panel-bottom .panel-launcher:hover, .panel-bottom - .launcher:hover { - border-bottom-width: 1px; } - .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; } - .panel-bottom .panel-launcher, .panel-bottom - .launcher { - margin-bottom: 0; } - .panel-top .panel-launcher, .panel-top - .launcher { - margin-top: 0; - padding-top: 0 } +.panel-launcher, +.launcher { + margin: 1px; + padding: 1px; + transition-duration: 200; } + .panel-launcher:hover, + .launcher:hover { + background-gradient-direction: none; + border: 0px solid #5294e2; } + .panel-bottom .panel-launcher:hover, .panel-bottom + .launcher:hover { + border-bottom-width: 1px; } + .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; } + .panel-bottom .panel-launcher, .panel-bottom + .launcher { + margin-bottom: 0; } + .panel-top .panel-launcher, .panel-top + .launcher { + margin-top: 0; + padding-top: 0; } #overview-corner { background-image: url("common-assets/misc/overview.png"); } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 1801713..054535a 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -1282,36 +1282,36 @@ StScrollBar { #panel-launchers-box.vertical { padding: 2px 0; } - .panel-launcher, - .launcher { - margin: 1px; - padding: 1px; - transition-duration: 200; } - .panel-launcher:hover, - .launcher:hover { - background-gradient-direction: none; - border: 0px solid #5294e2; } - .panel-bottom .panel-launcher:hover, .panel-bottom - .launcher:hover { - border-bottom-width: 1px; } - .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; } - .panel-bottom .panel-launcher, .panel-bottom - .launcher { - margin-bottom: 0; } - .panel-top .panel-launcher, .panel-top - .launcher { - margin-top: 0; - padding-top: 0 } +.panel-launcher, +.launcher { + margin: 1px; + padding: 1px; + transition-duration: 200; } + .panel-launcher:hover, + .launcher:hover { + background-gradient-direction: none; + border: 0px solid #5294e2; } + .panel-bottom .panel-launcher:hover, .panel-bottom + .launcher:hover { + border-bottom-width: 1px; } + .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; } + .panel-bottom .panel-launcher, .panel-bottom + .launcher { + margin-bottom: 0; } + .panel-top .panel-launcher, .panel-top + .launcher { + margin-top: 0; + padding-top: 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 00af8f7..4624f25 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -1512,6 +1512,15 @@ StScrollBar { .panel-left & { border-left-width: 1px; padding-left: 0; } .panel-right & { border-right-width: 1px; padding-right: 0; } } + + .panel-bottom & { + margin-bottom: 0; + } + + .panel-top & { + margin-top: 0; + padding-top: 0; + } } //