Skip to content

Commit

Permalink
improvement: cinnamon - using em instead of px in sound applet (plus …
Browse files Browse the repository at this point in the history
…some unimportant tweaks)
  • Loading branch information
thekomer committed Apr 19, 2023
1 parent 21ccc9a commit d58501d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cinnamon/cinnamon.css
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@ StScrollBar {

.sound-player-overlay {
width: 290px;
height: 70px;
height: 5.4em;
padding: 15px;
spacing: 0.5em;
background: rgba(14, 17, 29, 0.9);
Expand Down
9 changes: 8 additions & 1 deletion cinnamon/sass/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45),
$tooltip_bg_color: darken($bg_color, 5%);
$tooltip_fg_color: $fg_color;
$tooltip_border_color: transparentize(white, 0.9);

// OSD
$osd_fg_color: #fefefe;
$osd_bg_color: transparentize(#14171a, 0.2);
Expand All @@ -78,3 +77,11 @@ $entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%));
// Buttons
$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%));
$button_border: $entry_border;

// Colors used for highlights in places where we don't want to use accents
$noaccent_light_bg_color: #c0c0c0;
$noaccent_light_fg_color: $text_color;
$noaccent_dark_bg_color: #525352;
$noaccent_dark_fg_color: #ffffff;
$noaccent_selected_bg_color: if($variant=='light', $noaccent_light_bg_color, $noaccent_dark_bg_color);
$noaccent_selected_fg_color: if($variant=='light', $noaccent_light_fg_color, $noaccent_dark_fg_color);
4 changes: 2 additions & 2 deletions cinnamon/sass/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ StScrollBar {

&-overlay {
width: 290px;
height: 70px;
height: 5.4em;
padding: 15px;
spacing: 0.5em;
background: transparentize($bg_color, 0.1);
Expand Down Expand Up @@ -2363,4 +2363,4 @@ StScrollBar {
border: 0px;
background-color: rgba(0,0,0,0);
border-radius: 0px;
}
}
8 changes: 4 additions & 4 deletions gtk-3.0/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//@use "sass:color";

// When color definition differs for dark and light variant
// it gets @if ed depending on $variant
/* When color definition differs for dark and light variant
it gets @if ed depending on $variant */

// Main definitions
$fg_color: if($variant == 'light', #31363d, #BFC3CD);
$fg_color: if($variant == 'light', #31363d, #bfc3cd);
$bg_color: if($variant == 'light', darken( #EEEEEE, 3%), #0E111D);
$base_color: if($variant == 'light', #ebf0f5, lighten($bg_color, 3%));
$text_color: $fg_color;
Expand Down Expand Up @@ -127,4 +127,4 @@ $scale_bg: if($variant == 'light', transparentize(black,0.86) ,transparentize(wh
$scale_disabled_bg: if($variant == 'light', transparentize(black, 0.94) ,transparentize(white, 0.94));
$suggested_bg_color: linear-gradient(to right, #e87e33 0%, #ff6a00 100%);
$destructive_bg_color: linear-gradient(to right, #FF416C, #FF4B2B);
$menu_shadow_color: $borders_color;
$menu_shadow_color: $borders_color;

0 comments on commit d58501d

Please sign in to comment.