rpms/adapta-gtk-theme
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
This repository has been archived on 2026-01-16. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.
adapta-gtk-theme/cinnamon4_update.patch
Leigh Scott 5dd60dc609 Update to version 3.95.0.11
2019-01-26 11:54:07 +00:00

349 lines
10 KiB
Diff
Raw Permalink Blame History

From 3ac96e3f2e4e8b2cc6095e0ffd47f5f4eb139efa Mon Sep 17 00:00:00 2001
From: smurphos <29017677+smurphos@users.noreply.github.com>
Date: Sat, 17 Nov 2018 09:02:53 +0000
Subject: [PATCH 1/6] Cinnanmon 4 - overview styling
---
shell/sass/cinnamon/_common.scss | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss
index e2d479263..f2d5017c4 100644
--- a/shell/sass/cinnamon/_common.scss
+++ b/shell/sass/cinnamon/_common.scss
@@ -606,6 +606,15 @@ $icon_size: 16px;
#overview { spacing: 12px; }
+// >=4.0
+.overview-empty-placeholder {
+ color: $osd_fg_color;
+ font-size: 1.5em;
+}
+.window-border {
+ outline: 0 none transparent;
+ border: 2px solid $osd_indicator_color;
+}
.window-caption {
-cinnamon-caption-spacing: 12px;
spacing: 25px;
@@ -617,7 +626,8 @@ $icon_size: 16px;
// FIXME: Cinnamon does not have 'window-clone-border'
// and the name 'selected' looks incorrect, should be 'focused' instead
- &#selected {
+ // selector is :focus for >=4.0
+ &#selected, &:focus {
spacing: 25px;
color: $selected_fg_color;
background-color: $osd_indicator_color;
From 70c5f7e2c58b256d253a23ebfcea70b82a75b818 Mon Sep 17 00:00:00 2001
From: smurphos <29017677+smurphos@users.noreply.github.com>
Date: Sat, 17 Nov 2018 09:04:01 +0000
Subject: [PATCH 2/6] Cinnamon 4 - new stock menu styling
---
shell/sass/cinnamon/_common.scss | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss
index f2d5017c4..9ec7d479f 100644
--- a/shell/sass/cinnamon/_common.scss
+++ b/shell/sass/cinnamon/_common.scss
@@ -1260,7 +1260,17 @@ $ws_thumb_spacing: 32px;
// from other applet menus
&-background {
}
-
+ // top-box and systembuttons-box are for the abortive version 4.0 stock menu. Included in case it ever returns.
+ &-top-box {
+ spacing: 10px;
+ }
+ &-systembuttons-box {
+ padding: 5px 0;
+ }
+ .menu-favorites-button {
+ padding: 5px;
+ &:hover { @include button(flat-hover); }
+ }
&-favorites-box {
padding: 7px;
border-radius: 0;
From 8146aca90841abcdee68cd6e54da120e52564bf7 Mon Sep 17 00:00:00 2001
From: smurphos <29017677+smurphos@users.noreply.github.com>
Date: Sat, 17 Nov 2018 09:05:38 +0000
Subject: [PATCH 3/6] Cinnamon 4 - GWL applet styling
---
shell/sass/cinnamon/_common.scss | 154 +++++++++++++++++++++++++++++++
1 file changed, 154 insertions(+)
diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss
index 9ec7d479f..a002ead5e 100644
--- a/shell/sass/cinnamon/_common.scss
+++ b/shell/sass/cinnamon/_common.scss
@@ -1579,6 +1579,160 @@ $ws_thumb_spacing: 32px;
background: none;
}
}
+// GWL is a cinnamon v>4.0 stock applet
+// /*******************************
+// * Grouped window list
+// *******************************/
+
+.grouped-window-list {
+ &-thumbnail-label {
+ padding-left: 4px;
+ }
+ &-number-label {
+ @include fontscaling($ref_size * 0.9);
+ color: $selected_fg_color;
+ font-weight: 700;
+ }
+ &-badge {
+ border-radius: 256px;
+ background-color: #000000;
+ // to prevent overlap of badge and box-shadow in top and left panel in larger icon sizes.
+ .panel-top & { margin-top: 2px }
+ .panel-left & { margin-left: 2px }
+ }
+ &-button-label {
+ padding-left: 4px;
+ }
+ &-thumbnail-alert {
+ background: rgba(255, 52, 52, 0.3);
+ }
+
+ &-item-box {
+ border: 0 none transparent;
+ border-image: none;
+ background-image: none;
+ background-color: $hidden_fill_color;
+ color: $osd_fg_color;
+ box-shadow: $empty_shadow;
+ font-weight: 400;
+ .panel-top &,
+ .panel-bottom &,
+ .panel-left &,
+ .panel-right & {
+ StIcon, StBin { padding: 0; }
+ }
+
+ @each $position, $_indicator in (top, 0 2px),
+ (bottom, 0 -2px),
+ (left, 2px 0),
+ (right, -2px 0) {
+ .panel-#{$position} & {
+ spacing: 0;
+ padding: 0;
+ border: 0 none transparent;
+ border-image: none;
+ background-color: $hidden_fill_color;
+ box-shadow: $empty_shadow;
+ // emulate two state themeing as per current themeing for icing task manager and window-list.
+ &:active, &:hover, &active:hover {
+ background-color: $hidden_fill_color;
+ box-shadow: inset #{$_indicator} $osd_outline_fill_color;
+ }
+ &:focus, &:active:focus, &:focus:hover, &:active:focus:hover {
+ background-color: $hidden_fill_color;
+ box-shadow: inset #{$_indicator} $osd_indicator_color;
+ }
+ }
+ }
+
+ StLabel {
+ font-weight: 400;
+
+ .panel-top &,
+ .panel-bottom & {
+ &:ltr {
+ padding: 0 (6px - 2px) 0 0;
+ }
+ &:rtl {
+ padding: 0 0 0 (6px - 2px);
+ }
+ }
+ }
+
+ &:progress,
+ .progress {
+ background-gradient-start: $accent_fill_color;
+ background-gradient-end: $accent_fill_color;
+ }
+ }
+
+ &-item-demands-attention {
+ background-gradient-start: $accent_fill_color;
+ background-gradient-end: $accent_fill_color;
+ color: $selected_fg_color;
+
+ @each $position, $_indicator in (top, 0 2px), (bottom, 0 -2px), (left, 2px 0), (right, -2px 0) {
+ .panel-#{$position} & {
+ box-shadow: inset #{$_indicator} $accent_color;
+ }
+ }
+ }
+ &-thumbnail-menu {
+ padding: 20px;
+ border: none;
+ border-image: url('assets/misc/osd.svg') 9 9 9 9;
+ border-radius: 2px;
+ color: $osd_fg_color;
+ background: none;
+
+ > StBoxLayout {
+ padding: 4px;
+ }
+
+ .item-box {
+ padding: 8px;
+ border-radius: 0; // fill entire surface to cover up the parent
+ background-color: $osd_bg_color; // use opaque
+ &:outlined,
+ &:selected { border-radius: 2px; }
+ &:outlined {
+ padding: 6px;
+ border: 2px solid $osd_outline_fill_color;
+ }
+ &:selected {
+ background-color: mix($osd_bg_color, $accent_color, 75%);
+ color: $inverted_accent_label_color;
+ }
+
+ > StBoxLayout { // icon and title
+ &:ltr { margin: 6px 0 0 6px; }
+ &:rtl { margin: 6px 6px 0 0; }
+
+ StLabel { padding-bottom: 0.1em; }
+ }
+
+ > StButton { // close button
+ &:ltr { margin: 6px 6px 0 0; }
+ &:rtl { margin: 6px 0 0 6px; }
+ }
+ }
+
+ .thumbnail {
+ width: 256px;
+ margin: 6px;
+ }
+
+ .thumbnail-box {
+ padding: 2px;
+ spacing: 4px;
+ }
+
+ .separator {
+ width: 1px;
+ background: $borders_color;
+ }
+ }
+}
// /***********************************
From 20177a662bff1e739340f87f2fba9a35a208edaf Mon Sep 17 00:00:00 2001
From: smurphos <29017677+smurphos@users.noreply.github.com>
Date: Sat, 17 Nov 2018 09:06:47 +0000
Subject: [PATCH 4/6] Cinnamon - reduce menu search width and add some padding
to menu-context-menu for Cinnamenu compatibility
---
shell/sass/cinnamon/_common.scss | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss
index a002ead5e..86fc65294 100644
--- a/shell/sass/cinnamon/_common.scss
+++ b/shell/sass/cinnamon/_common.scss
@@ -1412,7 +1412,7 @@ $ws_thumb_spacing: 32px;
#menu-search-entry {
@extend %entry;
- width: 24em;
+ width: 16em;
caret-color: $fg_color;
font-weight: 500;
}
@@ -1424,6 +1424,7 @@ $ws_thumb_spacing: 32px;
// Context menu (at the moment only for favorites)
.menu-context-menu {
+padding: 0.5em;
}
From db47c7403c3646961924013107e88b26d44f82ef Mon Sep 17 00:00:00 2001
From: smurphos <29017677+smurphos@users.noreply.github.com>
Date: Sat, 17 Nov 2018 09:09:21 +0000
Subject: [PATCH 5/6] Cinnamon - bugfix - workspace switcher on vertical panels
---
shell/sass/cinnamon/_common.scss | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss
index 86fc65294..616133773 100644
--- a/shell/sass/cinnamon/_common.scss
+++ b/shell/sass/cinnamon/_common.scss
@@ -1836,7 +1836,11 @@ padding: 0.5em;
background-color: $hidden_fill_color;
transition-duration: 0.2s;
- // .vertical & { padding: 3px; } // NEEDS_REVIEW
+.vertical & {
+ width: 10px;
+ height: 20px;
+ // padding: 3px 0; // NEEDS_REVIEW
+}
&:hover {
color: $selected_fg_color;
@@ -1869,7 +1873,11 @@ padding: 0.5em;
.workspace-graph {
padding: 3px;
spacing: 3px;
-
+
+ .vertical & {
+ padding: 0;
+ }
+
.workspace {
border: 1px solid shellopacity(black, 0.4);
background-gradient-direction: none;
From a098df43a80df6e5c47f11484c4bc04479892108 Mon Sep 17 00:00:00 2001
From: smurphos <29017677+smurphos@users.noreply.github.com>
Date: Sun, 18 Nov 2018 04:14:08 +0000
Subject: [PATCH 6/6] Cinnamon - GWL bugfix
---
shell/sass/cinnamon/_common.scss | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/shell/sass/cinnamon/_common.scss b/shell/sass/cinnamon/_common.scss
index 616133773..718d8cdf4 100644
--- a/shell/sass/cinnamon/_common.scss
+++ b/shell/sass/cinnamon/_common.scss
@@ -1634,12 +1634,12 @@ padding: 0.5em;
border-image: none;
background-color: $hidden_fill_color;
box-shadow: $empty_shadow;
- // emulate two state themeing as per current themeing for icing task manager and window-list.
- &:active, &:hover, &active:hover {
+ // emulate two state theming as per current theming for icing task manager and window-list.
+ &:active, &:checked {
background-color: $hidden_fill_color;
box-shadow: inset #{$_indicator} $osd_outline_fill_color;
}
- &:focus, &:active:focus, &:focus:hover, &:active:focus:hover {
+ &:hover, &:active:hover, &:focus, &:active:focus, &:focus:hover, &:active:focus:hover {
background-color: $hidden_fill_color;
box-shadow: inset #{$_indicator} $osd_indicator_color;
}
Reference in a new issue View git blame Copy permalink