Skip to content

Commit 7a9a6e8

Browse files
committed
Some tweaks
1 parent e1de66a commit 7a9a6e8

File tree

7 files changed

+25
-21
lines changed

7 files changed

+25
-21
lines changed

src/sass/_colors.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ $top_hilight: $borders_edge;
133133
$alt_borders_color: if($variant == 'light', gtkmix(black, $window_bg_color, 24%), gtkmix(black, $window_bg_color, 18%));
134134
$suggested_bg_color: $accent_bg_color;
135135
$suggested_border_color: $selected_borders_color;
136+
$drop_target_color: $accent_bg_color;
136137

137138
// XFCE
138139
$panel_bg_color: gtkcolor(panel_bg_color);

src/sass/widgets/_buttons.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ button {
7474
@include button(active);
7575

7676
transition: $button_transition;
77+
@include focus-ring($transition: $button_transition);
7778
}
7879

7980
&:backdrop {
@@ -116,9 +117,9 @@ button {
116117

117118
@at-root %button_basic_drop_active,
118119
&:drop(active) {
119-
color: $accent_bg_color;
120-
border-color: $accent_bg_color;
121-
box-shadow: inset 0 0 0 1px $accent_bg_color;
120+
color: $drop_target_color;
121+
border-color: $drop_target_color;
122+
box-shadow: inset 0 0 0 1px $drop_target_color;
122123
}
123124
}
124125

src/sass/widgets/_color-chooser.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ colorswatch {
77

88
&:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state
99

10-
$_colorswatch_radius: 5px;
10+
$_colorswatch_radius: $button_radius;
1111

1212
// base color corners rounding
1313
// to avoid the artifacts caused by rounded corner anti-aliasing the base color
@@ -80,15 +80,15 @@ colorswatch {
8080
box-shadow: none;
8181

8282
&.light overlay {
83-
border-color: $accent_bg_color;
84-
box-shadow: inset 0 0 0 2px if($variant == 'light', gtkshade($accent_bg_color, 0.93), $borders_color),
85-
inset 0 0 0 1px $accent_bg_color;
83+
border-color: $drop_target_color;
84+
box-shadow: inset 0 0 0 2px if($variant == 'light', gtkshade($drop_target_color, 0.93), $borders_color),
85+
inset 0 0 0 1px $drop_target_color;
8686
}
8787

8888
&.dark overlay {
89-
border-color: $accent_bg_color;
89+
border-color: $drop_target_color;
9090
box-shadow: inset 0 0 0 2px if($variant == 'light', transparentize(black, 0.7), $borders_color),
91-
inset 0 0 0 1px $accent_bg_color;
91+
inset 0 0 0 1px $drop_target_color;
9292
}
9393
}
9494

src/sass/widgets/_entries.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ entry {
5353

5454
&:drop(active) {
5555
&:focus, & {
56-
border-color: $accent_bg_color;
57-
box-shadow: inset 0 0 0 1px $accent_bg_color;
56+
border-color: $drop_target_color;
57+
box-shadow: inset 0 0 0 1px $drop_target_color;
5858
}
5959
}
6060

@@ -89,7 +89,7 @@ entry {
8989

9090
.linked:not(.vertical) > &:drop(active) + &,
9191
.linked:not(.vertical) > &:drop(active) + button,
92-
.linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $accent_bg_color; }
92+
.linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; }
9393

9494
// Vertically linked entries
9595
// FIXME: take care of "colored" entries
@@ -117,7 +117,7 @@ entry {
117117
+ entry:focus.error:not(:only-child) { border-top-color: entry_focus_border($error_bg_color); }
118118

119119
+ %entry:drop(active):not(:only-child),
120-
+ entry:drop(active):not(:only-child) { border-top-color: $accent_bg_color; }
120+
+ entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; }
121121

122122
// this takes care of coloring the top border of the focused entry subsequent widget.
123123
// :not(:only-child) is a specificity bump hack.
@@ -139,7 +139,7 @@ entry {
139139
+ %entry,
140140
+ entry,
141141
+ button,
142-
+ combobox > box > button.combo { border-top-color: $accent_bg_color; }
142+
+ combobox > box > button.combo { border-top-color: $drop_target_color; }
143143
}
144144
}
145145

src/sass/widgets/_file-chooser.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ placessidebar {
6363
&.sidebar-placeholder-row {
6464
padding: 0 8px;
6565
min-height: 2px;
66-
background-image: image($accent_bg_color);
66+
background-image: image($drop_target_color);
6767
background-clip: content-box;
6868
}
6969

7070
&.sidebar-new-bookmark-row { color: $accent_bg_color; }
7171

7272
&:drop(active):not(:disabled) {
7373
color: $accent_bg_color;
74-
box-shadow: inset 0 1px $accent_bg_color,
75-
inset 0 -1px $accent_bg_color;
74+
box-shadow: inset 0 1px $drop_target_color,
75+
inset 0 -1px $drop_target_color;
7676

7777
&:selected {
7878
color: $accent_fg_color;
79-
background-color: $accent_bg_color;
79+
background-color: $drop_target_color;
8080
}
8181
}
8282
}

src/sass/widgets/_links.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ button:visited {
5050
text-shadow: none;
5151
}
5252

53+
@include focus-ring($transition: $button_transition);
54+
5355
> label {
5456
@extend %link;
5557

src/sass/widgets/_misc.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ cursor-handle {
106106

107107
:not(decoration):not(window):drop(active):focus,
108108
:not(decoration):not(window):drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die
109-
border-color: $accent_bg_color;
110-
box-shadow: inset 0 0 0 1px $accent_bg_color;
111-
caret-color: $accent_bg_color;
109+
border-color: $drop_target_color;
110+
box-shadow: inset 0 0 0 1px $drop_target_color;
111+
caret-color: $drop_target_color;
112112
}
113113

114114
stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons

0 commit comments

Comments
 (0)