Rebase against gnome 46.0 first

This commit is contained in:
Kevin MacMartin 2024-03-25 14:49:39 -04:00
parent 0d88cff006
commit 0603c2b3f5
8 changed files with 26 additions and 48 deletions

View file

@ -1,7 +1,6 @@
$variant: 'dark'; $variant: 'dark';
$contrast: 'normal'; $contrast: 'normal';
$laptop: false;
@import "gnome-shell-sass/_colors"; //use gtk colors @import "gnome-shell-sass/_colors"; //use gtk colors
@import "gnome-shell-sass/_drawing"; @import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common"; @import "gnome-shell-sass/_common";

View file

@ -0,0 +1,7 @@
$variant: 'dark';
$contrast: "high";
@import "gnome-shell-sass/_high-contrast-colors"; //use gtk colors
@import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common";
@import "gnome-shell-sass/_widgets";

View file

@ -1,7 +1,6 @@
$variant: 'dark'; $variant: 'light';
$contrast: 'normal'; $contrast: 'normal';
$laptop: true;
@import "gnome-shell-sass/_colors"; //use gtk colors @import "gnome-shell-sass/_colors"; //use gtk colors
@import "gnome-shell-sass/_drawing"; @import "gnome-shell-sass/_drawing";
@import "gnome-shell-sass/_common"; @import "gnome-shell-sass/_common";

View file

@ -21,7 +21,7 @@ $system_base_color: $_base_color_dark;
$system_fg_color: $_base_color_light; $system_fg_color: $_base_color_light;
// panel colors // panel colors
$panel_bg_color: if($variant == 'light', $_base_color_light, $dark_4); $panel_bg_color: if($variant == 'light', $_base_color_light, $dark_5);
$panel_fg_color: if($variant == 'light', $_base_color_dark, $light_1); $panel_fg_color: if($variant == 'light', $_base_color_dark, $light_1);
// card elements // card elements

View file

@ -386,7 +386,7 @@
} }
// Panel menu/button drawing function // Panel menu/button drawing function
@mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $style: null, $highlighted_child: false, $child_class:"", $border_radius: 3px) { @mixin panel_button($bg:$panel_fg_color, $fg:$panel_fg_color, $style: null, $highlighted_child: false, $child_class:"") {
// //
// $bg: background color, derived from $panel_fg_color // $bg: background color, derived from $panel_fg_color
// $fg: foreground color, also derived from $panel_fg_color // $fg: foreground color, also derived from $panel_fg_color
@ -400,7 +400,7 @@
transition-duration: 150ms; transition-duration: 150ms;
border: 3px solid transparent; border: 3px solid transparent;
background-color: transparent; background-color: transparent;
border-radius: $border_radius; border-radius: $forced_circular_radius;
font-weight: bold; font-weight: bold;
color: $fg; color: $fg;
@ -444,7 +444,7 @@
#{$child_class} { #{$child_class} {
transition-duration: 150ms; transition-duration: 150ms;
border: 3px solid transparent; border: 3px solid transparent;
border-radius: $border_radius; border-radius: $forced_circular_radius;
} }
&:focus, &:hover { &:focus, &:hover {

View file

@ -39,8 +39,8 @@ $light_2: #f6f5f4;
$light_3: #deddda; $light_3: #deddda;
$light_4: #c0bfbc; $light_4: #c0bfbc;
$light_5: #9a9996; $light_5: #9a9996;
$dark_1: #777777; $dark_1: #77767b;
$dark_2: #5e5e5e; $dark_2: #5e5c64;
$dark_3: #3d3d3d; $dark_3: #3d3846;
$dark_4: #242424; $dark_4: #241f31;
$dark_5: #000000; $dark_5: #000000;

View file

@ -3,7 +3,7 @@
$ripple_size: 50px; $ripple_size: 50px;
.ripple-box { .ripple-box {
background-color: rgba(0,0,0,0); background-color: rgba(255,255,255,0.2);
box-shadow: 0 0 2px 2px rgba(255,255,255,0.2); box-shadow: 0 0 2px 2px rgba(255,255,255,0.2);
// plus + 2px for the border (box-shadow) // plus + 2px for the border (box-shadow)
width: $ripple_size + 2px; width: $ripple_size + 2px;

View file

@ -1,8 +1,8 @@
/* Top Bar */ /* Top Bar */
// a.k.a. the panel // a.k.a. the panel
$privacy_indicator_color: if($variant == 'light', $orange_4, $red_3); $privacy_indicator_color: if($variant == 'light', $orange_4, $orange_3);
$recording_indicator_color: $red_3; $recording_indicator_color: $red_4;
$transparent_panel_fg_color: $light_1; // always white for transparent lock screens $transparent_panel_fg_color: $light_1; // always white for transparent lock screens
$system_panel_fg_color: $system_fg_color; // always light for lockscreen, overview $system_panel_fg_color: $system_fg_color; // always light for lockscreen, overview
@ -20,13 +20,13 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
// panel menus // panel menus
.panel-button { .panel-button {
@include panel_button(); @include panel_button();
-natural-hpadding: 6px; -natural-hpadding: $base_padding * 2;
-minimum-hpadding: 4px; -minimum-hpadding: $base_padding;
// status area icons // status area icons
.system-status-icon { .system-status-icon {
icon-size: $scalable_icon_size; icon-size: $scalable_icon_size;
padding: 0; padding: 0 $base_padding;
margin: 0 $base_margin; margin: 0 $base_margin;
} }
@ -47,9 +47,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
} }
&#panelActivities { &#panelActivities {
-natural-hpadding: 10px;
-minimum-hpadding: 8px;
& StBoxLayout { & StBoxLayout {
padding: 0 $scaled_padding * 0.5; // use em padding to keep proportion padding: 0 $scaled_padding * 0.5; // use em padding to keep proportion
spacing: 5px; spacing: 5px;
@ -72,10 +69,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
StIcon { StIcon {
icon-size: $scalable_icon_size; icon-size: $scalable_icon_size;
&:first-child {
margin-left: 3px;
}
} }
} }
@ -93,10 +86,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
// we want to exclude the do-not-disturb indicator from the background // we want to exclude the do-not-disturb indicator from the background
// see _drawing.scss for override details // see _drawing.scss for override details
@include panel_button($highlighted_child: true, $child_class: '.clock'); @include panel_button($highlighted_child: true, $child_class: '.clock');
-natural-hpadding: 0px;
-minimum-hpadding: 0px;
padding-left: 0px;
padding-right: 0px;
.clock { .clock {
// the highlighted child // the highlighted child
@ -155,11 +144,6 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
} }
} }
.panel-status-indicators-box {
padding-right: 2px;
padding-left: 3px;
}
.panel-status-indicators-box, .panel-status-indicators-box,
.panel-status-menu-box { .panel-status-menu-box {
spacing: 2px; spacing: 2px;
@ -167,14 +151,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
// spacing between power icon and (optional) percentage label // spacing between power icon and (optional) percentage label
.power-status.panel-status-indicators-box { .power-status.panel-status-indicators-box {
padding-left: 0px;
spacing: 0; spacing: 0;
@if $laptop {
margin-bottom: 2px;
} @else {
margin-left: 2px;
}
} }
// important privacy related indicators // important privacy related indicators
@ -197,11 +174,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
.clock-display-box { .clock-display-box {
spacing: 2px; spacing: 2px;
.clock { .clock {
padding-left: 8px; padding-left: $scaled_padding * 2;
padding-right: 8px; padding-right: $scaled_padding * 2;
}
StIcon:last-child {
margin-right: 3px;
} }
} }