This commit is contained in:
Vince 2021-08-23 21:05:29 +08:00
parent f5b1318552
commit d89e6e24ee
3 changed files with 51 additions and 64 deletions

View file

@ -13,6 +13,7 @@
#dashtodockContainer { #dashtodockContainer {
background-color: transparent; background-color: transparent;
box-shadow: none;
.number-overlay { .number-overlay {
color: $light_fg_color; color: $light_fg_color;
@ -31,38 +32,25 @@
text-align: center; text-align: center;
} }
&.straight-corner #dash, @each $_pos, $b_pos, $_shadow in (top, bottom, 0 -1px),
&.shrink.straight-corner #dash { (bottom, top, 0 1px),
border-radius: 0; (left, right, -1px 0),
border-left: 0; (right, left, 1px 0) {
border-right: 0; &.#{$_pos}.shrink #dash,
padding-top: 0; &.#{$_pos}.shrink:overview #dash,
padding-bottom: 0; &.#{$_pos}.straight-corner #dash,
margin-top: 0; &.#{$_pos}.shrink.straight-corner #dash,
&.#{$_pos}.extended #dash,
&.#{$_pos}.extended:overview #dash {
margin: 0 !important;
padding: 0 !important;
.dash-background { .dash-background {
border-radius: 0; border-radius: 0;
margin-bottom: 0; border-width: 0;
} border-#{$b_pos}-width: 1px;
} margin: 0 !important;
box-shadow: inset #{$_shadow} rgba(white, 0.05);
&.extended.top,
&.extended.bottom,
&.extended.right,
&.extended.left {
#dash {
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
padding: 0 0;
.dash-background {
border-radius: 0;
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
} }
} }
} }
@ -70,29 +58,23 @@
&.left, &.left,
&.right { &.right {
#dash { #dash {
margin-top: 0; margin-top: 0 !important;
padding: $dash_padding 0; padding: $dash_padding !important;
.dash-background { // default-mode .dash-background {
margin-bottom: 0; margin-bottom: 0 !important;
} padding: $dash_padding !important;
} }
.dash-item-container .app-well-app, .show-apps { .dash-item-container .app-well-app, .show-apps {
padding: $base_padding; padding: $dash_spacing $base_padding !important;
} }
} }
&.left #dash {
margin-left: $base_padding;
}
&.right #dash {
margin-right: $base_padding;
} }
#dash { // default-mode #dash { // default-mode
background: none; background: none;
box-shadow: none;
StWidget.focused .app-well-app-running-dot { StWidget.focused .app-well-app-running-dot {
background-color: $primary_color; background-color: $primary_color;
@ -154,12 +136,12 @@
&.opaque:overview, &.opaque:overview,
&.transparent:overview { // overview-mode #2 &.transparent:overview { // overview-mode #2
#dash { #dash {
background-color: transparent !important; background-color: transparent;
box-shadow: none !important; box-shadow: none;
} }
.dash-background { .dash-background {
background-color: transparent !important; background-color: transparent;
} }
} }
@ -169,6 +151,12 @@
#dash { #dash {
background: none; background: none;
} }
.dash-background {
background-color: transparent !important;
border: none !important;
box-shadow: none !important;
}
} }
&.running-dots, &.running-dots,

View file

@ -24,22 +24,22 @@ $dash_border_radius: $dash_padding * 1.5 + 12px;
.app-well-app-running-dot { .app-well-app-running-dot {
background-color: if($variant == 'light', rgba(black, 0.75), rgba(white, 0.75)); background-color: if($variant == 'light', rgba(black, 0.75), rgba(white, 0.75));
} }
}
.dash-background { .dash-background {
background-color: $dash_background_color; background-color: $dash_background_color;
margin-bottom: $dash_bottom_margin; margin-bottom: $dash_bottom_margin;
padding: $dash_padding; padding: $dash_padding;
border-radius: $dash_border_radius; border-radius: $dash_border_radius;
} }
// Dash Items // Dash Items
.dash-item-container .app-well-app, .show-apps { .dash-item-container .app-well-app, .show-apps {
padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin; padding: $dash_padding $dash_spacing $dash_padding + $dash_bottom_margin;
} }
.dash-separator { .dash-separator {
width: 1px; width: 1px;
margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin; margin: 0 ($dash_spacing + ($dash_padding / 2)) $dash_bottom_margin;
background-color: rgba(white, 0.25); background-color: rgba(white, 0.25);
}
} }

View file

@ -138,7 +138,6 @@ while [[ $# -gt 0 ]]; do
fi; shift ;; fi; shift ;;
-d|--dash-to-dock) -d|--dash-to-dock)
if [[ "${GNOME_VERSION}" == 'new' ]]; then if [[ "${GNOME_VERSION}" == 'new' ]]; then
prompt -w "'${1}' It will install a fixed version on GNOME-SHELL >= 40.0"
dash_to_dock="new" dash_to_dock="new"
elif [[ ! -d "${DASH_TO_DOCK_DIR_HOME}" && ! -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then elif [[ ! -d "${DASH_TO_DOCK_DIR_HOME}" && ! -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then
prompt -e "'${1}' ERROR: There's no Dash to Dock installed in your system" prompt -e "'${1}' ERROR: There's no Dash to Dock installed in your system"