aboutsummaryrefslogtreecommitdiff
path: root/common/cinnamon/sass/_drawing.scss
diff options
context:
space:
mode:
Diffstat (limited to 'common/cinnamon/sass/_drawing.scss')
-rw-r--r--common/cinnamon/sass/_drawing.scss46
1 files changed, 28 insertions, 18 deletions
diff --git a/common/cinnamon/sass/_drawing.scss b/common/cinnamon/sass/_drawing.scss
index 03b9f15..738a69d 100644
--- a/common/cinnamon/sass/_drawing.scss
+++ b/common/cinnamon/sass/_drawing.scss
@@ -15,42 +15,47 @@
// Entries drawing function
//
//@extend %reset_style;
- box-shadow: inset 0 0 transparentize($base_color, 1);
@if $t==normal {
color: $text_color;
background-color: $entry_bg;
border: 1px solid $entry_border;
+ box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95);
}
@if $t==focus {
color: $fg_color;
background-color: $entry_bg;
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95);
}
@if $t==insensitive {
color: $insensitive_fg_color;
background-color: mix($entry_bg, $bg_color, 55%);
border-color: 1px solid mix($entry_border, $bg_color, 55%);
+ box-shadow: inset 0 2px 4px transparentize(mix($entry_bg, $bg_color, 55%), 0.95);
}
@if $t==osd {
color: $osd_fg_color;
- background-color: transparentize(black, 0.8);
- border: 1px solid transparentize(black, 0.6);
+ background-color: $osd_entry_bg;
+ border: 1px solid $osd_entry_border;
+ box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
@if $t==osd-focus {
- color: $osd_fg_color;
- background-color: transparentize(black, 0.8);
+ color: $selected_fg_color;
+ background-color: $selected_bg_color;
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
@if $t==osd-insensitive {
- color: $osd_insensitive_fg_color;
- background-color: transparentize(black, 0.9);
- border-color: 1px solid transparentize(black, 0.6);
+ color: transparentize($osd_fg_color, 0.45);
+ background-color: transparentize($osd_entry_bg, 0.15);
+ border: 1px solid $osd_entry_border;
+ box-shadow: inset 0 2px 4px transparentize(black, 0.95);
}
}
@@ -63,7 +68,6 @@
//@extend %reset_style;
text-shadow: 0 1px transparentize($base_color, 1);
- box-shadow: inset 0 0 transparentize($base_color, 1);
@if $t==normal {
//
@@ -72,6 +76,7 @@
color: $fg_color;
background-color: $button_bg;
border: 1px solid $button_border;
+ box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
}
@else if $t==focus {
@@ -81,15 +86,17 @@
color: $fg_color;
background-color: $button_bg;
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
}
@else if $t==focus-hover {
//
// focused button
//
- color: $selected_bg_color;
+ color: $fg_color;
background-color: $button_bg;
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
}
@else if $t==hover {
@@ -97,8 +104,9 @@
// hovered button
//
color: $fg_color;
- background-color: $button_bg;
- border: 1px solid $selected_bg_color;
+ background-color: lighten($button_bg, 5%);
+ border: 1px solid $button_border;
+ box-shadow: inset 0 2px 4px transparentize(lighten($button_bg, 5%), 0.95);
}
@else if $t==active {
@@ -108,6 +116,7 @@
color: $selected_fg_color;
background-color: $selected_bg_color;
border: 1px solid $selected_bg_color;
+ box-shadow: inset 0 2px 4px $selected_bg_color;
}
@else if $t==insensitive {
@@ -117,6 +126,7 @@
color: $insensitive_fg_color;
border: 1px solid transparentize($button_border, 0.45);
background-color: transparentize($button_bg, 0.45);
+ box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95);
}
@else if $t==osd {
@@ -124,8 +134,8 @@
// normal osd button
//
color: $osd_fg_color;
- border: 1px solid transparentize(black, 0.55);
- background-color: transparentize(black, 0.7);
+ border: 1px solid $osd_button_border;
+ background-color: $osd_button_bg;
}
@else if $t==osd-hover {
@@ -133,8 +143,8 @@
// active osd button
//
color: $osd_fg_color;
- border: 1px solid $selected_bg_color;
- background-color: transparentize(black, 0.7);
+ border: 1px solid $osd_button_border;
+ background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
}
@else if $t==osd-active {
@@ -151,7 +161,7 @@
// insensitive osd button
//
color: $osd_insensitive_fg_color;
- border: 1px solid transparentize(black, 0.55);
- background-color: transparentize(black, 0.85);
+ border: 1px solid $osd_button_border;
+ background-color: transparentize($osd_button_bg, 0.15);
}
}