From 0fb7ccb1ab8782d2021d75dc9ec0725a66141acd Mon Sep 17 00:00:00 2001 From: Chabam Date: Sun, 12 Nov 2017 22:43:49 -0500 Subject: [PATCH 1/3] Fixed a bug where when you hover a launcher it adds margin that moves other item on the panel --- common/cinnamon/cinnamon-dark.css | 61 +++++++++++++++++++------------ common/cinnamon/cinnamon.css | 61 +++++++++++++++++++------------ 2 files changed, 76 insertions(+), 46 deletions(-) diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index 34f45efad..c35014b7e 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -1282,29 +1282,44 @@ 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-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 { + margin-bottom: 0; + 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; } + .panel-left .panel-launcher, .panel-left + .launcher { + margin-left: 0; + padding-left: 0; } + .panel-right .panel-launcher, .panel-right + .launcher { + margin-right: 0; + 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 b816ac32c..f25ced7a1 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -1282,29 +1282,44 @@ 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-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 { + margin-bottom: 0; + 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; } + .panel-left .panel-launcher, .panel-left + .launcher { + margin-left: 0; + padding-left: 0; } + .panel-right .panel-launcher, .panel-right + .launcher { + margin-right: 0; + padding-right: 0; } #overview-corner { background-image: url("common-assets/misc/overview.png"); } From bb613a45b4d807c6785433c4a1672a9acd41666e Mon Sep 17 00:00:00 2001 From: Chabam Date: Sun, 12 Nov 2017 23:52:05 -0500 Subject: [PATCH 2/3] Modified the css to allow the fix to work on every disposition of the panel (top, bottom, etc ...) --- common/cinnamon/cinnamon-dark.css | 12 ++---------- common/cinnamon/cinnamon.css | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index c35014b7e..d002a01d4 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -1293,7 +1293,6 @@ StScrollBar { border: 0px solid #5294e2; } .panel-bottom .panel-launcher:hover, .panel-bottom .launcher:hover { - margin-bottom: 0; border-bottom-width: 1px; } .panel-top .panel-launcher:hover, .panel-top .launcher:hover { @@ -1311,15 +1310,8 @@ StScrollBar { margin-bottom: 0; } .panel-top .panel-launcher, .panel-top .launcher { - margin-top: 0; } - .panel-left .panel-launcher, .panel-left - .launcher { - margin-left: 0; - padding-left: 0; } - .panel-right .panel-launcher, .panel-right - .launcher { - margin-right: 0; - padding-right: 0; } + 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 f25ced7a1..18017131c 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -1293,7 +1293,6 @@ StScrollBar { border: 0px solid #5294e2; } .panel-bottom .panel-launcher:hover, .panel-bottom .launcher:hover { - margin-bottom: 0; border-bottom-width: 1px; } .panel-top .panel-launcher:hover, .panel-top .launcher:hover { @@ -1311,15 +1310,8 @@ StScrollBar { margin-bottom: 0; } .panel-top .panel-launcher, .panel-top .launcher { - margin-top: 0; } - .panel-left .panel-launcher, .panel-left - .launcher { - margin-left: 0; - padding-left: 0; } - .panel-right .panel-launcher, .panel-right - .launcher { - margin-right: 0; - padding-right: 0; } + margin-top: 0; + padding-top: 0 } #overview-corner { background-image: url("common-assets/misc/overview.png"); } From ed6f3af1e22f4ce97465e9e96da575880473594d Mon Sep 17 00:00:00 2001 From: Chabam Date: Tue, 14 Nov 2017 08:27:52 -0500 Subject: [PATCH 3/3] 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 d002a01d4..6187acd93 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 18017131c..054535a7e 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 00af8f7f9..4624f2568 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; + } } //