diff --git a/shell/Makefile.am b/shell/Makefile.am index 20e5898c3..0f544f490 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -49,23 +49,6 @@ shell_asset_file = \ $(shelldir)/assets/window-close-active.svg \ $(shelldir)/assets/window-close-hover.svg \ $(shelldir)/assets/window-close.svg -shell_asset_dot_file = \ - $(shelldir)/assets/dot/running1-bottom.svg \ - $(shelldir)/assets/dot/running1-left.svg \ - $(shelldir)/assets/dot/running1-right.svg \ - $(shelldir)/assets/dot/running1-top.svg \ - $(shelldir)/assets/dot/running2-bottom.svg \ - $(shelldir)/assets/dot/running2-left.svg \ - $(shelldir)/assets/dot/running2-right.svg \ - $(shelldir)/assets/dot/running2-top.svg \ - $(shelldir)/assets/dot/running3-bottom.svg \ - $(shelldir)/assets/dot/running3-left.svg \ - $(shelldir)/assets/dot/running3-right.svg \ - $(shelldir)/assets/dot/running3-top.svg \ - $(shelldir)/assets/dot/running4-bottom.svg \ - $(shelldir)/assets/dot/running4-left.svg \ - $(shelldir)/assets/dot/running4-right.svg \ - $(shelldir)/assets/dot/running4-top.svg shell_extension_windowlist_file = \ $(shelldir)/extensions/window-list/classic.css \ $(shelldir)/extensions/window-list/stylesheet.css \ @@ -326,15 +309,11 @@ sassc_option = -M -t compact all: if ENABLE_GNOME $(MKDIR_P) $(srcdir)/gnome-shell/assets - $(MKDIR_P) $(srcdir)/gnome-shell/assets/dot $(MKDIR_P) $(srcdir)/gnome-shell/extensions/workspaces-to-dock/assets $(MKDIR_P) $(srcdir)/gnome-shell-nokto/assets - $(MKDIR_P) $(srcdir)/gnome-shell-nokto/assets/dot $(MKDIR_P) $(srcdir)/gnome-shell-eta/assets - $(MKDIR_P) $(srcdir)/gnome-shell-eta/assets/dot $(MKDIR_P) $(srcdir)/gnome-shell-eta/extensions/workspaces-to-dock/assets $(MKDIR_P) $(srcdir)/gnome-shell-nokto-eta/assets - $(MKDIR_P) $(srcdir)/gnome-shell-nokto-eta/assets/dot cd $(srcdir)/sass && \ $(SASSC) $(sassc_option) \ @@ -421,7 +400,6 @@ install-data-local: if ENABLE_GNOME $(MKDIR_P) $(adaptadir)/gnome-shell $(MKDIR_P) $(adaptadir)/gnome-shell/assets - $(MKDIR_P) $(adaptadir)/gnome-shell/assets/dot $(MKDIR_P) $(adaptadir)/gnome-shell/extensions $(MKDIR_P) $(adaptadir)/gnome-shell/extensions/window-list $(MKDIR_P) $(adaptadir)/gnome-shell/extensions/workspaces-to-dock @@ -429,7 +407,6 @@ if ENABLE_GNOME cp -Rv $(shell_file) $(adaptadir)/gnome-shell cp -Rv $(shell_pad_osd_file) $(adaptadir)/gnome-shell cp -Rv $(shell_asset_file) $(adaptadir)/gnome-shell/assets - cp -Rv $(shell_asset_dot_file) $(adaptadir)/gnome-shell/assets/dot cp -Rv $(shell_extension_windowlist_file) \ $(adaptadir)/gnome-shell/extensions/window-list cp -Rv $(shell_extension_workspace_file) \ @@ -442,7 +419,6 @@ endif $(MKDIR_P) $(noktodir)/gnome-shell $(MKDIR_P) $(noktodir)/gnome-shell/assets - $(MKDIR_P) $(noktodir)/gnome-shell/assets/dot $(MKDIR_P) $(noktodir)/gnome-shell/extensions $(MKDIR_P) $(noktodir)/gnome-shell/extensions/window-list $(MKDIR_P) $(noktodir)/gnome-shell/extensions/workspaces-to-dock @@ -450,7 +426,6 @@ endif cp -Rv $(shell_nokto_file) $(noktodir)/gnome-shell cp -Rv $(shell_pad_osd_file) $(noktodir)/gnome-shell cp -Rv $(shell_nokto_asset_file) $(noktodir)/gnome-shell/assets - cp -Rv $(shell_asset_dot_file) $(noktodir)/gnome-shell/assets/dot cp -Rv $(shell_extension_windowlist_file) \ $(noktodir)/gnome-shell/extensions/window-list cp -Rv $(shell_extension_workspace_file) \ @@ -463,7 +438,6 @@ endif $(MKDIR_P) $(adaptaetadir)/gnome-shell $(MKDIR_P) $(adaptaetadir)/gnome-shell/assets - $(MKDIR_P) $(adaptaetadir)/gnome-shell/assets/dot $(MKDIR_P) $(adaptaetadir)/gnome-shell/extensions $(MKDIR_P) $(adaptaetadir)/gnome-shell/extensions/window-list $(MKDIR_P) $(adaptaetadir)/gnome-shell/extensions/workspaces-to-dock @@ -471,7 +445,6 @@ endif cp -Rv $(shelleta_file) $(adaptaetadir)/gnome-shell cp -Rv $(shell_pad_osd_file) $(adaptaetadir)/gnome-shell cp -Rv $(shelleta_asset_file) $(adaptaetadir)/gnome-shell/assets - cp -Rv $(shell_asset_dot_file) $(adaptaetadir)/gnome-shell/assets/dot cp -Rv $(shell_extension_windowlist_file) \ $(adaptaetadir)/gnome-shell/extensions/window-list cp -Rv $(shell_extension_workspace_file) \ @@ -484,7 +457,6 @@ endif $(MKDIR_P) $(noktoetadir)/gnome-shell $(MKDIR_P) $(noktoetadir)/gnome-shell/assets - $(MKDIR_P) $(noktoetadir)/gnome-shell/assets/dot $(MKDIR_P) $(noktoetadir)/gnome-shell/extensions $(MKDIR_P) $(noktoetadir)/gnome-shell/extensions/window-list $(MKDIR_P) $(noktoetadir)/gnome-shell/extensions/workspaces-to-dock @@ -492,7 +464,6 @@ endif cp -Rv $(shell_nokto_eta_file) $(noktoetadir)/gnome-shell cp -Rv $(shell_pad_osd_file) $(noktoetadir)/gnome-shell cp -Rv $(shell_nokto_eta_asset_file) $(noktoetadir)/gnome-shell/assets - cp -Rv $(shell_asset_dot_file) $(noktoetadir)/gnome-shell/assets/dot cp -Rv $(shell_extension_windowlist_file) \ $(noktoetadir)/gnome-shell/extensions/window-list cp -Rv $(shell_extension_workspace_file) \ @@ -605,21 +576,17 @@ CLEANFILES += \ $(srcdir)/gnome-shell/*.svg \ $(srcdir)/gnome-shell/*.png \ $(srcdir)/gnome-shell/assets/*.svg \ - $(srcdir)/gnome-shell/assets/dot/*.svg \ $(srcdir)/gnome-shell/extensions/workspaces-to-dock/assets/*.svg \ $(srcdir)/gnome-shell-eta/extensions/workspaces-to-dock/assets/*.svg \ $(srcdir)/gnome-shell-eta/*.svg \ $(srcdir)/gnome-shell-eta/*.png \ $(srcdir)/gnome-shell-eta/assets/*.svg \ - $(srcdir)/gnome-shell-eta/assets/dot/*.svg \ $(srcdir)/gnome-shell-nokto/*.svg \ $(srcdir)/gnome-shell-nokto/*.png \ $(srcdir)/gnome-shell-nokto/assets/*.svg \ - $(srcdir)/gnome-shell-nokto/assets/dot/*.svg \ $(srcdir)/gnome-shell-nokto-eta/*.svg \ $(srcdir)/gnome-shell-nokto-eta/*.png \ $(srcdir)/gnome-shell-nokto-eta/assets/*.svg \ - $(srcdir)/gnome-shell-nokto-eta/assets/dot/*.svg \ $(srcdir)/asset/assets-gnome-shell/common/checkbox-hover.svg \ $(srcdir)/asset/assets-gnome-shell/common/checkbox.svg \ $(srcdir)/asset/assets-gnome-shell/common/corner-ripple-ltr.svg \ @@ -637,7 +604,6 @@ CLEANFILES += \ $(srcdir)/asset/assets-gnome-shell/common/window-close.svg \ $(srcdir)/asset/assets-gnome-shell/common/window-close-active.svg \ $(srcdir)/asset/assets-gnome-shell/common/window-close-hover.svg \ - $(srcdir)/asset/assets-gnome-shell/dot/*.svg \ $(srcdir)/asset/assets-gnome-shell/workspaces-to-dock/*.svg if GNOME_IS_326_OR_NEWER CLEANFILES += \ diff --git a/shell/asset/assets-gnome-shell.txt b/shell/asset/assets-gnome-shell.txt index bf600c53d..174869322 100644 --- a/shell/asset/assets-gnome-shell.txt +++ b/shell/asset/assets-gnome-shell.txt @@ -40,23 +40,6 @@ nokto/calendar-arrow-left.svg assets nokto/calendar-arrow-right-hover.svg assets nokto/calendar-arrow-right.svg assets -dot/running1-bottom.svg assets/dot r1 -dot/running1-left.svg assets/dot r1 -dot/running1-right.svg assets/dot r1 -dot/running1-top.svg assets/dot r1 -dot/running2-bottom.svg assets/dot r1 -dot/running2-left.svg assets/dot r1 -dot/running2-right.svg assets/dot r1 -dot/running2-top.svg assets/dot r1 -dot/running3-bottom.svg assets/dot r1 -dot/running3-left.svg assets/dot r1 -dot/running3-right.svg assets/dot r1 -dot/running3-top.svg assets/dot r1 -dot/running4-bottom.svg assets/dot r1 -dot/running4-left.svg assets/dot r1 -dot/running4-right.svg assets/dot r1 -dot/running4-top.svg assets/dot r1 - workspaces-to-dock/four-bottom.svg extensions/workspaces-to-dock/assets r1 workspaces-to-dock/four-left.svg extensions/workspaces-to-dock/assets r1 workspaces-to-dock/four-right.svg extensions/workspaces-to-dock/assets r1 diff --git a/shell/asset/assets-gnome-shell/dot/running1-bottom.svg.in b/shell/asset/assets-gnome-shell/dot/running1-bottom.svg.in deleted file mode 100644 index 59e9cac24..000000000 --- a/shell/asset/assets-gnome-shell/dot/running1-bottom.svg.in +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running1-left.svg.in b/shell/asset/assets-gnome-shell/dot/running1-left.svg.in deleted file mode 100644 index 341da9c94..000000000 --- a/shell/asset/assets-gnome-shell/dot/running1-left.svg.in +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running1-right.svg.in b/shell/asset/assets-gnome-shell/dot/running1-right.svg.in deleted file mode 100644 index 985be74c5..000000000 --- a/shell/asset/assets-gnome-shell/dot/running1-right.svg.in +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running1-top.svg.in b/shell/asset/assets-gnome-shell/dot/running1-top.svg.in deleted file mode 100644 index 264111288..000000000 --- a/shell/asset/assets-gnome-shell/dot/running1-top.svg.in +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running2-bottom.svg.in b/shell/asset/assets-gnome-shell/dot/running2-bottom.svg.in deleted file mode 100644 index a6f9277ea..000000000 --- a/shell/asset/assets-gnome-shell/dot/running2-bottom.svg.in +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running2-left.svg.in b/shell/asset/assets-gnome-shell/dot/running2-left.svg.in deleted file mode 100644 index 171c427af..000000000 --- a/shell/asset/assets-gnome-shell/dot/running2-left.svg.in +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running2-right.svg.in b/shell/asset/assets-gnome-shell/dot/running2-right.svg.in deleted file mode 100644 index f0d20eb51..000000000 --- a/shell/asset/assets-gnome-shell/dot/running2-right.svg.in +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running2-top.svg.in b/shell/asset/assets-gnome-shell/dot/running2-top.svg.in deleted file mode 100644 index 838179649..000000000 --- a/shell/asset/assets-gnome-shell/dot/running2-top.svg.in +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running3-bottom.svg.in b/shell/asset/assets-gnome-shell/dot/running3-bottom.svg.in deleted file mode 100644 index 29faa61dd..000000000 --- a/shell/asset/assets-gnome-shell/dot/running3-bottom.svg.in +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running3-left.svg.in b/shell/asset/assets-gnome-shell/dot/running3-left.svg.in deleted file mode 100644 index e3c010cbf..000000000 --- a/shell/asset/assets-gnome-shell/dot/running3-left.svg.in +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running3-right.svg.in b/shell/asset/assets-gnome-shell/dot/running3-right.svg.in deleted file mode 100644 index 5e582bed1..000000000 --- a/shell/asset/assets-gnome-shell/dot/running3-right.svg.in +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running3-top.svg.in b/shell/asset/assets-gnome-shell/dot/running3-top.svg.in deleted file mode 100644 index 76df04de4..000000000 --- a/shell/asset/assets-gnome-shell/dot/running3-top.svg.in +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running4-bottom.svg.in b/shell/asset/assets-gnome-shell/dot/running4-bottom.svg.in deleted file mode 100644 index e6528feeb..000000000 --- a/shell/asset/assets-gnome-shell/dot/running4-bottom.svg.in +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running4-left.svg.in b/shell/asset/assets-gnome-shell/dot/running4-left.svg.in deleted file mode 100644 index eab14ef73..000000000 --- a/shell/asset/assets-gnome-shell/dot/running4-left.svg.in +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running4-right.svg.in b/shell/asset/assets-gnome-shell/dot/running4-right.svg.in deleted file mode 100644 index 6867ad4c2..000000000 --- a/shell/asset/assets-gnome-shell/dot/running4-right.svg.in +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/assets-gnome-shell/dot/running4-top.svg.in b/shell/asset/assets-gnome-shell/dot/running4-top.svg.in deleted file mode 100644 index cd0c42430..000000000 --- a/shell/asset/assets-gnome-shell/dot/running4-top.svg.in +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shell/asset/clone-assets-gnome-shell.sh b/shell/asset/clone-assets-gnome-shell.sh index 82e647775..c25540242 100755 --- a/shell/asset/clone-assets-gnome-shell.sh +++ b/shell/asset/clone-assets-gnome-shell.sh @@ -109,23 +109,6 @@ do echo Cloning $ASSETS_DARK_ETA_DIR/$d/$f cp -f $SRC_DIR/$s $ASSETS_DARK_ETA_DIR/$d/$f fi - elif [ $v = "d" ]; then # 'dot' - if [ -f $ASSETS_DIR/$d/$f ] && \ - [ $SRC_DIR/$s -ot $ASSETS_DIR/$d/$f ]; then - echo $ASSETS_DIR/$d/$f exists. - echo $ASSETS_ETA_DIR/$d/$f exists. - echo $ASSETS_DARK_DIR/$d/$f exists. - echo $ASSETS_DARK_ETA_DIR/$d/$f exists. - else - echo Cloning $ASSETS_DIR/$d/$f - cp -f $SRC_DIR/$s $ASSETS_DIR/$d/$f - echo Cloning $ASSETS_ETA_DIR/$d/$f - cp -f $SRC_DIR/$s $ASSETS_ETA_DIR/$d/$f - echo Cloning $ASSETS_DARK_DIR/$d/$f - cp -f $SRC_DIR/$s $ASSETS_DARK_DIR/$d/$f - echo Cloning $ASSETS_DARK_ETA_DIR/$d/$f - cp -f $SRC_DIR/$s $ASSETS_DARK_ETA_DIR/$d/$f - fi elif [ $v = "l" ] || [ $v = "w" ]; then # 'light' if [ -f $ASSETS_DIR/$d/$f ] && \ [ $SRC_DIR/$s -ot $ASSETS_DIR/$d/$f ]; then diff --git a/shell/gnome-shell-eta/gnome-shell-theme.gresource.xml b/shell/gnome-shell-eta/gnome-shell-theme.gresource.xml index e13fcac2b..3b12557af 100644 --- a/shell/gnome-shell-eta/gnome-shell-theme.gresource.xml +++ b/shell/gnome-shell-eta/gnome-shell-theme.gresource.xml @@ -31,22 +31,6 @@ no-notifications.svg pad-osd.css process-working.svg - assets/dot/running1-bottom.svg - assets/dot/running1-left.svg - assets/dot/running1-right.svg - assets/dot/running1-top.svg - assets/dot/running2-bottom.svg - assets/dot/running2-left.svg - assets/dot/running2-right.svg - assets/dot/running2-top.svg - assets/dot/running3-bottom.svg - assets/dot/running3-left.svg - assets/dot/running3-right.svg - assets/dot/running3-top.svg - assets/dot/running4-bottom.svg - assets/dot/running4-left.svg - assets/dot/running4-right.svg - assets/dot/running4-top.svg toggle-off.svg toggle-on.svg assets/window-close.svg diff --git a/shell/gnome-shell-nokto-eta/gnome-shell-theme.gresource.xml b/shell/gnome-shell-nokto-eta/gnome-shell-theme.gresource.xml index 10de943a4..a931c8a26 100644 --- a/shell/gnome-shell-nokto-eta/gnome-shell-theme.gresource.xml +++ b/shell/gnome-shell-nokto-eta/gnome-shell-theme.gresource.xml @@ -31,22 +31,6 @@ no-notifications.svg process-working.svg pad-osd.css - assets/dot/running1-bottom.svg - assets/dot/running1-left.svg - assets/dot/running1-right.svg - assets/dot/running1-top.svg - assets/dot/running2-bottom.svg - assets/dot/running2-left.svg - assets/dot/running2-right.svg - assets/dot/running2-top.svg - assets/dot/running3-bottom.svg - assets/dot/running3-left.svg - assets/dot/running3-right.svg - assets/dot/running3-top.svg - assets/dot/running4-bottom.svg - assets/dot/running4-left.svg - assets/dot/running4-right.svg - assets/dot/running4-top.svg toggle-off.svg toggle-on.svg assets/window-close.svg diff --git a/shell/gnome-shell-nokto/gnome-shell-theme.gresource.xml b/shell/gnome-shell-nokto/gnome-shell-theme.gresource.xml index e13fcac2b..3b12557af 100644 --- a/shell/gnome-shell-nokto/gnome-shell-theme.gresource.xml +++ b/shell/gnome-shell-nokto/gnome-shell-theme.gresource.xml @@ -31,22 +31,6 @@ no-notifications.svg pad-osd.css process-working.svg - assets/dot/running1-bottom.svg - assets/dot/running1-left.svg - assets/dot/running1-right.svg - assets/dot/running1-top.svg - assets/dot/running2-bottom.svg - assets/dot/running2-left.svg - assets/dot/running2-right.svg - assets/dot/running2-top.svg - assets/dot/running3-bottom.svg - assets/dot/running3-left.svg - assets/dot/running3-right.svg - assets/dot/running3-top.svg - assets/dot/running4-bottom.svg - assets/dot/running4-left.svg - assets/dot/running4-right.svg - assets/dot/running4-top.svg toggle-off.svg toggle-on.svg assets/window-close.svg diff --git a/shell/gnome-shell/gnome-shell-theme.gresource.xml b/shell/gnome-shell/gnome-shell-theme.gresource.xml index e13fcac2b..3b12557af 100644 --- a/shell/gnome-shell/gnome-shell-theme.gresource.xml +++ b/shell/gnome-shell/gnome-shell-theme.gresource.xml @@ -31,22 +31,6 @@ no-notifications.svg pad-osd.css process-working.svg - assets/dot/running1-bottom.svg - assets/dot/running1-left.svg - assets/dot/running1-right.svg - assets/dot/running1-top.svg - assets/dot/running2-bottom.svg - assets/dot/running2-left.svg - assets/dot/running2-right.svg - assets/dot/running2-top.svg - assets/dot/running3-bottom.svg - assets/dot/running3-left.svg - assets/dot/running3-right.svg - assets/dot/running3-top.svg - assets/dot/running4-bottom.svg - assets/dot/running4-left.svg - assets/dot/running4-right.svg - assets/dot/running4-top.svg toggle-off.svg toggle-on.svg assets/window-close.svg diff --git a/shell/sass/gnome-shell/3.24/_extensions.scss b/shell/sass/gnome-shell/3.24/_extensions.scss index f4ce2662c..3f46760cb 100644 --- a/shell/sass/gnome-shell/3.24/_extensions.scss +++ b/shell/sass/gnome-shell/3.24/_extensions.scss @@ -276,60 +276,23 @@ } } -// running-dot styling -@each $_dock, $_dot, $_inv_dot, $_line, $_inv_line in -(top, -top, -top, 0 -2px, 0 -2px), -(bottom, -bottom, -bottom, 0 2px, 0 2px), -(left, -left, -right, -2px 0, 2px 0), -(right, -right, -left, 2px 0, -2px 0) { +@each $_dock in top, bottom, left, right { #dashtodockContainer.#{$_dock}, #dashtodockContainer.extended.#{$_dock} { - @each $_num in 1, 2, 3, 4 { - .dash-item-container > StWidget.running#{$_num} { - &.focused { // fill whole focused backgrounds - .overview-icon { - border-radius: 0; - background-color: $osd_semi_fill_color; - } - - &:hover .overview-icon { - border-radius: 0; - background-color: $osd_fill_color; - } - } + .dash-item-container > StWidget.focused { // fill whole focused backgrounds + .overview-icon { + border-radius: 0; + background-color: $osd_semi_fill_color; } - &:ltr { - .dash-item-container > StWidget.running#{$_num} { - background-image: url("assets/dot/running#{$_num}#{$_dot}.svg"); - &.focused .overview-icon { - box-shadow: inset #{$_line} $selected_bg_color; - } - } - } - &:rtl { - .dash-item-container > StWidget.running#{$_num} { - background-image: - url("assets/dot/running#{$_num}#{$_inv_dot}.svg"); - &.focused .overview-icon { - box-shadow: inset #{$_inv_line} $selected_bg_color; - } - } + &:hover .overview-icon { + border-radius: 0; + background-color: $osd_fill_color; } } } } -#workspacestodockContainer { - &, - &:overview, - &.fullheight:overview { - background-color: $panel_hidden_fill_color; - - .workspace-thumbnails { background-color: transparent; } - } -} - // /*************************** // * Dash To Panel Extension * diff --git a/shell/sass/gnome-shell/3.26/_extensions.scss b/shell/sass/gnome-shell/3.26/_extensions.scss index 8822154cb..3f5f92951 100644 --- a/shell/sass/gnome-shell/3.26/_extensions.scss +++ b/shell/sass/gnome-shell/3.26/_extensions.scss @@ -307,81 +307,23 @@ $alpha_override: 0.54 - $hard_coded_alpha; } } -// running-dot styling -@if $gdm == false { - @each $_dock, $_dot, $_inv_dot, $_line, $_inv_line in - (top, -top, -top, 0 -2px, 0 -2px), - (bottom, -bottom, -bottom, 0 2px, 0 2px), - (left, -left, -right, -2px 0, 2px 0), - (right, -right, -left, 2px 0, -2px 0) { - #dashtodockContainer.#{$_dock}, - #dashtodockContainer.extended.#{$_dock} { - @each $_num in 1, 2, 3, 4 { - .dash-item-container > StWidget.running#{$_num} { - &.focused { // fill whole focused backgrounds - .overview-icon { - border-radius: 0; - background-color: $osd_semi_fill_color; - } - - &:hover .overview-icon { - border-radius: 0; - background-color: $osd_fill_color; - } - } - } - - &:ltr { - .dash-item-container > StWidget.running#{$_num} { - background-image: url("assets/dot/running#{$_num}#{$_dot}.svg"); - &.focused .overview-icon { - box-shadow: inset #{$_line} $selected_bg_color; - } - } - } - &:rtl { - .dash-item-container > StWidget.running#{$_num} { - background-image: - url("assets/dot/running#{$_num}#{$_inv_dot}.svg"); - &.focused .overview-icon { - box-shadow: inset #{$_inv_line} $selected_bg_color; - } - } - } +@each $_dock in top, bottom, left, right { + #dashtodockContainer.#{$_dock}, + #dashtodockContainer.extended.#{$_dock} { + .dash-item-container > StWidget.focused { // fill whole focused backgrounds + .overview-icon { + border-radius: 0; + background-color: $osd_semi_fill_color; } - } - #dashtodockContainer.#{$_dock}, - #dashtodockContainer.extended.#{$_dock} { // overview-mode - &:overview { - @each $_num in 1, 2, 3, 4 { - .dash-item-container > StWidget.running#{$_num} { - &.focused { // clear backgrounds - .overview-icon { - background-color: $hidden_fill_color; - } - - &:hover .overview-icon { - background-color: $osd_semi_fill_color; - } - } - } - } + &:hover .overview-icon { + border-radius: 0; + background-color: $osd_fill_color; } } } } -#workspacestodockContainer { - &, - &:overview, - &.fullheight:overview { - background-color: $panel_hidden_fill_color; - - .workspace-thumbnails { background-color: transparent; } - } -} - // /*************************** // * Dash To Panel Extension *