Skip to content
This repository was archived by the owner on Jul 9, 2024. It is now read-only.

Commit 13edc18

Browse files
SebastJavaSebastJava
committed
modified: src/Mint-Y/gtk-4.0/sass/ _common.scss _drawing.scss
1 parent 2b141b0 commit 13edc18

2 files changed

Lines changed: 46 additions & 34 deletions

File tree

‎src/Mint-Y/gtk-4.0/sass/_common.scss‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ image:disabled {
3737
&:selected {
3838
&, &:focus {
3939
@extend %selected_items;
40-
border-radius: 2px;
40+
border-radius: 4px;
4141
}
4242
}
4343
}
@@ -260,10 +260,10 @@ entry {
260260
padding: 5px 8px;
261261

262262
caret-color: currentColor;
263-
border-radius: 3px;
263+
border-radius: 5px;
264264
transition: all 200ms $ease-out-quad;
265265

266-
&.search { border-radius: 4px; }
266+
&.search { border-radius: 5px; }
267267

268268
@include entry(normal);
269269

@@ -419,8 +419,10 @@ button {
419419
min-width: 20px;
420420
transition: $button_transition;
421421
border: 1px solid;
422-
border-radius: 3px;
422+
border-radius: 5px;
423423
padding: 5px 8px;
424+
outline-color: $button_active_bg; // Mint-Yz
425+
outline-style: solid; // Mint-Yz
424426

425427
@include button(normal);
426428

@@ -719,7 +721,7 @@ button {
719721
}
720722

721723
%linked_only_child {
722-
border-radius: 3px;
724+
border-radius: 5px;
723725
border-style: solid;
724726
}
725727

@@ -748,7 +750,7 @@ button {
748750
}
749751

750752
%linked_vertical_only_child {
751-
border-radius: 3px;
753+
border-radius: 5px;
752754
border-style: solid;
753755
}
754756

@@ -773,7 +775,7 @@ modelbutton.flat {
773775
min-height: 24px;
774776
padding-left: 8px;
775777
padding-right: 8px;
776-
border-radius: 2px;
778+
border-radius: 5px;
777779

778780
@extend %undecorated_button;
779781

@@ -890,7 +892,7 @@ spinbutton {
890892
button, text { @extend %linked; }
891893

892894
&:dir(ltr) text,
893-
&:dir(rtl) button.up { border-radius: 3px 0 0 3px; }
895+
&:dir(rtl) button.up { border-radius: 5px 0 0 5px; }
894896

895897
> button + button { border-left-style: none; }
896898

@@ -930,7 +932,7 @@ spinbutton {
930932
@extend %linked_vertical;
931933
}
932934

933-
button.up { border-radius: 3px 3px 0 0; }
935+
button.up { border-radius: 5px 5px 0 0; }
934936

935937
> text:focus + button { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
936938

@@ -1043,7 +1045,7 @@ combobox {
10431045
&.osd {
10441046
padding: 7px;
10451047
border: 1px solid transparentize(black, 0.5);
1046-
border-radius: 3px;
1048+
border-radius: 5px;
10471049
background-color: transparentize($osd_bg_color, 0.1);
10481050

10491051
&.left,
@@ -1072,7 +1074,7 @@ searchbar > revealer > box {
10721074
//
10731075

10741076
windowcontrols {
1075-
$_wm_backdrop_icon_color: if($variant == 'light', darken($wm_icon_unfocused_bg, 5%), lighten($wm_icon_unfocused_bg, 5%));
1077+
$_wm_backdrop_icon_color: $wm_icon_unfocused_bg;
10761078

10771079
border-spacing: 6px;
10781080

@@ -1357,7 +1359,7 @@ window.devel {
13571359
// Reset buttons
13581360
.linked:not(.vertical):not(.path-bar) > button {
13591361
&, &:hover, &:active, &:checked, &:disabled {
1360-
border-radius: 3px;
1362+
border-radius: 5px;
13611363
border-style: solid;
13621364
}
13631365
}
@@ -1842,7 +1844,7 @@ popover.menu {
18421844
min-height: 16px;
18431845
min-width: 40px;
18441846
padding: 5px $_menu-padding;
1845-
border-radius: 2px;
1847+
border-radius: 5px;
18461848
}
18471849

18481850
label.title {
@@ -2819,7 +2821,7 @@ expander-widget {
28192821
calendar {
28202822
color: $fg_color;
28212823
border: 1px solid $borders_color;
2822-
border-radius: 3px;
2824+
border-radius: 5px;
28232825
padding: 2px;
28242826

28252827
> header {
@@ -2885,12 +2887,12 @@ calendar {
28852887
border-right-style: none;
28862888

28872889
&:first-child {
2888-
border-radius: 3px 0 0 3px;
2890+
border-radius: 5px 0 0 5px;
28892891
border-right-style: none;
28902892
}
28912893

28922894
&:last-child {
2893-
border-radius: 0 3px 3px 0;
2895+
border-radius: 0 5px 5px 0;
28942896
border-style: solid;
28952897
}
28962898
}
@@ -3469,7 +3471,7 @@ window {
34693471

34703472
// this is used for the resize cursor area
34713473
margin: 0;
3472-
border-radius: 8px 8px 0 0;
3474+
border-radius: 0;
34733475

34743476
&:backdrop {
34753477
// the transparent shadow here is to enforce that the shadow extents don't
@@ -3480,13 +3482,13 @@ window {
34803482
}
34813483

34823484
&.popup {
3483-
border-radius: 8px;
3485+
border-radius: 0;
34843486
box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
34853487
0 0 0 1px $_wm_border;
34863488
}
34873489

34883490
&.dialog.message {
3489-
border-radius: 8px 8px 0 0;
3491+
border-radius: 0;
34903492
}
34913493
}
34923494

‎src/Mint-Y/gtk-4.0/sass/_drawing.scss‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
@mixin focus-ring($target: null, $outer: false, $focus-state: 'focus:focus-visible') {
2828
& #{$target} {
2929
outline-color: gtkalpha(currentColor, 0.3);
30-
outline-style: dashed;
30+
outline-style: none;
3131
outline-offset: if($outer, 0, -3px);
3232
}
3333

@@ -156,6 +156,7 @@
156156
// normal button
157157
//
158158
color: $fg_color;
159+
outline-color: $button_active_bg;
159160
border-color: $button_border;
160161
background-color: $button_bg;
161162
}
@@ -165,15 +166,17 @@
165166
// hovered button
166167
//
167168
color: $fg_color;
169+
outline-color: $button_active_bg;
168170
border-color: $button_border;
169-
background-color: lighten($button_bg, 5%);
171+
background-color: if($variant=='light', darken($button_bg, 5%), lighten($button_bg, 5%));
170172
}
171173

172174
@else if $t==active {
173175
//
174176
// pushed button
175177
//
176-
color: $fg_color;
178+
color: $selected_fg_color;
179+
outline-color: $selected_fg_color;
177180
border-color: $button_active_border;
178181
background-color: $button_active_bg;
179182
}
@@ -193,9 +196,9 @@
193196
//
194197
// insensitive pushed button
195198
//
196-
color: transparentize($fg_color, 0.2);
197-
border-color: transparentize($button_active_border, 0.15);
198-
background-color: transparentize($button_active_bg, 0.05);
199+
color: transparentize($selected_fg_color, 0.2);
200+
border-color: transparentize($button_active_border, 0.25);
201+
background-color: transparentize($button_active_bg, 0.25);
199202

200203
opacity: 0.6;
201204

@@ -207,6 +210,7 @@
207210
// normal header-bar button
208211
//
209212
color: $header_fg;
213+
outline-color: $button_active_bg;
210214
background-color: transparentize($header_bg, 1);
211215
border-color: transparentize($header_bg, 1);
212216
}
@@ -216,6 +220,7 @@
216220
// hovered header-bar button
217221
//
218222
color: $header_fg;
223+
outline-color: $button_active_bg;
219224
border-color: $header_button_border;
220225
background-color: $header_button_bg;
221226
}
@@ -224,8 +229,9 @@
224229
//
225230
// pushed header-bar button
226231
//
227-
color: $header_fg;
228-
border-color: if($variant=='light', $header_button_border, $header_button_border);
232+
color: $selected_fg_color;
233+
outline-color: $selected_fg_color;
234+
border-color: $button_active_border;
229235
background-color: $button_active_bg;
230236
}
231237

@@ -244,25 +250,27 @@
244250
//
245251
// header-bar insensitive pushed button
246252
//
247-
color: transparentize($fg_color, 0.2);
248-
border-color: transparentize($button_active_border, 0.15);
249-
background-color: transparentize($button_active_bg, 0.05);
253+
color: transparentize($selected_fg_color, 0.25);
254+
border-color: transparentize($button_active_border, 0.35);
255+
background-color: transparentize($button_active_bg, 0.35);
250256
}
251257

252258
@else if $t==osd {
253259
//
254260
// normal osd button
255261
//
256262
color: $osd_fg_color;
263+
outline-color: $button_active_bg;
257264
border-color: $osd_button_border;
258265
background-color: $osd_button_bg;
259266
}
260267

261268
@else if $t==osd-hover {
262269
//
263-
// active osd button
270+
// hover osd button
264271
//
265272
color: $osd_fg_color;
273+
outline-color: $button_active_bg;
266274
border-color: $osd_button_border;
267275
background-color: opacify(lighten($osd_button_bg, 7%), 0.1);
268276
}
@@ -271,9 +279,10 @@
271279
//
272280
// active osd button
273281
//
274-
color: $osd_fg_color;
275-
border-color: $osd_button_border;
276-
background-color: transparentize(black, 0.85);
282+
color: $selected_fg_color;
283+
outline-color: $selected_fg_color;
284+
border-color: $button_active_border;
285+
background-color: $button_active_bg;
277286
}
278287

279288
@else if $t==osd-insensitive {
@@ -292,6 +301,7 @@
292301
background-clip: border-box;
293302

294303
color: $selected_fg_color;
304+
outline-color: $selected_fg_color;
295305
background-color: $actionb_color;
296306
border-color: $actionb_color;
297307
}

0 commit comments

Comments
 (0)