This commit is contained in:
Vince
2022-11-10 16:59:03 +08:00
parent 4e824e9f56
commit e29a1a274e
2 changed files with 37 additions and 44 deletions

View File

@@ -2060,11 +2060,13 @@ popover.menu {
/************ /************
* Popovers * * Popovers *
************/ ************/
popover.background { popover {
font: initial; &.background {
font: initial;
&, &:backdrop { &, &:backdrop {
background-color: transparent; background-color: transparent;
}
} }
> arrow, > arrow,
@@ -2083,14 +2085,6 @@ popover.background {
background-clip: border-box; background-clip: border-box;
box-shadow: 0 0 0 1px $window-border, $shadow-z5; box-shadow: 0 0 0 1px $window-border, $shadow-z5;
} }
&:backdrop {
@if $rimless == 'true' {
box-shadow: $shadow-z3;
} @else {
box-shadow: $shadow-z3, 0 0 0 1px $window-border;
}
}
} }
@if $rimless == 'false' and $variant == 'light' { @if $rimless == 'false' and $variant == 'light' {
@@ -4753,12 +4747,32 @@ colorchooser .popover.osd {
**********************/ **********************/
window { window {
border: none; border: none;
transition: $transition-shadow;
&.csd { &.csd {
border-radius: $window-radius; border-radius: $window-radius;
outline-offset: -1px; outline-offset: -1px;
outline: 1px solid highlight($background); outline: 1px solid highlight($background);
margin: 0;
@if $rimless == 'true' {
box-shadow: $shadow-z16, 0 0 36px transparent;
} @else {
box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
}
&:backdrop {
// the transparent shadow here is to enforce that the shadow extents don't
// change when we go to backdrop, to prevent jumping windows.
// The biggest shadow should be in the same order then in the active state
// or the jumping will happen during the transition.
transition: $transition-shadow;
@if $rimless == 'true' {
box-shadow: $shadow-z4, 0 0 36px transparent;
} @else {
box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent;
}
}
&.maximized, &.maximized,
&.fullscreen, &.fullscreen,
@@ -4766,24 +4780,9 @@ window {
&.tiled-top, &.tiled-top,
&.tiled-right, &.tiled-right,
&.tiled-bottom, &.tiled-bottom,
&.tiled-left { border-radius: 0; } &.tiled-left {
} border-radius: 0;
transition: none;
@if $rimless == 'true' {
box-shadow: $shadow-z16, 0 0 36px transparent;
} @else {
box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
}
&:backdrop {
// the transparent shadow here is to enforce that the shadow extents don't
// change when we go to backdrop, to prevent jumping windows.
// The biggest shadow should be in the same order then in the active state
// or the jumping will happen during the transition.
@if $rimless == 'true' {
box-shadow: $shadow-z4, 0 0 36px transparent;
} @else {
box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent;
} }
} }

View File

@@ -99,6 +99,12 @@ window.dialog {
// //
.display-container { .display-container {
&.card {
border-radius: 0;
box-shadow: none;
border-width: 0 0 1px 0;
}
.history-view { background-color: $base; } .history-view { background-color: $base; }
#displayitem { #displayitem {
@@ -118,19 +124,6 @@ window.dialog {
} }
} }
.small .card {
border-radius: 0;
box-shadow: none;
&.forecast-card {
border-width: 1px 0;
}
&.display-container {
border-width: 0 0 1px 0;
}
}
leaflet { leaflet {
button.number-button { button.number-button {
background-color: rgba($text, 0.1); background-color: rgba($text, 0.1);
@@ -1167,6 +1160,7 @@ $weather_forecast_color: #ae7b03;
.forecast-card { .forecast-card {
transition: border-radius 100ms ease-out; transition: border-radius 100ms ease-out;
border-radius: $corner-radius; border-radius: $corner-radius;
border-width: 1px 0;
} }
.forecast-card separator { .forecast-card separator {