Skip to content

Commit 3da1600

Browse files
committed
Gtk3: Adjusted selected backdrop fg/bg colors: shades of grey.
Before: "blue on grey" was unreadable. Issue: #300 Deleted several specific styles in favor of one general style.
1 parent fcbcb0e commit 3da1600

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

light/gtk-3.0/_colors.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ $backdrop_text_color: mix($text_color, $backdrop_base_color, 80%);
6060
$backdrop_bg_color: $bg_color;
6161
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
6262
$backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
63-
$backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color);
63+
$backdrop_selected_fg_color: if($variant == 'light', darken($base_color, 50%), $backdrop_text_color);
64+
$backdrop_selected_bg_color: if($variant == 'light', darken($base_color, 17%), lighten($bg_color, 17%));
6465
$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
6566
$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
6667
$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);

light/gtk-3.0/_common.scss

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ $button_radius: 3px;
4141
-gtk-secondary-caret-color: $selected_bg_color
4242
}
4343

44+
selection { @extend %selected_items; }
4445

4546
/***************
4647
* Base States *
@@ -114,9 +115,8 @@ treeview.expander:disabled { -gtk-icon-effect: dim; }
114115
}
115116

116117
&:selected {
118+
@extend %selected_items;
117119
&:focus, & {
118-
@extend %selected_items;
119-
120120
border-radius: 3px;
121121
}
122122
}
@@ -126,8 +126,6 @@ treeview.expander:disabled { -gtk-icon-effect: dim; }
126126
textview {
127127
text {
128128
@extend %view;
129-
130-
selection { &:focus, & { @extend %selected_items; }}
131129
}
132130
}
133131

@@ -181,11 +179,6 @@ label {
181179
row:selected &,
182180
&:selected { @extend %nobg_selected_items; }
183181

184-
selection {
185-
background-color: $selected_bg_color;
186-
color: $selected_fg_color;
187-
}
188-
189182
&:disabled {
190183
color: $insensitive_fg_color;
191184

@@ -199,10 +192,6 @@ label {
199192

200193
selection { @extend %selected_items:disabled; }
201194
}
202-
203-
&:backdrop {
204-
selection { @extend %selected_items:backdrop; }
205-
}
206195
}
207196

208197
.dim-label {
@@ -317,8 +306,6 @@ entry {
317306

318307
&:backdrop:disabled { @include entry(backdrop-insensitive); }
319308

320-
selection { @extend %selected_items; }
321-
322309
// entry error and warning style
323310
@each $e_type, $e_color in (error, $error_color),
324311
(warning, $warning_color) {
@@ -1824,8 +1811,6 @@ treeview.view {
18241811
&:selected {
18251812
&:focus, & {
18261813
border-radius: 0;
1827-
1828-
@extend %selected_items;
18291814
}
18301815

18311816
&:backdrop, & {
@@ -4506,7 +4491,17 @@ headerbar.selection-mode button.titlebutton,
45064491
// catch all extend :)
45074492

45084493
%selected_items {
4509-
background-color: $selected_bg_color;
4494+
4495+
// don't differentiate between focussed and unfocussed widgets.
4496+
&:focus, &{
4497+
color: $selected_fg_color;
4498+
background-color: $selected_bg_color;
4499+
}
4500+
4501+
&:backdrop {
4502+
color: $backdrop_selected_fg_color;
4503+
background-color: $backdrop_selected_bg_color;
4504+
}
45104505

45114506
@at-root %nobg_selected_items, & {
45124507
color: $selected_fg_color;
@@ -4517,6 +4512,7 @@ headerbar.selection-mode button.titlebutton,
45174512

45184513
&:backdrop {
45194514
color: $backdrop_selected_fg_color;
4515+
background-color: $backdrop_selected_bg_color;
45204516

45214517
&:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
45224518
}

0 commit comments

Comments
 (0)