Update the gnome 46 patch
This commit is contained in:
Kevin MacMartin
parent
9c749b2fda
commit
9d83a0e2ab
1 changed files with 52 additions and 55 deletions
|
|
@ -1,28 +1,28 @@
|
|||
From 7698d02e99c01afc6451ec13dca730c1f0e100a1 Mon Sep 17 00:00:00 2001
|
||||
From 9c749b2fda0b035e9a041952bdc25ce5f634d62a Mon Sep 17 00:00:00 2001
|
||||
From: Kevin MacMartin <prurigro@gmail.com>
|
||||
Date: Mon, 25 Mar 2024 13:32:44 -0400
|
||||
Subject: [PATCH] Dark theme
|
||||
Date: Mon, 25 Mar 2024 14:54:32 -0400
|
||||
Subject: [PATCH] Re-apply patches (so it's clear what's changed)
|
||||
|
||||
---
|
||||
...ight.scss => gnome-shell-dark-laptop.scss} | 3 +-
|
||||
data/theme/gnome-shell-dark.scss | 1 +
|
||||
data/theme/gnome-shell-high-contrast.scss | 7 ----
|
||||
data/theme/gnome-shell-sass/_colors.scss | 4 +-
|
||||
data/theme/gnome-shell-sass/_drawing.scss | 6 +--
|
||||
data/theme/gnome-shell-sass/_palette.scss | 10 ++---
|
||||
.../widgets/_corner-ripple.scss | 2 +-
|
||||
.../gnome-shell-sass/widgets/_panel.scss | 41 +++++++++++++++----
|
||||
8 files changed, 48 insertions(+), 26 deletions(-)
|
||||
rename data/theme/{gnome-shell-light.scss => gnome-shell-dark-laptop.scss} (84%)
|
||||
delete mode 100644 data/theme/gnome-shell-high-contrast.scss
|
||||
...light.scss => gnome-shell-dark-laptop.scss | 3 +-
|
||||
gnome-shell-dark.scss | 1 +
|
||||
gnome-shell-high-contrast.scss | 7 ----
|
||||
gnome-shell-sass/_colors.scss | 4 +-
|
||||
gnome-shell-sass/_drawing.scss | 6 +--
|
||||
gnome-shell-sass/_palette.scss | 10 ++---
|
||||
gnome-shell-sass/widgets/_corner-ripple.scss | 2 +-
|
||||
gnome-shell-sass/widgets/_panel.scss | 38 +++++++++++++++----
|
||||
8 files changed, 44 insertions(+), 27 deletions(-)
|
||||
rename gnome-shell-light.scss => gnome-shell-dark-laptop.scss (84%)
|
||||
delete mode 100644 gnome-shell-high-contrast.scss
|
||||
|
||||
diff --git a/data/theme/gnome-shell-light.scss b/data/theme/gnome-shell-dark-laptop.scss
|
||||
diff --git a/gnome-shell-light.scss b/gnome-shell-dark-laptop.scss
|
||||
similarity index 84%
|
||||
rename from data/theme/gnome-shell-light.scss
|
||||
rename to data/theme/gnome-shell-dark-laptop.scss
|
||||
rename from gnome-shell-light.scss
|
||||
rename to gnome-shell-dark-laptop.scss
|
||||
index 22b8347..61925f9 100644
|
||||
--- a/data/theme/gnome-shell-light.scss
|
||||
+++ b/data/theme/gnome-shell-dark-laptop.scss
|
||||
--- a/gnome-shell-light.scss
|
||||
+++ b/gnome-shell-dark-laptop.scss
|
||||
@@ -1,6 +1,7 @@
|
||||
-$variant: 'light';
|
||||
+$variant: 'dark';
|
||||
|
|
@ -32,10 +32,10 @@ index 22b8347..61925f9 100644
|
|||
@import "gnome-shell-sass/_colors"; //use gtk colors
|
||||
@import "gnome-shell-sass/_drawing";
|
||||
@import "gnome-shell-sass/_common";
|
||||
diff --git a/data/theme/gnome-shell-dark.scss b/data/theme/gnome-shell-dark.scss
|
||||
diff --git a/gnome-shell-dark.scss b/gnome-shell-dark.scss
|
||||
index c1a330b..294ac64 100644
|
||||
--- a/data/theme/gnome-shell-dark.scss
|
||||
+++ b/data/theme/gnome-shell-dark.scss
|
||||
--- a/gnome-shell-dark.scss
|
||||
+++ b/gnome-shell-dark.scss
|
||||
@@ -1,6 +1,7 @@
|
||||
$variant: 'dark';
|
||||
$contrast: 'normal';
|
||||
|
|
@ -44,10 +44,10 @@ index c1a330b..294ac64 100644
|
|||
@import "gnome-shell-sass/_colors"; //use gtk colors
|
||||
@import "gnome-shell-sass/_drawing";
|
||||
@import "gnome-shell-sass/_common";
|
||||
diff --git a/data/theme/gnome-shell-high-contrast.scss b/data/theme/gnome-shell-high-contrast.scss
|
||||
diff --git a/gnome-shell-high-contrast.scss b/gnome-shell-high-contrast.scss
|
||||
deleted file mode 100644
|
||||
index a4394dd..0000000
|
||||
--- a/data/theme/gnome-shell-high-contrast.scss
|
||||
--- a/gnome-shell-high-contrast.scss
|
||||
+++ /dev/null
|
||||
@@ -1,7 +0,0 @@
|
||||
-$variant: 'dark';
|
||||
|
|
@ -57,10 +57,10 @@ index a4394dd..0000000
|
|||
-@import "gnome-shell-sass/_drawing";
|
||||
-@import "gnome-shell-sass/_common";
|
||||
-@import "gnome-shell-sass/_widgets";
|
||||
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
|
||||
diff --git a/gnome-shell-sass/_colors.scss b/gnome-shell-sass/_colors.scss
|
||||
index ffd4e9f..9a5450a 100644
|
||||
--- a/data/theme/gnome-shell-sass/_colors.scss
|
||||
+++ b/data/theme/gnome-shell-sass/_colors.scss
|
||||
--- a/gnome-shell-sass/_colors.scss
|
||||
+++ b/gnome-shell-sass/_colors.scss
|
||||
@@ -21,7 +21,7 @@ $system_base_color: $_base_color_dark;
|
||||
$system_fg_color: $_base_color_light;
|
||||
|
||||
|
|
@ -77,10 +77,10 @@ index ffd4e9f..9a5450a 100644
|
|||
-$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%));
|
||||
\ No newline at end of file
|
||||
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%));
|
||||
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
|
||||
diff --git a/gnome-shell-sass/_drawing.scss b/gnome-shell-sass/_drawing.scss
|
||||
index 5d56d4c..dd6f8a8 100644
|
||||
--- a/data/theme/gnome-shell-sass/_drawing.scss
|
||||
+++ b/data/theme/gnome-shell-sass/_drawing.scss
|
||||
--- a/gnome-shell-sass/_drawing.scss
|
||||
+++ b/gnome-shell-sass/_drawing.scss
|
||||
@@ -386,7 +386,7 @@
|
||||
}
|
||||
|
||||
|
|
@ -108,10 +108,10 @@ index 5d56d4c..dd6f8a8 100644
|
|||
}
|
||||
|
||||
&:focus, &:hover {
|
||||
diff --git a/data/theme/gnome-shell-sass/_palette.scss b/data/theme/gnome-shell-sass/_palette.scss
|
||||
diff --git a/gnome-shell-sass/_palette.scss b/gnome-shell-sass/_palette.scss
|
||||
index 78847d9..8627513 100644
|
||||
--- a/data/theme/gnome-shell-sass/_palette.scss
|
||||
+++ b/data/theme/gnome-shell-sass/_palette.scss
|
||||
--- a/gnome-shell-sass/_palette.scss
|
||||
+++ b/gnome-shell-sass/_palette.scss
|
||||
@@ -39,8 +39,8 @@ $light_2: #f6f5f4;
|
||||
$light_3: #deddda;
|
||||
$light_4: #c0bfbc;
|
||||
|
|
@ -127,10 +127,10 @@ index 78847d9..8627513 100644
|
|||
+$dark_3: #3d3d3d;
|
||||
+$dark_4: #242424;
|
||||
+$dark_5: #000000;
|
||||
diff --git a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
|
||||
diff --git a/gnome-shell-sass/widgets/_corner-ripple.scss b/gnome-shell-sass/widgets/_corner-ripple.scss
|
||||
index 9aff431..1760eda 100644
|
||||
--- a/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
|
||||
+++ b/data/theme/gnome-shell-sass/widgets/_corner-ripple.scss
|
||||
--- a/gnome-shell-sass/widgets/_corner-ripple.scss
|
||||
+++ b/gnome-shell-sass/widgets/_corner-ripple.scss
|
||||
@@ -3,7 +3,7 @@
|
||||
$ripple_size: 50px;
|
||||
|
||||
|
|
@ -140,10 +140,10 @@ index 9aff431..1760eda 100644
|
|||
box-shadow: 0 0 2px 2px rgba(255,255,255,0.2);
|
||||
// plus + 2px for the border (box-shadow)
|
||||
width: $ripple_size + 2px;
|
||||
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
|
||||
index 2a29eee..9b455a0 100644
|
||||
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
|
||||
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
|
||||
diff --git a/gnome-shell-sass/widgets/_panel.scss b/gnome-shell-sass/widgets/_panel.scss
|
||||
index 2a29eee..80e93f9 100644
|
||||
--- a/gnome-shell-sass/widgets/_panel.scss
|
||||
+++ b/gnome-shell-sass/widgets/_panel.scss
|
||||
@@ -1,8 +1,8 @@
|
||||
/* Top Bar */
|
||||
// a.k.a. the panel
|
||||
|
|
@ -172,6 +172,15 @@ index 2a29eee..9b455a0 100644
|
|||
margin: 0 $base_margin;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
// reduce margin between icons in combined menu
|
||||
.panel-status-menu-box,
|
||||
.panel-status-indicators-box {
|
||||
- spacing: $base_margin;
|
||||
+ spacing: 0px;
|
||||
|
||||
> .system-status-icon {
|
||||
padding: 0;
|
||||
@@ -47,6 +47,9 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
}
|
||||
|
||||
|
|
@ -204,19 +213,7 @@ index 2a29eee..9b455a0 100644
|
|||
|
||||
.clock {
|
||||
// the highlighted child
|
||||
@@ -144,6 +155,11 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
}
|
||||
}
|
||||
|
||||
+ .panel-status-indicators-box {
|
||||
+ padding-right: 2px;
|
||||
+ padding-left: 3px;
|
||||
+ }
|
||||
+
|
||||
.panel-status-indicators-box,
|
||||
.panel-status-menu-box {
|
||||
spacing: 2px;
|
||||
@@ -151,7 +167,14 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
@@ -151,7 +162,14 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
|
||||
// spacing between power icon and (optional) percentage label
|
||||
.power-status.panel-status-indicators-box {
|
||||
|
|
@ -226,12 +223,12 @@ index 2a29eee..9b455a0 100644
|
|||
+ @if $laptop {
|
||||
+ margin-bottom: 2px;
|
||||
+ } @else {
|
||||
+ margin-left: 2px;
|
||||
+ margin-left: 0px;
|
||||
+ }
|
||||
}
|
||||
|
||||
// important privacy related indicators
|
||||
@@ -174,7 +197,11 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
@@ -174,7 +192,11 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
|
||||
.clock-display-box {
|
||||
spacing: 2px;
|
||||
.clock {
|
||||
|
|
|
|||
Loading…
Reference in a new issue