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

Commit 2b141b0

Browse files
committed
Merge branch 'source' into v4: 4 new commits for GTK-4
2 parents 19bc796 + 235f873 commit 2b141b0

2 files changed

Lines changed: 37 additions & 12 deletions

File tree

src/Mint-X/theme/Mint-X/gtk-4.0/sass/_colors.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ $backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $back
5353
$backdrop_borders_color: mix($borders_color, $bg_color, 80%);
5454

5555
//special cased widget colors
56-
$suggested_bg_color: $suggested_color;
57-
$suggested_border_color: if($variant== 'light', darken($suggested_color, 15%), darken($suggested_color, 30%));
56+
$suggested_bg_color: $success_color;
57+
$suggested_border_color: if($variant== 'light', darken($success_color, 15%), darken($success_color, 30%));

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

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,8 +1578,8 @@ pathbar > button {
15781578
//
15791579
columnview.view,
15801580
treeview.view {
1581-
border-left-color: transparentize($fg_color, 0.85); // this is actually the tree lines color,
1582-
border-top-color: transparentize(black, 0.9); // while this is the grid lines color, better then nothing
1581+
border-left-color: transparentize($fg_color, 0.65); // this is actually the tree lines color,
1582+
border-top-color: transparentize($fg_color, 0.65); // while this is the grid lines color, better then nothing
15831583

15841584
> rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
15851585

@@ -2873,6 +2873,29 @@ calendar {
28732873
//
28742874
// Dialogs
28752875
//
2876+
.dialog-action-area {
2877+
margin: 6px;
2878+
2879+
button.text-button {
2880+
padding: 6px 16px;
2881+
}
2882+
2883+
button {
2884+
border-radius: 0;
2885+
border-right-style: none;
2886+
2887+
&:first-child {
2888+
border-radius: 3px 0 0 3px;
2889+
border-right-style: none;
2890+
}
2891+
2892+
&:last-child {
2893+
border-radius: 0 3px 3px 0;
2894+
border-style: solid;
2895+
}
2896+
}
2897+
}
2898+
28762899
window.dialog.message { // Message Dialog styling
28772900
.titlebar {
28782901
min-height: 20px;
@@ -2904,12 +2927,14 @@ window.dialog.message { // Message Dialog styling
29042927

29052928
// .dialog-action-area { @include linking_rules(); }
29062929

2930+
// }
2931+
29072932
.dialog-action-area button {
29082933
border-radius: 0;
29092934
border-bottom-style: none;
29102935
border-right-style: none;
29112936

2912-
&:first-child{
2937+
&:first-child {
29132938
border-bottom-left-radius: 2px;
29142939
border-left-style: none;
29152940
}
@@ -3465,17 +3490,17 @@ window {
34653490
}
34663491
}
34673492

3468-
.fullscreen &,
3469-
.maximized & {
3493+
&.fullscreen,
3494+
&.maximized {
34703495
border-radius: 0;
34713496
box-shadow: none;
34723497
}
34733498

3474-
.tiled &,
3475-
.tiled-top &,
3476-
.tiled-right &,
3477-
.tiled-bottom &,
3478-
.tiled-left & {
3499+
&.tiled,
3500+
&.tiled-top,
3501+
&.tiled-right,
3502+
&.tiled-bottom,
3503+
&.tiled-left {
34793504
border-radius: 0;
34803505
box-shadow: 0 0 0 1px $_wm_border,
34813506
0 0 0 20px transparent; //transparent control workaround -- #3670

0 commit comments

Comments
 (0)