aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-3.0/3.20/sass
diff options
context:
space:
mode:
Diffstat (limited to 'common/gtk-3.0/3.20/sass')
-rw-r--r--common/gtk-3.0/3.20/sass/_applications.scss4
-rw-r--r--common/gtk-3.0/3.20/sass/_colors.scss7
-rw-r--r--common/gtk-3.0/3.20/sass/_common.scss54
-rw-r--r--common/gtk-3.0/3.20/sass/_drawing.scss12
4 files changed, 41 insertions, 36 deletions
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index b1a81b4..3bd8448 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -35,7 +35,7 @@ terminal-window {
}
.nautilus-desktop.nautilus-canvas-item {
- color: $selected_fg_color;
+ color: white;
text-shadow: 1px 1px transparentize(black, 0.4);
&:active { color: $fg_color; }
@@ -479,7 +479,7 @@ button.documents-favorite:active:hover {
}
&:checked {
- color: $selected_fg_color;
+ color: white;
background-color: transparentize(black, 0.75);
box-shadow: inset 0 -2px $selected_bg_color;
}
diff --git a/common/gtk-3.0/3.20/sass/_colors.scss b/common/gtk-3.0/3.20/sass/_colors.scss
index 501c094..8d3a5f2 100644
--- a/common/gtk-3.0/3.20/sass/_colors.scss
+++ b/common/gtk-3.0/3.20/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,16 @@ $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;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 4f36e35..43159eb 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -232,24 +232,24 @@ entry {
selection { &:focus, & { @extend %selected_items; }}
// error and warning style
- @each $e_type, $e_color in (warning, $warning_color),
- (error, $error_color),
- // entry.search-missing for Gnome-Builder
- (search-missing, $error_color) {
+ @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color),
+ (error, $error_color, $error_fg_color),
+ // entry.search-missing for Gnome-Builder
+ (search-missing, $error_color, $error_fg_color) {
&.#{$e_type} {
- color: $selected_fg_color;
+ color: $e_fg_color;
border-color: if($variant=='light', $e_color, $entry_border);
background-image: linear-gradient(to bottom, mix($e_color, $base_color, 60%));
- image { color: $selected_fg_color; }
+ image { color: $e_fg_color; }
&:focus {
- color: $selected_fg_color;
+ color: $e_fg_color;
background-image: linear-gradient(to bottom, $e_color);
box-shadow: none;
}
selection, selection:focus {
- background-color: $selected_fg_color;
+ background-color: $e_fg_color;
color: $e_color;
}
}
@@ -466,10 +466,10 @@ button {
.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);
@@ -477,10 +477,10 @@ button {
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:disabled {
@include button(undecorated);
@@ -1000,14 +1000,14 @@ headerbar,
// Selectionmode
&.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; }
@@ -1142,19 +1142,19 @@ headerbar {
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);
}
selection, selection:focus {
- background-color: $selected_fg_color;
+ background-color: $e_fg_color;
color: $e_color;
}
}
@@ -1181,8 +1181,8 @@ headerbar {
&, &.flat {
@include button(undecorated);
- color: $selected_fg_color;
- background-color: transparentize($selected_fg_color, 1);
+ color: $selection_mode_fg;
+ background-color: transparentize($selection_mode_fg, 1);
}
&:hover { @extend %normal_selected_button; }
&:active, &:checked { @extend %selected-button:active; }
@@ -1241,10 +1241,10 @@ headerbar {
}
// 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);
@@ -1252,10 +1252,10 @@ headerbar {
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:disabled,
&:disabled { @include button(header-insensitive); }
diff --git a/common/gtk-3.0/3.20/sass/_drawing.scss b/common/gtk-3.0/3.20/sass/_drawing.scss
index 942e1fd..f5c3ca9 100644
--- a/common/gtk-3.0/3.20/sass/_drawing.scss
+++ b/common/gtk-3.0/3.20/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 {
//
@@ -263,10 +263,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 {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 10:36:12 +0000