From 152a427d2a85793953991cc113a6e54ecdcee994 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 26 Oct 2016 11:17:33 +0200 Subject: cinnamon: use correct path for menu-separator.svg (fix #689) --- common/cinnamon/sass/_common.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/cinnamon/sass') diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index 6760dcc..b1e77be 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -339,7 +339,7 @@ StScrollBar { margin: 10px 0px; background-color: transparent; border: none; - border-image: url("common-assets/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } .popup-alternating-menu-item:alternate { -- cgit v1.2.3 From 15699330e7e271f33f7f3e3c29c901acc3c36c89 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 19 Nov 2016 12:43:17 +0100 Subject: add Cinnamon 3.2 support (#695) --- common/cinnamon/sass/_common.scss | 92 ++++++++++++++++++++++++++++++++++----- 1 file changed, 82 insertions(+), 10 deletions(-) (limited to 'common/cinnamon/sass') diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index b1e77be..dbca21b 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -267,9 +267,9 @@ StScrollBar { // // Popvers/Menus // +.menu, .popup-menu, %menu { - color: white; min-width: 200px; color: $fg_color; border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; @@ -357,8 +357,13 @@ StScrollBar { // #panel { font-weight: bold; - height: 2.1em; - min-height: 27px; + height: 27px; + width: 32px; + + &:highlight { + border-image: none; + background-color: transparentize($error_color, 0.5); + } &Left { spacing: 4px; @@ -368,8 +373,15 @@ StScrollBar { background-gradient-start: rgba(255,0,0,0.05); background-gradient-end: rgba(255,0,0,0.2); } - &:ltr ·{ padding-right: 4px; } - &:rtl ·{ padding-left: 4px; } + &:ltr { padding-right: 4px; } + &:rtl { padding-left: 4px; } + + &.vertical { + padding: 0; + + &:ltr { padding-right: 0px; } + &:rtl { padding-left: 0px; } + } } &Right { @@ -379,8 +391,15 @@ StScrollBar { background-gradient-start: rgba(0,0,255,0.05); background-gradient-end: rgba(0,0,255,0.2); } - &:ltr ·{ padding-left: 4px; spacing: 0px; } - &:rtl ·{ padding-right: 4px; spacing: 0px; } + &:ltr { padding-left: 4px; spacing: 0px; } + &:rtl { padding-right: 4px; spacing: 0px; } + + &.vertical { + padding: 0; + + &:ltr { padding-right: 0px; } + &:rtl { padding-left: 0px; } + } } &Center { @@ -397,7 +416,7 @@ StScrollBar { .panel { $_panel_fg_color: $_shell_fg_color; - &-top, &-bottom { + &-top, &-bottom, &-left, &-right { color: $_panel_fg_color; font-size: 1em; padding: 0px; @@ -405,9 +424,17 @@ StScrollBar { &-top { border-image: url('common-assets/panel/panel-top.svg') 1 1 1 1; } &-bottom { border-image: url('common-assets/panel/panel-bottom.svg') 1 1 1 1; } + &-left { border-image: url('common-assets/panel/panel-left.svg') 1 1 1 1; } + &-right { border-image: url('common-assets/panel/panel-right.svg') 1 1 1 1; } + + &-dummy { + background-color: transparentize($error_color, 0.5); + + &:entered { background-color: transparentize($error_color, 0.4); } + } &-status-button { - border-widht: 0; + border-width: 0; -natural-hpadding: 3px; -minimum-hpadding: 3px; font-weight: bold; @@ -716,6 +743,11 @@ StScrollBar { opacity: 1; } +.calendar-week-number { + color: transparentize($fg_color, 0.3); + font-size: 80%; +} + // // Notifications // @@ -1226,6 +1258,13 @@ StScrollBar { .panel-bottom & { padding-top: 1px; } .panel-top & { padding-bottom: 1px; } + + &.vertical { + spacing: 4px; + padding: 10px 0; + } + + &:highlight { background-color: transparentize($error_color, 0.5); } } &-item-label { @@ -1237,6 +1276,7 @@ StScrollBar { &-item-box { font-weight: bold; background-image: none; + padding-top: 0; padding-left: 8px; padding-right: 8px; transition-duration: 100; @@ -1250,8 +1290,14 @@ StScrollBar { color: $_shell_fg_color; .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; } + } + + &.right, &.left { + padding-left: 0px; + padding-right: 0px; } } @@ -1445,6 +1491,10 @@ StScrollBar { // #panel-launchers-box { padding-left: 7px; + + &.vertical { + padding: 2px 0; + } } .panel-launcher { @@ -1488,10 +1538,20 @@ StScrollBar { text-shadow: none; transition-duration: 100; + &.vertical { + padding: 3px 0; + } + &:hover { color: $selected_fg_color; background-color: $selected_bg_color; } + + &:highlight { + background-image: none; + border-image: none; + background-color: transparentize($error_color, 0.5); + } } &-label { @@ -1540,11 +1600,19 @@ StScrollBar { .desklet { color: $osd_fg_color; + &:highlight { + background-color: transparentize($error_color, 0.5); + } + &-with-borders { border-image: url("common-assets/misc/bg.svg") 9 9 9 9; color: $osd_fg_color; padding: 12px; padding-bottom: 16px; + + &:highlight { + background-color: transparentize($error_color, 0.5); + } } &-with-borders-and-header { border-image: url("common-assets/misc/desklet.svg") 9 9 9 9; @@ -1554,6 +1622,10 @@ StScrollBar { border-radius-topright: 0; padding: 12px; padding-bottom: 17px; + + &:highlight { + background-color: transparentize($error_color, 0.5); + } } &-header { border-image: url("common-assets/misc/desklet-header.svg") 9 9 9 9; -- cgit v1.2.3 From 57ad5914bcad78c5e05d749100907def5cfc9dd5 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 25 Nov 2016 16:15:39 +0100 Subject: cinnamon 3.2: fix notifications inside menus (#695) --- common/cinnamon/sass/_common.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/cinnamon/sass') diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index dbca21b..da21020 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -761,8 +761,9 @@ StScrollBar { width: 34em; color: $osd_fg_color; + .menu &, .popup-menu & { - color: $fg_color; + &, &.multi-line-notification { color: $fg_color; } border-image: url("#{$asset_path}/misc/message.svg") 9 9 9 9; .notification-button, .notification-icon-button { -- cgit v1.2.3 From 8d26ecd8883566c39396e527f04891fa3d5efd1f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 25 Nov 2016 16:18:21 +0100 Subject: cinnamon 3.2: remove menu min-width (#695) --- common/cinnamon/sass/_common.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'common/cinnamon/sass') diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index da21020..e83a08a 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -270,7 +270,6 @@ StScrollBar { .menu, .popup-menu, %menu { - min-width: 200px; color: $fg_color; border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; -- cgit v1.2.3 From 9047b20712193d174fb3277c5252ce86f54b50c1 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 25 Nov 2016 16:34:48 +0100 Subject: cinnamon 3.2: fix panel launcher styling (#695) --- common/cinnamon/sass/_common.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'common/cinnamon/sass') 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; } } } -- cgit v1.2.3