This commit is contained in:
vinceliuice
2024-04-30 15:45:47 +08:00
parent 65fe4fba14
commit c0467e2199
2 changed files with 88 additions and 50 deletions

View File

@@ -283,9 +283,8 @@ spinner {
/**************** /****************
* Text Entries * * Text Entries *
****************/ ****************/
%entry,
entry { %entry_basic {
%entry_basic, & {
min-height: $medium-size; min-height: $medium-size;
padding: 0 8px; padding: 0 8px;
border-radius: $corner-radius; border-radius: $corner-radius;
@@ -298,6 +297,21 @@ entry {
&:drop(active) { @include entry(hover); } &:drop(active) { @include entry(hover); }
&:disabled { @include entry(disabled); } &:disabled { @include entry(disabled); }
}
%entry,
entry {
@extend %entry_basic;
.background:not(.csd) & {
@include entry(solid);
&:focus { @include entry(solid-checked); }
&:drop(active) { @include entry(solid-hover); }
&:disabled { @include entry(solid-disabled); }
}
&.flat { &.flat {
min-height: 0; min-height: 0;
@@ -344,10 +358,6 @@ entry {
} }
} }
// .osd & {
// }
}
progress { progress {
margin: 2px -8px; margin: 2px -8px;
border-bottom: 2px solid $primary; border-bottom: 2px solid $primary;

View File

@@ -58,6 +58,34 @@
color: $text-disabled; color: $text-disabled;
} }
@if $t == solid {
transition: $transition, box-shadow $ripple-fade-out-duration $ease-out;
box-shadow: inset 0 0 0 2px transparent;
background-color: mix($text, $base, 5%);
color: $text;
}
@if $t == solid-hover {
background-color: mix($text, $base, 10%);
box-shadow: inset 0 0 0 2px $overlay-hover;
}
@if $t == solid-focus {
background-color: mix($text, $base, 8%);
box-shadow: inset 0 0 0 2px if($fc == $primary, $track, $fc);
}
@if $t == solid-checked {
background-color: mix($text, $base, 5%);
box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc);
}
@if $t == solid-disabled {
box-shadow: inset 0 0 0 2px transparent;
background-color: mix($text, $base, 3%);
color: $text-disabled;
}
@if $t == raised-normal { @if $t == raised-normal {
transition: $transition, box-shadow $ripple-fade-out-duration $ease-out; transition: $transition, box-shadow $ripple-fade-out-duration $ease-out;
border-image: none; border-image: none;