This commit is contained in:
vinceliuice 2023-03-11 19:39:40 +08:00
parent 64ef8c4fd8
commit c1bb5727de
6 changed files with 20 additions and 15 deletions

View File

@ -44,6 +44,7 @@ $bt_radius: if($laptop == 'false', 6px, 6px);
$bd_radius: if($laptop == 'false', 8px, 8px); $bd_radius: if($laptop == 'false', 8px, 8px);
$wm_radius: if($laptop == 'false', 12px, 12px); $wm_radius: if($laptop == 'false', 12px, 12px);
$mn_radius: if($laptop == 'false', 14px, 12px); $mn_radius: if($laptop == 'false', 14px, 12px);
$po_radius: if($laptop == 'false', 16px, 14px);
$dash_radius: if($laptop == 'false', 24px, 18px); $dash_radius: if($laptop == 'false', 24px, 18px);
$base_border_radius: if($laptop == 'false', 8px, 8px); $base_border_radius: if($laptop == 'false', 8px, 8px);
$modal_radius: $base_border_radius * 2; $modal_radius: $base_border_radius * 2;

View File

@ -5,7 +5,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
%popover_bubble { %popover_bubble {
color: $alt_fg_color; color: $alt_fg_color;
background-color: $popover_bubble_bg; background-color: $popover_bubble_bg;
border-radius: $mn_radius !important; border-radius: $base_border_radius !important;
border: none; border: none;
box-shadow: 0 1px 2px rgba(black, 0.02) !important; box-shadow: 0 1px 2px rgba(black, 0.02) !important;
text-shadow: none; text-shadow: none;

View File

@ -2,7 +2,7 @@
%theme_dialogs { %theme_dialogs {
background-color: $dialog_bg_color; background-color: $dialog_bg_color;
border-radius: $wm_radius; border-radius: $modal_radius;
border: solid rgba(black, 0.75); border: solid rgba(black, 0.75);
border-width: if($variant=='light', 0, 1px); border-width: if($variant=='light', 0, 1px);
box-shadow: 0 3px 6px 0 rgba(black, if($variant=='light', 0.25, 0.35)); box-shadow: 0 3px 6px 0 rgba(black, if($variant=='light', 0.25, 0.35));
@ -40,15 +40,15 @@
// modal dialog // modal dialog
.modal-dialog { .modal-dialog {
color: $fg_color; color: $fg_color;
padding: 0 5px 6px 5px; padding: $base_padding;
@extend %theme_dialogs !optional; @extend %theme_dialogs !optional;
&-linked-button { &-linked-button {
min-height: 40px; min-height: 40px;
padding: 0 16px; padding: 0 16px;
margin: 3px 3px !important; margin: $base_padding !important;
border: none !important; border: none !important;
border-radius: $bt_radius; border-radius: $modal_radius - $base_padding * 2;
@include font(button); @include font(button);
@include button(flat-normal); @include button(flat-normal);

View File

@ -1,10 +1,10 @@
/* Popovers/Menus */ /* Popovers/Menus */
$popop_menuitem_radius: $wm_radius - 4px; $popop_menuitem_radius: $po_radius - $base_padding;
//.the popover itself //.the popover itself
.popup-menu-boxpointer { .popup-menu-boxpointer {
-arrow-border-radius: $wm_radius; -arrow-border-radius: $po_radius;
-arrow-background-color: transparent; -arrow-background-color: transparent;
-arrow-border-width: 0; -arrow-border-width: 0;
-arrow-border-color: transparent; -arrow-border-color: transparent;
@ -92,10 +92,12 @@ $popop_menuitem_radius: $wm_radius - 4px;
.popup-menu-content { .popup-menu-content {
padding: $base_padding; padding: $base_padding;
@extend %theme_dialogs;
box-shadow: 0 5px 10px 0 rgba(black, 0.18); box-shadow: 0 5px 10px 0 rgba(black, 0.18);
border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
margin: 4px 12px 17px 12px; margin: 4px 12px 17px 12px;
background-color: $dialog_bg_color;
border-radius: $po_radius;
border: solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
border-width: if($variant=='light', 0, 1px);
@include font(body-1); @include font(body-1);
} }

View File

@ -114,11 +114,13 @@
.place-menu-item { .place-menu-item {
&:ltr { &:ltr {
padding-left: 0 !important; padding-left: 0 !important;
margin-left: 0 !important;
padding-right: $base_padding * 5 !important; padding-right: $base_padding * 5 !important;
} }
&:rtl { &:rtl {
padding-right: 0 !important; padding-right: 0 !important;
margin-right: 0 !important;
padding-left: $base_padding * 5 !important; padding-left: $base_padding * 5 !important;
} }

View File

@ -18,7 +18,7 @@ $screenshot_ui_button_red: $error_color;
padding: $screenshot_ui_panel_padding; padding: $screenshot_ui_panel_padding;
// Reduce the bottom padding a little to accommodate the large capture button. // Reduce the bottom padding a little to accommodate the large capture button.
margin-bottom: 4em; margin-bottom: 4em;
spacing: $base_padding * 2; spacing: $container_padding * 2;
color: $osd_fg_color; color: $osd_fg_color;
background-color: $osd_bg_color; background-color: $osd_bg_color;
border: 1px solid rgba(black, 0.75); border: 1px solid rgba(black, 0.75);
@ -29,14 +29,14 @@ $screenshot_ui_button_red: $error_color;
@extend .window-close; // copy window close button @extend .window-close; // copy window close button
padding: $base_padding !important; // but with more padding padding: $base_padding !important; // but with more padding
&.left { margin-left: $base_padding + 2px; } &.left { margin-left: $container_padding; }
&.right { margin-right: $base_padding + 2px; } &.right { margin-right: $container_padding; }
} }
.screenshot-ui-type-button { .screenshot-ui-type-button {
@extend %osd_button; @extend %osd_button;
min-width: 48px; min-width: 48px;
padding: $base_padding * 2 $base_padding * 3 !important; padding: $base_padding * 3 $base_padding * 4 !important;
border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding; border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding;
} }
@ -45,7 +45,7 @@ $screenshot_ui_button_red: $error_color;
height: 36px; height: 36px;
border-radius: $circular_radius; border-radius: $circular_radius;
border: 4px white; border: 4px white;
padding: $base_margin; padding: $base_padding;
.screenshot-ui-capture-button-circle { .screenshot-ui-capture-button-circle {
background-color: white; background-color: white;
@ -111,7 +111,7 @@ $screenshot_ui_button_red: $error_color;
.screenshot-ui-show-pointer-button { .screenshot-ui-show-pointer-button {
@extend %osd_button; @extend %osd_button;
border-radius: $circular_radius; border-radius: $circular_radius;
padding: $base_padding * 2 !important; padding: $container_padding * 2.5 !important;
StIcon { icon-size: 16px; } StIcon { icon-size: 16px; }
} }