From 236587d1e2de59d7b269a227fd8bf22e0463bfeb Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Wed, 5 Oct 2022 16:39:05 +0800 Subject: [PATCH] update --- src/sass/_colors.scss | 4 ++-- src/sass/gtk/_common-3.0.scss | 38 ++----------------------------- src/sass/gtk/_common-4.0.scss | 8 +++---- src/sass/gtk/apps/_gnome-4.0.scss | 29 +++++++++++++++-------- 4 files changed, 27 insertions(+), 52 deletions(-) diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index bb387f16..39c751f5 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -19,7 +19,7 @@ @if ($state == 'primary') { @return rgba($black, 0.87); } @if ($state == 'secondary') { @return rgba($black, 0.6); } @if ($state == 'disabled') { @return rgba($black, 0.38); } - @if ($state == 'secondary-disabled') { @return rgba($black, 0.26); } + @if ($state == 'secondary-disabled') { @return rgba($black, 0.3); } @if ($state == 'track') { @return rgba($black, 0.26); } @if ($state == 'track-disabled') { @return rgba($black, 0.12); } @if ($state == 'divider') { @return rgba($black, 0.12); } @@ -29,7 +29,7 @@ @if ($state == 'primary') { @return $white; } @if ($state == 'secondary') { @return rgba($white, 0.7); } @if ($state == 'disabled') { @return rgba($white, 0.5); } - @if ($state == 'secondary-disabled') { @return rgba($white, 0.3); } + @if ($state == 'secondary-disabled') { @return rgba($white, 0.32); } @if ($state == 'track') { @return rgba($white, 0.3); } @if ($state == 'track-disabled') { @return rgba($white, 0.12); } @if ($state == 'divider') { @return rgba($white, 0.12); } diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 294b6743..cf890b92 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -339,8 +339,8 @@ entry { } } - .osd & { - } + // .osd & { + // } } progress { @@ -527,9 +527,6 @@ button { min-width: 32px; padding-left: $space-size * 2 + 4px; padding-right: $space-size * 2 + 4px; - - &.flat { - } } &.image-button { @@ -651,8 +648,6 @@ button { &:checked { background-color: rgba($b_color, 0.3); } } - - .osd & { } } } @@ -740,10 +735,6 @@ button.color { min-height: $small-size; min-width: $small-size; padding: $space-size; - - colorswatch:only-child { - // &, overlay { border-radius: 0; } - } } @@ -3514,12 +3505,6 @@ tooltip { border-radius: $corner-radius/2; box-shadow: none; // otherwise it gets inherited by windowframe.csd - &:not(.csd):not(.unity-csd) { - // border: 1px solid $divider; - // border-radius: $corner-radius + 1px; - // background-clip: $background-clip-extra; - } - // FIXME: we need a border or tooltips vanish on black background. decoration { background-color: transparent; } @@ -3528,11 +3513,6 @@ tooltip { min-height: 32px - 4px * 2; padding: 4px 8px; } - - * { - // workaround for Eclipse. - // do not include any declaration here. - } } @@ -3993,20 +3973,6 @@ stackswitcher { } -/************* - * App Icons * - *************/ -// Outline for low res icons -.lowres-icon { - // -gtk-icon-shadow: none; -} - -// Drapshadow for large icons -.icon-dropshadow { - // -gtk-icon-shadow: none; -} - - /********* * Emoji * *********/ diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index 0294514d..07b221c9 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -700,8 +700,6 @@ button { &:checked { background-color: rgba($b_color, 0.3); } } - - .osd & { } } } @@ -1034,9 +1032,9 @@ button.color { min-width: $small-size; padding: $space-size; - colorswatch:only-child { - // &, overlay { border-radius: 0; } - } + // colorswatch:only-child { + // &, overlay { border-radius: 0; } + // } } %list_button, diff --git a/src/sass/gtk/apps/_gnome-4.0.scss b/src/sass/gtk/apps/_gnome-4.0.scss index 7da4676e..46bb177e 100644 --- a/src/sass/gtk/apps/_gnome-4.0.scss +++ b/src/sass/gtk/apps/_gnome-4.0.scss @@ -168,8 +168,8 @@ carousel.card { } .context-tile-lozenge { - min-height: 24px; - min-width: 24px; + min-height: 28px; + min-width: 28px; padding: $space-size; &.grey { @@ -177,20 +177,31 @@ carousel.card { background-color: $divider; } - &.green { - color: $success; + &.green, &.details-rating-0 { + color: darken($success, 15%); background-color: rgba($success, 0.15); } - &.red { - color: $error; - background-color: rgba($error, 0.15); + &.blue, + &.details-rating-5 { + color: $blue-light; + background-color: rgba($blue-light, 0.15); } - &.details-rating-12 { - color: $warning; + &.yellow, &.details-rating-12 { + color: darken($warning, 15%); background-color: rgba($warning, 0.15); } + + &.details-rating-15 { + color: $orange-light; + background-color: rgba($orange-light, .15); + } + + &.red, &.details-rating-18 { + color: darken($error, 15%); + background-color: rgba($error, 0.15); + } } screenshot-carousel box.frame.view {