aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-3.0/3.14/sass/_drawing.scss
diff options
context:
space:
mode:
authorHorst31802015-09-12 00:44:58 +0200
committerHorst31802015-09-12 01:01:23 +0200
commited94af21c3dfe8d457d1a008d7ac9f6a9fa9fc53 (patch)
tree0d84c7c31098ae141607186cf7aeb797268b9414 /common/gtk-3.0/3.14/sass/_drawing.scss
parentf6d874a6ba7b358d931bb80655cbae46b2576ed3 (diff)
parent853e9eeadd88da1d650f7e4dd2ea9119dfbc8a08 (diff)
downloadsolarc-theme-ed94af21c3dfe8d457d1a008d7ac9f6a9fa9fc53.tar.gz
solarc-theme-ed94af21c3dfe8d457d1a008d7ac9f6a9fa9fc53.tar.xz
solarc-theme-ed94af21c3dfe8d457d1a008d7ac9f6a9fa9fc53.zip
Merge branch 'master' into wip/3.18
Diffstat (limited to 'common/gtk-3.0/3.14/sass/_drawing.scss')
-rw-r--r--common/gtk-3.0/3.14/sass/_drawing.scss61
1 files changed, 31 insertions, 30 deletions
diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss
index 2cb08e1..73c4962 100644
--- a/common/gtk-3.0/3.14/sass/_drawing.scss
+++ b/common/gtk-3.0/3.14/sass/_drawing.scss
@@ -52,17 +52,14 @@
background-image: linear-gradient(to bottom, transparentize($entry_bg, 0.45));
}
- $_header_entry_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 4%), 0.1), transparentize($base_color, 0.1));
- $_header_entry_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 10%), transparentize($header_fg, 0.7));
-
@if $t==header-normal {
//
// normal header-bar entry
//
color: $header_fg;
- border-color: $_header_entry_border;
- background-image: linear-gradient(to bottom, $_header_entry_bg);
+ border-color: $header_entry_border;
+ background-image: linear-gradient(to bottom, $header_entry_bg);
background-color: transparent;
&.image, &.image:hover { color: inherit; }
@@ -73,7 +70,7 @@
// focused header-bar entry
//
color: $selected_fg_color;
- border-color: $selected_bg_color;
+ border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
background-image: linear-gradient(to bottom, $selected_bg_color);
}
@@ -82,7 +79,7 @@
// insensitive header-bar entry
//
color: transparentize($header_fg, 0.45);
- background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35));
+ background-image: linear-gradient(to bottom, transparentize($header_entry_bg, 0.15));
}
@else if $t==osd {
@@ -90,27 +87,28 @@
// normal osd entry
//
color: $osd_fg_color;
- border-color: transparentize(black, 0.6);
+ border-color: $osd_entry_border;
+ background-image: linear-gradient(to bottom, $osd_entry_bg);
background-color: transparent;
- background-image: linear-gradient(to bottom, transparentize(black, 0.8));
+
+ &.image, &.image:hover { color: inherit; }
}
@else if $t==osd-focus {
//
// active osd entry
//
- color: $osd_fg_color;
- border-color: $selected_bg_color;
- background-image: linear-gradient(to bottom, transparentize(black, 0.8));
+ color: $selected_fg_color;
+ border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
+ background-image: linear-gradient(to bottom, $selected_bg_color);
}
@else if $t==osd-insensitive {
//
// insensitive osd entry
//
- color: $osd_insensitive_fg_color;
- border-color: transparentize(black, 0.6);
- background-image: linear-gradient(to bottom, transparentize(black, 0.9));
+ color: transparentize($osd_fg_color, 0.45);
+ background-image: linear-gradient(to bottom, transparentize($osd_entry_bg, 0.15));
}
}
@@ -139,8 +137,8 @@
//
color: $fg_color;
outline-color: transparentize($fg_color, 0.7);
- border-color: $selected_bg_color;
- background-color: $button_bg;
+ border-color: $button_border;
+ background-color: lighten($button_bg, 5%);
}
@else if $t==active {
@@ -149,7 +147,13 @@
//
color: $selected_fg_color;
outline-color: transparentize($selected_fg_color, 0.7);
- border-color: $selected_bg_color;
+ border-color: saturate(mix($fg_color, $bg_color, 60%), 10%);
+ background-color: saturate(mix($fg_color, $bg_color, 60%), 10%);
+
+ //border-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), transparent);
+ //background-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), darken($button_bg, 10%));
+
+ border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
background-color: $selected_bg_color;
}
@@ -177,9 +181,6 @@
> GtkLabel { color: inherit; }
}
- $_header_button_bg: if($darker == 'true' or $variant == 'dark', transparentize(darken($header_bg, 3%), 0.1), transparentize($button_bg, 0.1));
- $_header_button_border: if($darker == 'true' or $variant == 'dark', darken($header_bg, 8%), transparentize($header_fg, 0.7));
-
@if $t==header-normal {
//
// normal header-bar button
@@ -197,8 +198,8 @@
//
color: $header_fg;
outline-color: transparentize($header_fg, 0.7);
- border-color: $_header_button_border;
- background-color: $_header_button_bg;
+ border-color: $header_button_border;
+ background-color: $header_button_bg;
}
@else if $t==header-active {
@@ -207,7 +208,7 @@
//
color: $selected_fg_color;
outline-color: transparentize($selected_fg_color, 0.7);
- border-color: $selected_bg_color;
+ border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent);
background-color: $selected_bg_color;
}
@@ -237,8 +238,8 @@
//
color: $osd_fg_color;
outline-color: transparentize($osd_fg_color, 0.7);
- border-color: transparentize(black, 0.55);
- background-color: transparentize(black, 0.7);
+ border-color: $osd_button_border;
+ background-color: $osd_button_bg;
}
@else if $t==osd-hover {
@@ -247,8 +248,8 @@
//
color: $osd_fg_color;
outline-color: transparentize($osd_fg_color, 0.7);
- border-color: $selected_bg_color;
- background-color: transparentize(black, 0.7);
+ border-color: $osd_button_border;
+ background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
}
@else if $t==osd-active {
@@ -266,8 +267,8 @@
// insensitive osd button
//
color: $osd_insensitive_fg_color;
- border-color: transparentize(black, 0.55);
- background-color: transparentize(black, 0.85);
+ border-color: $osd_button_border;
+ background-color: transparentize($osd_button_bg, 0.15);
}
@else if $t==suggested_destructive {