Fixed issues

This commit is contained in:
vinceliuice 2022-10-28 18:34:59 +08:00
parent 5ada212440
commit 17d96b5c9e
10 changed files with 117 additions and 55 deletions

View file

@ -84,7 +84,7 @@
& .folder-name-label { padding: $base_padding; color: $light_alt_fg_color; } & .folder-name-label { padding: $base_padding; color: $light_alt_fg_color; }
& .edit-folder-button { & .edit-folder-button {
background-color: $light_divider_color; background-color: $light_fill_color;
color: $light_alt_fg_color; color: $light_alt_fg_color;
border: none; border: none;
padding: 0; padding: 0;
@ -92,7 +92,7 @@
height: 36px; height: 36px;
border-radius: $circular_radius; border-radius: $circular_radius;
& > StIcon { icon-size: 16px; } & > StIcon { icon-size: $base_icon_size; }
&:hover { background-color: $light_divider_color; } &:hover { background-color: $light_divider_color; }
&:checked, &:active { background-color: $light_track_color; } &:checked, &:active { background-color: $light_track_color; }

View file

@ -1,8 +1,8 @@
/* Buttons */ /* Buttons */
.button { .button {
min-height: $medium_size; min-height: $small_size;
padding: 0 16px; padding: $container_padding $container_padding * 2;
border-radius: $bt_radius; border-radius: $bt_radius;
&, .popup-menu & { &, .popup-menu & {
@ -15,6 +15,19 @@
} }
} }
.icon-button {
min-height: $small_size;
min-width: $small_size;
padding: $container_padding;
border-radius: $circular_radius;
@include button(flat-normal);
&:hover { @include button(flat-hover); }
&:active { @include button(flat-active); }
&:insensitive { @include button(flat-insensitive); }
&:focus { @include button(flat-focus); }
}
%osd_button { %osd_button {
background-color: transparent; background-color: transparent;
border: none; border: none;

View file

@ -3,25 +3,29 @@
StEntry, %entry { StEntry, %entry {
min-height: $menuitem_size; min-height: $menuitem_size;
padding: $base_padding / 2 $base_padding * 2 !important; padding: $base_padding / 2 $base_padding * 2 !important;
// margin: 2px;
color: $fg_color; color: $fg_color;
caret-color: $fg_color; caret-color: $fg_color;
selection-background-color: $primary_color !important; selection-background-color: $primary_color !important;
selected-color: $light_fg_color !important; selected-color: $light_fg_color !important;
// @include font(subheading);
@include entry(normal); @include entry(normal);
&:hover { @include entry(hover); } &:hover { @include entry(hover); }
&:focus { @include entry(focus); } &:focus { @include entry(focus); }
&:insensitive { @include entry(insensitive);} &:insensitive { @include entry(insensitive);}
StIcon { icon-size: $base_icon_size !important; }
StIcon.capslock-warning { StIcon.capslock-warning {
icon-size: 16px; icon-size: $base_icon_size !important;
warning-color: $warning_color; warning-color: $warning_color;
padding: 0 0; padding: 0 0;
} }
StIcon.peek-password { StIcon.peek-password {
icon-size: 16px; icon-size: $base_icon_size !important;
padding: 0 $base_padding; padding: 0 $base_padding;
} }
StLabel.hint-text { StLabel.hint-text {
margin-left: $base_padding / 2; margin-left: $base_padding / 2;
color: $alt_fg_color; color: $alt_fg_color;

View file

@ -104,14 +104,16 @@
// close button // close button
.message-close-button { .message-close-button {
color: $alt_fg_color; color: $alt_fg_color;
padding: 0; padding: 0 !important;
height: 24px; height: 24px !important;
width: 24px; width: 24px !important;
border-radius: $circular_radius; border-radius: $circular_radius;
&:hover, &:active { color: $fg_color; } &:hover, &:active { color: $fg_color; }
&:hover, &:focus { background-color: $divider_color; } &:hover, &:focus { background-color: $divider_color; }
&:active { background-color: $track_color; } &:active { background-color: $track_color; }
StIcon { icon-size: $base_icon_size; }
} }
// body // body

View file

@ -2,3 +2,19 @@
.overview-controls { .overview-controls {
padding-bottom: 32px; padding-bottom: 32px;
} }
%overview_scrollbar {
StBin#trough {
background-color: $light_divider_color;
}
StButton#vhandle, StButton#hhandle {
background-color: $light_hint_fg_color;
&:hover { background-color: $light_alt_fg_color; }
&:active { background-color: $light_fg_color; }
}
}
#overview {
StScrollBar { @extend %overview_scrollbar; }
}

View file

@ -4,6 +4,8 @@
.icon-button, .button { .icon-button, .button {
padding: $container_padding; padding: $container_padding;
StIcon { icon-size: $base_icon_size !important; }
} }
} }
@ -53,7 +55,7 @@
&:rtl > StBoxLayout { padding-right: $base_padding * 2.5; } &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; }
.quick-toggle-label { font-weight: bold; } .quick-toggle-label { font-weight: bold; }
.quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size; } .quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size !important; }
} }
.quick-menu-toggle { .quick-menu-toggle {
@ -86,7 +88,7 @@
} }
.quick-toggle-icon { .quick-toggle-icon {
icon-size: $base_icon_size; icon-size: $base_icon_size !important;
} }
.icon-button { .icon-button {

View file

@ -1,16 +1,4 @@
%overview_scrollbar {
StBin#trough {
background-color: $light_divider_color;
}
StButton#vhandle, StButton#hhandle {
background-color: $light_hint_fg_color;
&:hover { background-color: $light_alt_fg_color; }
&:active { background-color: $light_fg_color; }
}
}
#overview { #overview {
spacing: 24px; spacing: 24px;
StScrollBar { @extend %overview_scrollbar; }
} }

