aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-3.0/3.18/sass
diff options
context:
space:
mode:
authorHorst31802016-08-31 00:00:33 +0200
committerHorst31802016-08-31 00:00:33 +0200
commit06b091100947a17f29b82f92bf0fa38735eaabac (patch)
tree8a99ae5c31af7e37dd1b8255f45c3098963b78e2 /common/gtk-3.0/3.18/sass
parent9c4b8025282487a94aaae2210d96b8e7ced5377d (diff)
downloadsolarc-theme-06b091100947a17f29b82f92bf0fa38735eaabac.tar.gz
solarc-theme-06b091100947a17f29b82f92bf0fa38735eaabac.tar.xz
solarc-theme-06b091100947a17f29b82f92bf0fa38735eaabac.zip
don't use selected_fg_color in weird places
Diffstat (limited to 'common/gtk-3.0/3.18/sass')
-rw-r--r--common/gtk-3.0/3.18/sass/_applications.scss6
-rw-r--r--common/gtk-3.0/3.18/sass/_colors.scss9
-rw-r--r--common/gtk-3.0/3.18/sass/_common.scss42
-rw-r--r--common/gtk-3.0/3.18/sass/_drawing.scss12
4 files changed, 38 insertions, 31 deletions
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index a499f77..5a3ef18 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -97,7 +97,7 @@ EelEditableLabel.entry { transition: none; } // Workaround for invisible text i
}
.nautilus-desktop.nautilus-canvas-item {
- color: $selected_fg_color;
+ color: white;
text-shadow: 1px 1px transparentize(black, 0.4);
&:active { color: $fg_color; }
@@ -555,7 +555,7 @@ PanelApplet .button:hover {
PanelApplet .button:active, PanelApplet .button:active:backdrop,
PanelApplet .button:checked, PanelApplet .button:checked:backdrop {
background-clip: padding-box;
- color: $selected_fg_color;
+ color: white;
background-color: transparentize(black, 0.75);
border-radius: 0;
border-color: transparentize(black, 0.75);
@@ -563,7 +563,7 @@ PanelApplet .button:checked, PanelApplet .button:checked:backdrop {
}
PanelApplet:hover {
- color: $selected_fg_color;
+ color: white;
}
PanelApplet:active,
diff --git a/common/gtk-3.0/3.18/sass/_colors.scss b/common/gtk-3.0/3.18/sass/_colors.scss
index 47daa0f..8d3a5f2 100644
--- a/common/gtk-3.0/3.18/sass/_colors.scss
+++ b/common/gtk-3.0/3.18/sass/_colors.scss
@@ -8,7 +8,7 @@ $bg_color: if($variant =='light', #F5F6F7, #383C4A);
$fg_color: if($variant =='light', #5c616c, #D3DAE3);
$selected_fg_color: #ffffff;
-$selected_bg_color: #5294E2;
+$selected_bg_color: #5294e2;
$selected_borders_color: darken($selected_bg_color, 20%);
$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%));
@@ -18,11 +18,18 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
lighten($selected_bg_color,10%));
$selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color);
+$selection_mode_fg: $selected_fg_color;
$warning_color: #F27835;
$error_color: #FC4138;
+$warning_fg_color: white;
+$error_fg_color: white;
$success_color: #73d216;
$destructive_color: #F04A50;
$suggested_color: #4DADD4;
+$destructive_fg_color: white;
+$suggested_fg_color: white;
+
+$drop_target_color: #F08437;
//insensitive state derived colors
$insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 83aff34..e77031d 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -237,20 +237,20 @@ $vert_padding: 5px;
box-shadow: none;
}
- @each $e_type, $e_color in (warning, $warning_color),
- (error, $error_color) {
+ @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color),
+ (error, $error_color, $error_fg_color) {
&.#{$e_type} {
color: $selected_fg_color;
border-color: if($variant=='light', $e_color, $entry_border);
background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%));
&:focus {
- color: $selected_fg_color;
+ color: $e_fg_color;
background-image: linear-gradient(to bottom, $e_color);
box-shadow: none;
}
&:selected, &:selected:focus {
- background-color: $selected_fg_color;
+ background-color: $e_fg_color;
color: $e_color;
}
}
@@ -389,10 +389,10 @@ $_dot_color: $selected_bg_color;
.osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; }
// Suggested and Destructive Action buttons
- @each $b_type, $b_color in (suggested-action, $suggested_color),
- (destructive-action, $destructive_color) {
+ @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color),
+ (destructive-action, $destructive_color, $destructive_fg_color) {
&.#{$b_type} {
- @include button(suggested_destructive, $b_color);
+ @include button(suggested_destructive, $b_color, $b_fg);
&.flat {
@include button(undecorated);
@@ -400,10 +400,10 @@ $_dot_color: $selected_bg_color;
outline-color: transparentize($b_color, 0.7);
}
&:hover {
- @include button(suggested_destructive, lighten($b_color, 10%));
+ @include button(suggested_destructive, lighten($b_color, 10%), $b_fg);
}
&:active, &:checked {
- @include button(suggested_destructive, darken($b_color, 10%));
+ @include button(suggested_destructive, darken($b_color, 10%), $b_fg);
}
&.flat:insensitive {
@include button(undecorated);
@@ -971,14 +971,14 @@ GtkComboBox {
// Selectionmode
&.selection-mode,
&.titlebar.selection-mode {
- color: $selected_fg_color;
+ color: $selection_mode_fg;
background-color: $selection_mode_bg;
border-color: darken($selection_mode_bg, 4%);
box-shadow: none;
&:backdrop {
background-color: $selection_mode_bg;
- color: transparentize($selected_fg_color, 0.4);
+ color: transparentize($selection_mode_fg, 0.4);
}
.subtitle:link { @extend *:link:selected; }
@@ -1128,19 +1128,19 @@ GtkComboBox {
background-color: transparent;
}
- @each $e_type, $e_color in (warning, $warning_color),
- (error, $error_color) {
+ @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color),
+ (error, $error_color, $error_fg_color) {
&.#{$e_type} {
- color: $selected_fg_color;
+ color: $e_fg_color;
border-color: if($darker=='false' and $variant=='light', $e_color, $header_entry_border);
background-image: linear-gradient(to bottom, mix($e_color, $header_bg, 60%));
&:focus {
- color: $selected_fg_color;
+ color: $e_fg_color;
background-image: linear-gradient(to bottom, $e_color);
}
&:selected, &:selected:focus {
- background-color: $selected_fg_color;
+ background-color: $e_fg_color;
color: $e_color;
}
}
@@ -1205,10 +1205,10 @@ GtkComboBox {
}
// Headerbar Suggested and Destructive Action buttons
- @each $b_type, $b_color in (suggested-action, $suggested_color),
- (destructive-action, $destructive_color) {
+ @each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color),
+ (destructive-action, $destructive_color, $destructive_fg_color) {
.button.#{$b_type} {
- @include button(suggested_destructive, $b_color);
+ @include button(suggested_destructive, $b_color, $b_fg);
&.flat {
@include button(undecorated);
@@ -1216,10 +1216,10 @@ GtkComboBox {
outline-color: transparentize($b_color, 0.7);
}
&:hover {
- @include button(suggested_destructive, lighten($b_color, 10%));
+ @include button(suggested_destructive, lighten($b_color, 10%), $b_fg);
}
&:active, &:checked {
- @include button(suggested_destructive, darken($b_color, 10%));
+ @include button(suggested_destructive, darken($b_color, 10%), $b_fg);
}
&.flat:insensitive,
&:insensitive { @include button(header-insensitive); }
diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss
index 93f9386..36a5f36 100644
--- a/common/gtk-3.0/3.18/sass/_drawing.scss
+++ b/common/gtk-3.0/3.18/sass/_drawing.scss
@@ -108,12 +108,12 @@
// Buttons
-@mixin button($t, $actionb_color:red) {
+@mixin button($t, $actionb_bg:red, $actionb_fg: green) {
//
// Button drawing function
//
// $t: button type,
-// $actionb_color: used for destructive and suggested action buttons
+// $actionb_bg, $actionb_fg: used for destructive and suggested action buttons
@if $t==normal {
//
@@ -266,10 +266,10 @@
//
background-clip: border-box;
- color: $selected_fg_color;
- outline-color: transparentize($selected_fg_color, 0.7);
- background-color: $actionb_color;
- border-color: $actionb_color;
+ color: $actionb_fg;
+ outline-color: transparentize($actionb_fg, 0.7);
+ background-color: $actionb_bg;
+ border-color: $actionb_bg;
}
@else if $t==undecorated {