Skip to content

Commit

Permalink
misc, undo more blur-my-shell stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
eeshugerman committed Apr 11, 2022
1 parent 3dd9c5f commit d9d5f4b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
12 changes: 6 additions & 6 deletions _colors.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// When color definition differs for dark and light variant,
// it gets @if-ed depending on $variant

$base_color: if($variant == 'light', #fff, darken(desaturate(#241f31, 100%), 2%));
$bg_color: if($variant == 'light', #f6f5f4, lighten($base_color, 5%));
$fg_color: if($variant == 'light', transparentize(black, .2), white);
$base_color: if($variant == 'light', white, darken(desaturate(#241f31, 100%), 2%));
$bg_color: if($variant == 'light', darken($base_color, 5%), lighten($base_color, 5%));
$fg_color: if($variant == 'light', transparentize(black, 0.2), white);

$selected_fg_color: if($variant == 'light', black, white);
$selected_bg_color: if($variant == 'light', lighten(#3584e4, 10%), #3584e4);
$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), darken($selected_bg_color, 30%));
$selected_borders_color: if($variant== 'light', lighten($selected_bg_color, 30%), darken($selected_bg_color, 30%));

$borders_color: if($variant == 'light', transparentize($fg_color, .5), transparentize($fg_color, .9));
$borders_edge: if($variant == 'light', rgba(255,255,255,0.8), lighten($bg_color, 5%));
Expand All @@ -30,15 +30,15 @@ $osd_outer_borders_color: transparentize($osd_fg_color, 0.98);
$shadow_color: if($variant == 'light', rgba(0,0,0,0.1), rgba(0,0,0,0.2));

// overview background color
$system_bg_color: $base_color;
$system_bg_color: if($variant == 'light', darken($base_color, 10%), $base_color);

//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
$insensitive_bg_color: mix($bg_color, $base_color, 60%);
$insensitive_borders_color: mix($borders_color, $base_color, 60%);

//colors for the backdrop state, derived from the main colors.
$backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
$backdrop_base_color: if($variant =='light', darken($base_color,10%), lighten($base_color,1%));
$backdrop_bg_color: $bg_color;
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 80%);
$backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), lighten($backdrop_bg_color,15%));
Expand Down
19 changes: 10 additions & 9 deletions widgets/_app-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ $app_icon_size: 96px;
spacing: $base_padding;
}
// TODO: this only makes sense with blur-my-shell
StLabel {
background-color: rgba(255, 255, 255, 0.2);
border-radius: $base_border_radius;
background-size: auto;
padding: 0px $base_border_radius/2;
}
// StLabel {
// background-color: rgba(255, 255, 255, 0.2);
// border-radius: $base_border_radius;
// background-size: auto;
// padding: 0px $base_border_radius/2;
// }
}
}

Expand Down Expand Up @@ -95,8 +95,9 @@ $app_icon_size: 96px;
width: 5px;
border-radius:5px;
// TODO: this only makes sense with blur-my-shell
margin-bottom: if($variant == 'light', 4px, 8px); // leave room for text background
background-color: if($variant == 'light', white, $osd_fg_color);
// margin-bottom: if($variant == 'light', 4px, 8px); // leave room for text background
// background-color: if($variant == 'light', white, $osd_fg_color);
background-color: $osd_fg_color;
}

// Rename popup for app folders
Expand All @@ -115,7 +116,7 @@ $app_icon_size: 96px;
width: 10px;
height: 10px;
border-radius: 10px; // the same as height&width
background-color: white;
background-color: $fg_color;
}
}

Expand Down
5 changes: 1 addition & 4 deletions widgets/_dash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
}

// show apps button
.show-apps {
@include overview_icon($osd_fg_color);
color: white;
}
.show-apps { @include overview_icon($osd_fg_color); }

.show-apps, .app-well-app {
padding-bottom: $dash_padding;
Expand Down

0 comments on commit d9d5f4b

Please sign in to comment.