This commit is contained in:
Vince 2021-12-31 11:08:07 +08:00
parent 023bc95812
commit 05b968cf10
6 changed files with 37 additions and 46 deletions

View File

@ -715,16 +715,16 @@ install_dash_to_dock_theme() {
backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo" backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo"
udoify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" udoify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css"
if [[ "${GNOME_VERSION}" == 'new' ]]; then if [[ "${GNOME_VERSION}" == 'new' ]]; then
udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-40.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 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-3.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css"
fi fi
elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then
backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo" backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo"
if [[ "${GNOME_VERSION}" == 'new' ]]; then 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 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
fi fi

View File

@ -45,14 +45,14 @@
} }
@each $_dock, $_radius, $_shadow in (top, $dash_radius, 0 -1px), @each $_dock, $_radius, $_shadow in (top, $dash_radius, 0 -1px),
(bottom, $dash_radius, 0 1px), (bottom, $dash_radius, 0 1px),
(left, $dash_radius, -1px 0), (left, $dash_radius, -1px 0),
(right, $dash_radius, 1px 0) { (right, $dash_radius, 1px 0) {
&.#{$_dock}.dashtodock #dash, &.#{$_dock}.dashtodock #dash,
&.#{$_dock}.dashtodock:overview #dash { &.#{$_dock}.dashtodock:overview #dash {
border-radius: #{$_radius}; border-radius: #{$_radius};
margin-#{$_dock}: 6px; margin-#{$_dock}: 6px;
padding: 3px; padding: 6px;
box-shadow: inset 0 0 0 1px rgba(white, 0.05); 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 // &:overview #dash { // overview-mode #1
background-color: $dash_bg; // 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 // &.extended:overview, // overview-mode #3
background-color: $dash_bg; // does not work // &.opaque.extended:overview,
} // &.transparent.extended:overview {
// #dash {
&:overview #dash { // overview-mode #1 // background-color: $dash_bg;
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;
}
}
&.running-dots, &.running-dots,
&.dashtodock { &.dashtodock {

View File

@ -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';

View File

@ -56,7 +56,7 @@
&.#{$_dock}.dashtodock:overview #dash { &.#{$_dock}.dashtodock:overview #dash {
border-radius: #{$_radius}; border-radius: #{$_radius};
margin-#{$_dock}: 6px; margin-#{$_dock}: 6px;
padding: 3px; padding: 6px;
box-shadow: inset 0 0 0 1px rgba(white, 0.05); box-shadow: inset 0 0 0 1px rgba(white, 0.05);
} }