GS theme: Use included image assets and restore old activities button

lassekongo83 · May 10, 2021 · 46a39bf · 46a39bf
1 parent be9d466
commit 46a39bf
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 29 deletions.
diff --git a/gnome-shell/src/gnome-shell-high-contrast.css b/gnome-shell/src/gnome-shell-high-contrast.css
@@ -66,18 +66,18 @@ StEntry StLabel.hint-text { margin-left: 2px; color: rgba(255, 255, 255, 0.7); }
 /* Check Boxes */
 .check-box StBoxLayout { spacing: .8em; }
 
-.check-box StBin { width: 24px; height: 22px; background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg"); }
+.check-box StBin { width: 24px; height: 22px; background-image: url("checkbox-off.svg"); }
 
-.check-box:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
+.check-box:focus StBin { background-image: url("checkbox-off-focused.svg"); }
 
-.check-box:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
+.check-box:checked StBin { background-image: url("checkbox.svg"); }
 
-.check-box:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
+.check-box:focus:checked StBin { background-image: url("checkbox-focused.svg"); }
 
 /* Switches */
-.toggle-switch { color: #fff; height: 22px; width: 46px; background-size: contain; background-image: url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"); }
+.toggle-switch { color: #fff; height: 22px; width: 46px; background-size: contain; background-image: url("toggle-off-dark.svg"); }
 
-.toggle-switch:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"); }
+.toggle-switch:checked { background-image: url("toggle-on-dark.svg"); }
 
 /* Slider */
 .slider { height: 15px; -barlevel-height: 3px; -barlevel-background-color: black; -barlevel-border-width: 1px; -barlevel-border-color: black; -barlevel-active-background-color: #215d9c; -barlevel-active-border-color: #2362a5; -barlevel-overdrive-color: #d51010; -barlevel-overdrive-border-color: #df1111; -barlevel-overdrive-separator-width: 1px; -slider-handle-radius: 7.5px; -slider-handle-border-width: 1px; -slider-handle-border-color: #fff; color: #fff; }
@@ -235,7 +235,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .calendar .calendar-today:active:hover, .calendar .calendar-today:active:focus, .calendar .calendar-today:selected:hover, .calendar .calendar-today:selected:focus { background-color: #2365a9; color: #ffffff; }
 
-.calendar .calendar-day-with-events { background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg"); }
+.calendar .calendar-day-with-events { background-image: url("calendar-today.svg"); }
 
 .calendar .calendar-day-with-events.calendar-work-day { color: white; font-weight: bold; }
 
@@ -510,7 +510,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 .audio-selection-device-icon { icon-size: 4.36em; }
 
 /* Welcome dialog */
-.welcome-dialog-image { background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg"); background-size: contain; /* Reasonable maximum dimensions */ height: 300px; width: 300px; }
+.welcome-dialog-image { background-image: url("gnome-shell-start.svg"); background-size: contain; /* Reasonable maximum dimensions */ height: 300px; width: 300px; }
 
 /* Network Dialogs */
 .nm-dialog { max-height: 34em; min-height: 31em; min-width: 32em; }
@@ -642,6 +642,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 #appMenu .panel-status-menu-box { padding: 0 6px; spacing: 6px; }
 
+#panel #panelActivities.panel-button > * { background-image: url("activities.svg"); background-position: center top; width: 24px; height: 24px; background-color: transparent !important; background-gradient-direction: none !important; border: 0 solid transparent !important; text-shadow: 0 0 transparent !important; transition-duration: 0ms !important; box-shadow: none !important; color: transparent; }
+
+#panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked { background-color: transparent; box-shadow: none; border-bottom-width: 1px; border-color: transparent; }
+
+#panel #panelActivities.panel-button:active > *, #panel #panelActivities.panel-button:overview > *, #panel #panelActivities.panel-button:focus > *, #panel #panelActivities.panel-button:checked > * { background-image: url("activities-active.svg"); }
+
 /* Activities Ripple */
 .ripple-box { background-color: rgba(158, 196, 235, 0.3); box-shadow: 0 0 2px 2px #4a90d9; width: 52px; height: 52px; border-radius: 0 0 52px 0; }
 
@@ -805,7 +811,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .workspace-thumbnails .workspace-thumbnail { border-radius: 3px; }
 
-.workspace-thumbnails .placeholder { background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg"); background-size: contain; width: 18px; }
+.workspace-thumbnails .placeholder { background-image: url("dash-placeholder.svg"); background-size: contain; width: 18px; }
 
 .workspace-thumbnail-indicator { border: 3px solid #215d9c; border-radius: 3px; padding: 0px; }
 

diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss b/gnome-shell/src/gnome-shell-sass/widgets/_calendar.scss
@@ -153,7 +153,7 @@
   }
 
   .calendar-day-with-events {
-    background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg");
+    background-image: url("calendar-today.svg");
     &.calendar-work-day {
        color: lighten($fg_color,10%);
        font-weight: bold;

diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss b/gnome-shell/src/gnome-shell-sass/widgets/_check-box.scss
@@ -10,9 +10,9 @@ $check_width: 24px;
   StBin {
     width: $check_width;
     height: $check_height;
-    background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg");
+    background-image: url("checkbox-off.svg");
   }
-  &:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
-  &:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
-  &:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
-}
+  &:focus StBin { background-image: url("checkbox-off-focused.svg"); }
+  &:checked StBin { background-image: url("checkbox.svg"); }
+  &:focus:checked StBin { background-image: url("checkbox-focused.svg"); }
+}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss b/gnome-shell/src/gnome-shell-sass/widgets/_dash.scss
@@ -15,7 +15,7 @@ $dash_border_radius: $modal_radius $modal_radius 0 0;
   padding: 0 $dash_padding;
 
   .placeholder {
-    // background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    // background-image: url("dash-placeholder.svg");
     background-image:none;
     background-size: contain;
     height: $dash_placeholder_size;

diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss b/gnome-shell/src/gnome-shell-sass/widgets/_dialogs.scss
@@ -165,7 +165,7 @@
 
 /* Welcome dialog */
 .welcome-dialog-image {
-  background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg");
+  background-image: url("gnome-shell-start.svg");
   background-size: contain;
   /* Reasonable maximum dimensions */
   height: 300px;

diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss b/gnome-shell/src/gnome-shell-sass/widgets/_panel.scss
@@ -142,3 +142,29 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
   padding: 0 $base_padding;
   spacing: $base_spacing;
 }
+
+// Activities button
+#panel #panelActivities.panel-button {
+  > * {
+    background-image: url("activities.svg");
+    background-position: center top;
+    width: 24px;
+    height: 24px;
+    background-color: transparent !important;
+    background-gradient-direction: none !important;
+    border: 0 solid transparent !important;
+    text-shadow: 0 0 transparent !important;
+    transition-duration: 0ms !important;
+    box-shadow: none !important;
+    color: transparent;
+  }
+
+  &:active, &:overview, &:focus, &:checked {
+    background-color: transparent;
+    box-shadow: none;
+    border-bottom-width: 1px;
+    border-color: transparent;
+
+    > * { background-image: url("activities-active.svg"); }
+  }
+}
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss b/gnome-shell/src/gnome-shell-sass/widgets/_switches.scss
@@ -9,8 +9,8 @@ $switch_width: 46px;
   height: $switch_height;
   width: $switch_width;
   background-size: contain;
-  background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-off.svg"),url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"));
+  background-image: if($variant == 'light', url("toggle-off.svg"),url("toggle-off-dark.svg"));
   &:checked {
-    background-image: if($variant == 'light', url("resource:///org/gnome/shell/theme/toggle-on.svg"),url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"));
+    background-image: if($variant == 'light', url("toggle-on.svg"),url("toggle-on-dark.svg"));
   }
 }
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss b/gnome-shell/src/gnome-shell-sass/widgets/_workspace-thumbnails.scss
@@ -13,7 +13,7 @@
 
   // drag and drop indicator
   .placeholder {
-    background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg");
+    background-image: url("dash-placeholder.svg");
     background-size: contain;
     width: 18px;
   }

diff --git a/gnome-shell/src/gnome-shell.css b/gnome-shell/src/gnome-shell.css
@@ -66,18 +66,18 @@ StEntry StLabel.hint-text { margin-left: 2px; color: rgba(238, 238, 236, 0.7); }
 /* Check Boxes */
 .check-box StBoxLayout { spacing: .8em; }
 
-.check-box StBin { width: 24px; height: 22px; background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg"); }
+.check-box StBin { width: 24px; height: 22px; background-image: url("checkbox-off.svg"); }
 
-.check-box:focus StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
+.check-box:focus StBin { background-image: url("checkbox-off-focused.svg"); }
 
-.check-box:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
+.check-box:checked StBin { background-image: url("checkbox.svg"); }
 
-.check-box:focus:checked StBin { background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
+.check-box:focus:checked StBin { background-image: url("checkbox-focused.svg"); }
 
 /* Switches */
-.toggle-switch { color: #eeeeec; height: 22px; width: 46px; background-size: contain; background-image: url("resource:///org/gnome/shell/theme/toggle-off-dark.svg"); }
+.toggle-switch { color: #eeeeec; height: 22px; width: 46px; background-size: contain; background-image: url("toggle-off-dark.svg"); }
 
-.toggle-switch:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-dark.svg"); }
+.toggle-switch:checked { background-image: url("toggle-on-dark.svg"); }
 
 /* Slider */
 .slider { height: 15px; -barlevel-height: 3px; -barlevel-background-color: #202020; -barlevel-border-width: 1px; -barlevel-border-color: #202020; -barlevel-active-background-color: #1b6acb; -barlevel-active-border-color: #1c6fd4; -barlevel-overdrive-color: #b2161d; -barlevel-overdrive-border-color: #bc171e; -barlevel-overdrive-separator-width: 1px; -slider-handle-radius: 7.5px; -slider-handle-border-width: 1px; -slider-handle-border-color: #eeeeec; color: #eeeeec; }
@@ -235,7 +235,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .calendar .calendar-today:active:hover, .calendar .calendar-today:active:focus, .calendar .calendar-today:selected:hover, .calendar .calendar-today:selected:focus { background-color: #1d72d8; color: #fff; }
 
-.calendar .calendar-day-with-events { background-image: url("resource:///org/gnome/shell/theme/calendar-today.svg"); }
+.calendar .calendar-day-with-events { background-image: url("calendar-today.svg"); }
 
 .calendar .calendar-day-with-events.calendar-work-day { color: white; font-weight: bold; }
 
@@ -510,7 +510,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 .audio-selection-device-icon { icon-size: 4.36em; }
 
 /* Welcome dialog */
-.welcome-dialog-image { background-image: url("resource:///org/gnome/shell/theme/gnome-shell-start.svg"); background-size: contain; /* Reasonable maximum dimensions */ height: 300px; width: 300px; }
+.welcome-dialog-image { background-image: url("gnome-shell-start.svg"); background-size: contain; /* Reasonable maximum dimensions */ height: 300px; width: 300px; }
 
 /* Network Dialogs */
 .nm-dialog { max-height: 34em; min-height: 31em; min-width: 32em; }
@@ -642,6 +642,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 #appMenu .panel-status-menu-box { padding: 0 6px; spacing: 6px; }
 
+#panel #panelActivities.panel-button > * { background-image: url("activities.svg"); background-position: center top; width: 24px; height: 24px; background-color: transparent !important; background-gradient-direction: none !important; border: 0 solid transparent !important; text-shadow: 0 0 transparent !important; transition-duration: 0ms !important; box-shadow: none !important; color: transparent; }
+
+#panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked { background-color: transparent; box-shadow: none; border-bottom-width: 1px; border-color: transparent; }
+
+#panel #panelActivities.panel-button:active > *, #panel #panelActivities.panel-button:overview > *, #panel #panelActivities.panel-button:focus > *, #panel #panelActivities.panel-button:checked > * { background-image: url("activities-active.svg"); }
+
 /* Activities Ripple */
 .ripple-box { background-color: rgba(188, 214, 246, 0.3); box-shadow: 0 0 2px 2px #629fea; width: 52px; height: 52px; border-radius: 0 0 52px 0; }
 
@@ -805,7 +811,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { backg
 
 .workspace-thumbnails .workspace-thumbnail { border-radius: 3px; }
 
-.workspace-thumbnails .placeholder { background-image: url("resource:///org/gnome/shell/theme/dash-placeholder.svg"); background-size: contain; width: 18px; }
+.workspace-thumbnails .placeholder { background-image: url("dash-placeholder.svg"); background-size: contain; width: 18px; }
 
 .workspace-thumbnail-indicator { border: 3px solid #1b6acb; border-radius: 3px; padding: 0px; }