View file

@ -56,20 +56,21 @@
width: 24px; width: 24px;
height: 24px; height: 24px;
border-radius: $circular_radius; border-radius: $circular_radius;
color: $light_fg_color !important;
} }
&:insensitive > StIcon { &:insensitive > StIcon {
backround-color: $light_fill_color; backround-color: transparent !important;
color: $light_fg_color; color: transparent !important;
} }
&:hover > StIcon { &:hover > StIcon {
backround-color: $light_divider_color; backround-color: $light_divider_color !important;
color: $light_fg_color; color: $light_fg_color !important;
} }
&:active > StIcon { &:active > StIcon {
backround-color: $light_track_color; backround-color: $light_track_color !important;
color: $light_fg_color; color: $light_fg_color !important;
} }
} }

View file

@ -188,6 +188,53 @@ window.background.csd {
> stack.background { background-color: $base_color; } > stack.background { background-color: $base_color; }
} }
preferencesgroup > box {
button.background-preview-button {
padding: $container_padding / 2;
outline: 2px solid transparent;
outline-offset: 0;
border-radius: $bt_radius + $container_padding / 2;
&, &:hover, &:active, &:checked {
background: none;
border: none;
box-shadow: none;
}
&:hover {
outline-color: $alt_disabled_fg_color;
}
&:active {
outline-color: $alt_fg_color;
}
&:checked {
outline-color: $selected_bg_color;
}
}
flowbox.background-flowbox > flowboxchild {
outline: 2px solid transparent;
outline-offset: 0;
border-radius: $bt_radius + 3px;
padding: 3px;
&:hover {
outline-color: $alt_disabled_fg_color;
}
&:active {
outline-color: $alt_fg_color;
}
&:selected {
outline-color: $selected_bg_color;
background-color: transparent;
}
}
}
} }
} }

View file

@ -63,21 +63,6 @@ preferencesgroup > box {
> box.single-line { > box.single-line {
min-height: 34px; min-height: 34px;
} }
button.background-preview-button {
&, &:hover, &:active, &:checked {
background: none;
border: none;
box-shadow: none;
padding: $container_padding / 2;
border: 2px solid transparent;
border-radius: $bt_radius + $container_padding / 2;
}
&:checked {
border: 2px solid $selected_bg_color;
}
}
} }
// //
@ -194,28 +179,28 @@ viewswitcher {
margin: 0; margin: 0;
&.wide { &.wide {
border-spacing: $container_padding / 2; border-spacing: 0;
button.toggle { > button.toggle {
margin: 8px 0; margin: 8px 0;
} }
} }
&.narrow button.toggle { &.narrow > button.toggle {
border-radius: 0; border-radius: 0;
margin: 0; margin: 0;
} }
button.toggle { > button.toggle {
font-weight: normal; font-weight: normal;
padding: 0; padding: 0;
> stack > box { > stack > box {
&.narrow { &.narrow {
font-size: 0.75rem; font-size: 0.75rem;
padding-top: $container_padding + 1px; padding-top: $container_padding;
padding-bottom: $container_padding - 1px; padding-bottom: $container_padding;
border-spacing: $container_padding - 2px; border-spacing: 0;
> stack > label { > stack > label {
padding-left: $container_padding + 2px; padding-left: $container_padding + 2px;
@ -225,7 +210,12 @@ viewswitcher {
&.wide { &.wide {
padding: 0 $container_padding * 2; padding: 0 $container_padding * 2;
border-spacing: $container_padding; border-spacing: 0;
> label, > indicatorbin > image {
padding-left: $container_padding / 2;
padding-right: $container_padding / 2;
}
} }
} }
} }
@ -251,7 +241,6 @@ indicatorbin {
min-width: $container_padding * 2; min-width: $container_padding * 2;
min-height: $container_padding * 2; min-height: $container_padding * 2;
border-radius: $circular_radius; border-radius: $circular_radius;
margin: 0;
} }
> indicator { > indicator {