From 49171606dc99ff004af2df4cba5747cf99bb34f0 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sun, 20 Apr 2025 22:29:14 +0800 Subject: [PATCH] update --- src/sass/_variables.scss | 4 +-- src/sass/gtk/_common-3.0.scss | 8 +++-- src/sass/gtk/apps/_gnome-3.0.scss | 50 +++++++++++++++++++++++++------ src/sass/gtk/apps/_xfce.scss | 8 ++++- 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index 9c899f87..86efa259 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -9,8 +9,8 @@ $asset-suffix: if($variant == 'dark', '-dark', ''); $space-size: if($compact == 'false', 6px, 4px); $small-size: if($compact == 'false', 24px, 22px); -$medium-size: if($compact == 'false', 36px, 32px); -$large-size: if($compact == 'false', 48px, 40px); +$medium-size: if($compact == 'false', 34px, 30px); +$large-size: if($compact == 'false', 46px, 38px); $menuitem-size: if($compact == 'false', 28px, 24px); diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index dd5c3c10..b472646d 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -178,14 +178,16 @@ iconview { &:hover, &:selected { border-radius: $corner-radius; } } +%rubberband, .rubberband, rubberband { + // border-radius: 3px; border: 1px solid $primary; background-color: rgba($primary, 0.3); } flowbox { - rubberband { @extend rubberband; } + rubberband { @extend %rubberband; } flowboxchild { padding: $space-size / 2; @@ -1493,7 +1495,7 @@ treeview.view { @extend %selected_items; } - rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props + rubberband { @extend %rubberband; } // to avoid borders being overridden by the previously set props &.separator { min-height: $space-size; @@ -3665,7 +3667,7 @@ colorchooser .popover.osd { // &:hover { -gtk-icon-effect: highlight; } - rubberband, .rubberband { @extend rubberband; } + rubberband, .rubberband { @extend %rubberband; } } // .scale-popup { diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss index 55b45146..9fd74180 100644 --- a/src/sass/gtk/apps/_gnome-3.0.scss +++ b/src/sass/gtk/apps/_gnome-3.0.scss @@ -82,26 +82,58 @@ $nautilus: $base-alt; &, placessidebar { border-radius: 0; } } - // Floating status bar .floating-bar { - min-height: 32px; - padding: 0; margin: $space-size; - border: none; + padding: 2px; + box-shadow: $shadow-z3; border-radius: $corner-radius; background-color: $primary; color: on($primary); - box-shadow: $shadow-z3; + border: none; button { - margin: (32px - $small-size) / 2; - color: on($primary); - - @extend %small-button; + @extend %button-on-dark; + min-height: 16px; + min-width: 16px; + padding: 2px; + margin: $space-size - 4px; } } } +// Floating status bar +.floating-bar { + min-height: 16px + $space-size * 2; + padding: 0; + // margin: $space-size; + border: 1px solid $solid-border; + border-radius: 0; + background-color: $base; + color: $text; + // box-shadow: $shadow-z3; + + &.bottom.right { + border-top-left-radius: $corner-radius; + border-right: none; + border-bottom: none; + } + + &.bottom.left { + border-top-right-radius: $corner-radius; + border-left: none; + border-bottom: none; + } + + button { + min-height: 16px; + min-width: 16px; + padding: 0; + margin: $space-size; + border-radius: $circular-radius; + @extend %button-flat; + } +} + // .nautilus-canvas-item { // border-radius: $corner-radius; // } diff --git a/src/sass/gtk/apps/_xfce.scss b/src/sass/gtk/apps/_xfce.scss index 30155677..037404e8 100644 --- a/src/sass/gtk/apps/_xfce.scss +++ b/src/sass/gtk/apps/_xfce.scss @@ -197,9 +197,15 @@ dialog.xfsm-logout-dialog { widget.view { // padding: $space-size; // Not work ? + border-radius: $corner-radius; + } + + .view { + &:hover { color: $text; } &:selected { - @extend %selected_items; + color: on($primary); + background: $primary; } } }