diff --git a/lib-install.sh b/lib-install.sh index 5e0b2d4b..314bca3d 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -715,16 +715,16 @@ install_dash_to_dock_theme() { backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo" udoify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" if [[ "${GNOME_VERSION}" == 'new' ]]; then - udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-40.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" - else - udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" + udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" + else + udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" fi elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo" if [[ "${GNOME_VERSION}" == 'new' ]]; then - sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-40.scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" + sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" else - sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet$(destify ${colors[0]}).scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" + sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" fi fi diff --git a/src/other/dash-to-dock/_dash-to-dock-3.scss b/src/other/dash-to-dock/_dash-to-dock-3.scss index b443c1b5..e086cb17 100644 --- a/src/other/dash-to-dock/_dash-to-dock-3.scss +++ b/src/other/dash-to-dock/_dash-to-dock-3.scss @@ -45,14 +45,14 @@ } @each $_dock, $_radius, $_shadow in (top, $dash_radius, 0 -1px), - (bottom, $dash_radius, 0 1px), - (left, $dash_radius, -1px 0), - (right, $dash_radius, 1px 0) { + (bottom, $dash_radius, 0 1px), + (left, $dash_radius, -1px 0), + (right, $dash_radius, 1px 0) { &.#{$_dock}.dashtodock #dash, &.#{$_dock}.dashtodock:overview #dash { border-radius: #{$_radius}; margin-#{$_dock}: 6px; - padding: 3px; + padding: 6px; box-shadow: inset 0 0 0 1px rgba(white, 0.05); } @@ -89,35 +89,35 @@ } } - &.dashtodock #dash { background-color: $dash_bg; } + // &.dashtodock #dash { background-color: $dash_bg; } + // + // &.opaque #dash { // solid-mode + // background-color: $dash_bg; + // } + // + // &.transparent #dash { // translucent-mode + // background-color: $dash_bg; // does not work + // } - &.opaque #dash { // solid-mode - background-color: $dash_bg; - } + // &:overview #dash { // overview-mode #1 + // background-color: $light_divider_color; + // } + // + // &.opaque:overview, + // &.transparent:overview { // overview-mode #2 + // #dash { + // background-color: transparent !important; + // box-shadow: none !important; + // } + // } - &.transparent #dash { // translucent-mode - background-color: $dash_bg; // does not work - } - - &:overview #dash { // overview-mode #1 - background-color: $light_divider_color; - } - - &.opaque:overview, - &.transparent:overview { // overview-mode #2 - #dash { - background-color: transparent !important; - box-shadow: none !important; - } - } - - &.extended:overview, // overview-mode #3 - &.opaque.extended:overview, - &.transparent.extended:overview { - #dash { - background-color: $dash_bg; - } - } + // &.extended:overview, // overview-mode #3 + // &.opaque.extended:overview, + // &.transparent.extended:overview { + // #dash { + // background-color: $dash_bg; + // } + // } &.running-dots, &.dashtodock { diff --git a/src/other/dash-to-dock/stylesheet-dark.scss b/src/other/dash-to-dock/stylesheet-3.scss similarity index 100% rename from src/other/dash-to-dock/stylesheet-dark.scss rename to src/other/dash-to-dock/stylesheet-3.scss diff --git a/src/other/dash-to-dock/stylesheet-40.scss b/src/other/dash-to-dock/stylesheet-4.scss similarity index 100% rename from src/other/dash-to-dock/stylesheet-40.scss rename to src/other/dash-to-dock/stylesheet-4.scss diff --git a/src/other/dash-to-dock/stylesheet-light.scss b/src/other/dash-to-dock/stylesheet-light.scss deleted file mode 100644 index 7b107a21..00000000 --- a/src/other/dash-to-dock/stylesheet-light.scss +++ /dev/null @@ -1,9 +0,0 @@ -$variant: 'light'; -$laptop: 'false'; -$trans: 'true'; -$black: 'false'; -$theme: 'default'; - -@import '../../sass/colors'; -@import '../../sass/variables'; -@import '_dash-to-dock-3.scss'; diff --git a/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss index 5f9f78d0..5efefd83 100644 --- a/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss +++ b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss @@ -56,7 +56,7 @@ &.#{$_dock}.dashtodock:overview #dash { border-radius: #{$_radius}; margin-#{$_dock}: 6px; - padding: 3px; + padding: 6px; box-shadow: inset 0 0 0 1px rgba(white, 0.05); }