From 4b3124249fbf67370a5370dff77794174505bcd5 Mon Sep 17 00:00:00 2001 From: Steve M <29017677+smurphos@users.noreply.github.com> Date: Thu, 4 Apr 2019 16:53:36 +0100 Subject: [PATCH] Cinnamon fixes. (#218) * Cinnamon Calender - avoid using % font-size declarations as it breaks centering of text * Cinnamon Panel - window-list,gwl and panel launchers - revise font-weight and highlighting scheme * Cinnamon Panel - remove unused assets --- .../common-assets/panel/activities-active.svg | 178 ------------------ .../common-assets/panel/activities.svg | 158 ---------------- .../panel/window-list-active-bottom.svg | 162 ---------------- .../panel/window-list-active-left.svg | 164 ---------------- .../panel/window-list-active-right.svg | 164 ---------------- .../panel/window-list-active-top.svg | 162 ---------------- .../panel/window-list-hover-bottom.svg | 162 ---------------- .../panel/window-list-hover-left.svg | 164 ---------------- .../panel/window-list-hover-right.svg | 164 ---------------- .../panel/window-list-hover-top.svg | 162 ---------------- common/cinnamon/sass/_common.scss | 86 ++++++--- 11 files changed, 55 insertions(+), 1671 deletions(-) delete mode 100644 common/cinnamon/common-assets/panel/activities-active.svg delete mode 100644 common/cinnamon/common-assets/panel/activities.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-active-bottom.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-active-left.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-active-right.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-active-top.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-hover-bottom.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-hover-left.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-hover-right.svg delete mode 100644 common/cinnamon/common-assets/panel/window-list-hover-top.svg diff --git a/common/cinnamon/common-assets/panel/activities-active.svg b/common/cinnamon/common-assets/panel/activities-active.svg deleted file mode 100644 index ae5c602..0000000 --- a/common/cinnamon/common-assets/panel/activities-active.svg +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/activities.svg b/common/cinnamon/common-assets/panel/activities.svg deleted file mode 100644 index b4a4b0d..0000000 --- a/common/cinnamon/common-assets/panel/activities.svg +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg deleted file mode 100644 index fbe4599..0000000 --- a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-active-left.svg b/common/cinnamon/common-assets/panel/window-list-active-left.svg deleted file mode 100644 index fecc258..0000000 --- a/common/cinnamon/common-assets/panel/window-list-active-left.svg +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-active-right.svg b/common/cinnamon/common-assets/panel/window-list-active-right.svg deleted file mode 100644 index 1f78f1d..0000000 --- a/common/cinnamon/common-assets/panel/window-list-active-right.svg +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-active-top.svg b/common/cinnamon/common-assets/panel/window-list-active-top.svg deleted file mode 100644 index 54a9036..0000000 --- a/common/cinnamon/common-assets/panel/window-list-active-top.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-hover-bottom.svg b/common/cinnamon/common-assets/panel/window-list-hover-bottom.svg deleted file mode 100644 index b47481d..0000000 --- a/common/cinnamon/common-assets/panel/window-list-hover-bottom.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-hover-left.svg b/common/cinnamon/common-assets/panel/window-list-hover-left.svg deleted file mode 100644 index 9e4a67f..0000000 --- a/common/cinnamon/common-assets/panel/window-list-hover-left.svg +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-hover-right.svg b/common/cinnamon/common-assets/panel/window-list-hover-right.svg deleted file mode 100644 index 608e198..0000000 --- a/common/cinnamon/common-assets/panel/window-list-hover-right.svg +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/common-assets/panel/window-list-hover-top.svg b/common/cinnamon/common-assets/panel/window-list-hover-top.svg deleted file mode 100644 index 5b9b762..0000000 --- a/common/cinnamon/common-assets/panel/window-list-hover-top.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index 1f2380e..f63007b 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -355,7 +355,6 @@ StScrollBar { // Panel // #panel { - font-weight: bold; height: 27px; width: 32px; @@ -703,7 +702,7 @@ StScrollBar { } .calendar-day-base { - font-size: 80%; + font-size: 8pt; text-align: center; width: 2.5em; height: 2.5em; @@ -715,7 +714,7 @@ StScrollBar { .calendar-day-heading { color: transparentize($fg_color, 0.15); margin-top: 1em; - font-size: 70%; + font-size: 6pt; width: 2.5em; height: 2em; } @@ -757,10 +756,10 @@ StScrollBar { .calendar-week-number { color: transparentize($fg_color, 0.3); - font-size: 80%; + font-size: 6pt; width: 2.5em; height: 2em; - padding: 0.7em 0 0; + padding: 1.2em 0 0; text-align: center; } @@ -1308,13 +1307,11 @@ StScrollBar { } &-item-label { - font-weight: bold; width: 15em; min-width: 5px; } &-item-box { - font-weight: bold; background-image: none; padding-top: 0; padding-left: 8px; @@ -1323,17 +1320,30 @@ StScrollBar { transition-duration: 100; color: transparentize($_shell_fg_color, 0.4); - &:hover {color: $_shell_fg_color;} - + &:hover, + &:focus:hover { + color: $_shell_fg_color; + background-color: $selected_bg_color; + } + + &:focus:hover { + .panel-bottom & { box-shadow: 0 -2px 0 0 $_shell_fg_color inset; } + .panel-top & { box-shadow: 0 2px 0 0 $_shell_fg_color inset; } + .panel-left & { box-shadow: 2px 0 0 0 $_shell_fg_color inset; } + .panel-right & { box-shadow: -2px 0 0 0 $_shell_fg_color inset; } + } + &:active, &:checked, &:focus { color: $_shell_fg_color; + background-color: transparentize($osd_fg_color,.6); + font-weight: bold; - .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; } - .panel-top & { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; } - .panel-left & { border-image: url("common-assets/panel/window-list-active-left.svg") 3 1 3 3; } - .panel-right & { border-image: url("common-assets/panel/window-list-active-right.svg") 1 3 3 3; } + .panel-bottom & { box-shadow: 0 -2px 0 0 $selected_bg_color inset; } + .panel-top & { box-shadow: 0 2px 0 0 $selected_bg_color inset; } + .panel-left & { box-shadow: 2px 0 0 0 $selected_bg_color inset; } + .panel-right & { box-shadow: -2px 0 0 0 $selected_bg_color inset; } } &.right, &.left { @@ -1372,24 +1382,42 @@ StScrollBar { } &-item-box { transition-duration: 100; - font-weight: bold; background-image: none; color: transparentize($_shell_fg_color, 0.4); - &:hover, &:active:hover { color: $_shell_fg_color; } - &:hover, &:active, &:active:hover { - - .panel-bottom & { border-image: url("common-assets/panel/window-list-hover-bottom.svg") 3 3 1 3; } - .panel-top & { border-image: url("common-assets/panel/window-list-hover-top.svg") 3 3 3 1; } - .panel-left & { border-image: url("common-assets/panel/window-list-hover-left.svg") 3 1 3 3; } - .panel-right & { border-image: url("common-assets/panel/window-list-hover-right.svg") 1 3 3 3; } + &:hover, &:active:hover { + color: $_shell_fg_color; + background-color: $selected_bg_color; + } + &:active { + background-color: rgba(0,0,0,0.01); + .panel-bottom & { box-shadow: 0 -2px 0 0 $selected_bg_color inset; } + .panel-top & { box-shadow: 0 2px 0 0 $selected_bg_color inset; } + .panel-left & { box-shadow: 2px 0 0 0 $selected_bg_color inset; } + .panel-right & { box-shadow: -2px 0 0 0 $selected_bg_color inset; } } - &:focus, &:focus:hover { + &:active:hover { + .panel-bottom & { box-shadow: 0 -2px 0 0 $_shell_fg_color inset; } + .panel-top & { box-shadow: 0 2px 0 0 $_shell_fg_color inset; } + .panel-left & { box-shadow: 2px 0 0 0 $_shell_fg_color inset; } + .panel-right & { box-shadow: -2px 0 0 0 $_shell_fg_color inset; } + } + &:focus { color: $_shell_fg_color; + background-color: transparentize($osd_fg_color,.6); + font-weight: bold; - .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; } - .panel-top & { border-image: url("common-assets/panel/window-list-active-top.svg") 3 3 3 1; } - .panel-left & { border-image: url("common-assets/panel/window-list-active-left.svg") 3 1 3 3; } - .panel-right & { border-image: url("common-assets/panel/window-list-active-right.svg") 1 3 3 3; } + .panel-bottom & { box-shadow: 0 -2px 0 0 $selected_bg_color inset; } + .panel-top & { box-shadow: 0 2px 0 0 $selected_bg_color inset; } + .panel-left & { box-shadow: 2px 0 0 0 $selected_bg_color inset; } + .panel-right & { box-shadow: -2px 0 0 0 $selected_bg_color inset; } + } + &:focus:hover { + background-color: $selected_bg_color; + + .panel-bottom & { box-shadow: 0 -2px 0 0 $_shell_fg_color inset; } + .panel-top & { box-shadow: 0 2px 0 0 $_shell_fg_color inset; } + .panel-left & { box-shadow: 2px 0 0 0 $_shell_fg_color inset; } + .panel-right & { box-shadow: -2px 0 0 0 $_shell_fg_color inset; } } .progress { background-color: $selected_bg_color; @@ -1636,11 +1664,7 @@ StScrollBar { } } .launcher:hover { - - .panel-bottom & { border-image: url("common-assets/panel/window-list-hover-bottom.svg") 3 3 1 3; } - .panel-top & { border-image: url("common-assets/panel/window-list-hover-top.svg") 3 3 3 1; } - .panel-left & { border-image: url("common-assets/panel/window-list-hover-left.svg") 3 1 3 3; } - .panel-right & { border-image: url("common-assets/panel/window-list-hover-right.svg") 1 3 3 3; } + background-color: $selected_bg_color; } }