From 2999aa05508863baeee3862549e98196309eea02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 12:51:43 -0800 Subject: [PATCH 01/25] Lists: support .boxed-list from Adw --- src/gtk-4.0/widgets/_lists.scss | 85 ++++----------------------------- 1 file changed, 10 insertions(+), 75 deletions(-) diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index a6a644a1..7b0929ef 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -49,82 +49,17 @@ listview { border-top: 1px solid #{'@menu_separator'}; } - // Hdy.List - &.content { - &, - list { - background-color: transparent; - } + &.boxed-list { + @extend .card .rounded; - // Nested rows background - list.nested > row:not(:active) { - &:not(:hover):not(:selected), - &:hover:not(.activatable):not(:selected) { - background-color: mix(bg-color(1), bg-color(2), $weight: 50%); - } - } - - > row { - // Regular rows and expander header rows background - &:not(.expander):not(:active):not(:hover):not(:selected), - &:not(.expander):not(:active):hover:not(.activatable):not(:selected), - &.expander row.header:not(:active):not(:hover):not(:selected), - &.expander row.header:not(:active):hover:not(.activatable):not(:selected) { - background-color: bg-color(1); - } - - &:not(.expander):not(:active):hover.activatable:not(:selected), - &.expander row.header:not(:active):hover.activatable:not(:selected) { - background-color: mix(bg-color(1), bg-color(2), $weight: 50%); - } - - &, - list > row { - border-color: $border-color; - border-style: solid; - transition: duration("open") $easing; - } - - // Top border - &:not(:last-child) { - border-width: 1px 1px 0 1px; - } - - // Rounded top - &:first-child, - &.expander:first-child row.header, - &.expander:checked, - &.expander:checked row.header, - &.expander:checked + row, - &.expander:checked + row.expander row.header { - border-top-right-radius: rem(3px); - border-top-left-radius: rem(3px); - } - - // Bottom border - &:last-child, - &.checked-expander-row-previous-sibling, - &.expander:checked { - border-width: 1px; - } - - // Rounded bottom - &:last-child, - &.checked-expander-row-previous-sibling, - &.expander:checked, - &.expander:not(:checked):last-child row.header, - &.expander:not(:checked).checked-expander-row-previous-sibling row.header, - &.expander.empty:checked row.header, - &.expander list.nested > row:last-child { - border-bottom-right-radius: rem(3px); - border-bottom-left-radius: rem(3px); - } - - // Add space around expanded rows - &.expander:checked:not(:first-child), - &.expander:checked + row { - margin-top: rem(12px); - } + & > row { + padding: rem(6px); + min-height: rem(32px); //Try to force homogeneous row height } } } + +// Adw.PreferencesGroup +preferencesgroup { + margin-bottom: rem(12px); +} From fdba751de1254190820f5b75ef3386f280982025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 12:53:11 -0800 Subject: [PATCH 02/25] don't be silly --- src/gtk-4.0/widgets/_lists.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index 7b0929ef..4143572d 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -50,7 +50,8 @@ listview { } &.boxed-list { - @extend .card .rounded; + @extend .card; + @extend .rounded; & > row { padding: rem(6px); From 85ec9e36d1c05fbf8310a1ba99cf7d324ac854d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 12:59:58 -0800 Subject: [PATCH 03/25] Borrow old prototype styles --- src/gtk-4.0/widgets/_lists.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index 4143572d..5685f2a6 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -50,8 +50,10 @@ listview { } &.boxed-list { - @extend .card; - @extend .rounded; + @extend .frame; + + border-radius: rem(6px); + box-shadow: 0 1px 3px rgba(black, 0.1); & > row { padding: rem(6px); From 221d4ec95d905a7151a5bd817904484a1fefd4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 13:08:26 -0800 Subject: [PATCH 04/25] Preferences window selectors --- src/gtk-4.0/widgets/_lists.scss | 6 +----- src/gtk-4.0/widgets/_windows.scss | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index 5685f2a6..df4da38f 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -51,6 +51,7 @@ listview { &.boxed-list { @extend .frame; + @extend .separators; border-radius: rem(6px); box-shadow: 0 1px 3px rgba(black, 0.1); @@ -61,8 +62,3 @@ listview { } } } - -// Adw.PreferencesGroup -preferencesgroup { - margin-bottom: rem(12px); -} diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index 80563dbd..ce280b94 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -126,3 +126,21 @@ window.aboutdialog { -gtk-icon-size: 128px; } } + +//Adw.PreferencesWindow +window.preferences { + @extend .dialog; + + headerbar + scrolledwindow undershoot.top { + background: + linear-gradient( + @borders, + alpha(black, 0.05) 1px, + alpha(black, 0.0) 0.444rem + ); + } + + preferencesgroup { + margin-bottom: rem(12px); + } +} From 83e0b84dd9996c6c671e0db4cd4eb3d7c3dda8d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 13:10:56 -0800 Subject: [PATCH 05/25] formatting issues --- src/gtk-4.0/widgets/_windows.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index ce280b94..3190b078 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -127,16 +127,16 @@ window.aboutdialog { } } -//Adw.PreferencesWindow +// Adw.PreferencesWindow window.preferences { @extend .dialog; headerbar + scrolledwindow undershoot.top { background: linear-gradient( - @borders, - alpha(black, 0.05) 1px, - alpha(black, 0.0) 0.444rem + $toplevel-border-color, + rgba(black, 0.05) 1px, + rgba(black, 0.0) 0.444rem ); } From da3ab11d5650d0f09308b3a56201c45512aac7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 13:19:51 -0800 Subject: [PATCH 06/25] more tweaks --- src/gtk-4.0/widgets/_lists.scss | 5 ++++- src/gtk-4.0/widgets/_windows.scss | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index df4da38f..cdbfe847 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -51,7 +51,6 @@ listview { &.boxed-list { @extend .frame; - @extend .separators; border-radius: rem(6px); box-shadow: 0 1px 3px rgba(black, 0.1); @@ -60,5 +59,9 @@ listview { padding: rem(6px); min-height: rem(32px); //Try to force homogeneous row height } + + & > row:not(.separator) + row:not(.separator) { + border-top: 1px solid #{'@menu_separator'}; + } } } diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index 3190b078..679f1534 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -131,7 +131,11 @@ window.aboutdialog { window.preferences { @extend .dialog; - headerbar + scrolledwindow undershoot.top { + headerbar { + @extend .flat; + } + + preferencespage > scrolledwindow undershoot.top { background: linear-gradient( $toplevel-border-color, From 97be872f40d5702b7b0793de86d32393484033bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 13:54:12 -0800 Subject: [PATCH 07/25] undershoot, padding, try flat again --- src/gtk-4.0/widgets/_lists.scss | 4 ++-- src/gtk-4.0/widgets/_windows.scss | 23 +++++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index cdbfe847..21b1fef8 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -55,12 +55,12 @@ listview { border-radius: rem(6px); box-shadow: 0 1px 3px rgba(black, 0.1); - & > row { + > row { padding: rem(6px); min-height: rem(32px); //Try to force homogeneous row height } - & > row:not(.separator) + row:not(.separator) { + > row:not(.separator) + row:not(.separator) { border-top: 1px solid #{'@menu_separator'}; } } diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index 679f1534..ea3e148f 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -128,20 +128,27 @@ window.aboutdialog { } // Adw.PreferencesWindow -window.preferences { +window.preferences.csd { @extend .dialog; headerbar { @extend .flat; } - preferencespage > scrolledwindow undershoot.top { - background: - linear-gradient( - $toplevel-border-color, - rgba(black, 0.05) 1px, - rgba(black, 0.0) 0.444rem - ); + preferencespage > scrolledwindow { + undershoot.top { + background: + linear-gradient( + $toplevel-border-color, + rgba(black, 0.05) 1px, + rgba(black, 0.0) 0.444rem + ); + } + + > viewport > clamp > box { + padding-left: rem(12px); + padding-right: rem(12px); + } } preferencesgroup { From b150c08bd3cb7873701af2578f0c270195b0f195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 14:21:14 -0800 Subject: [PATCH 08/25] View switcher stuff --- src/gtk-4.0/widgets/_windows.scss | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index ea3e148f..d8e1bed4 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -133,6 +133,15 @@ window.preferences.csd { headerbar { @extend .flat; + + viewswitcher button.toggle { + border-radius: rem(3px); + + image { + opacity: 0; + -gtk-icon-size: 0; + } + } } preferencespage > scrolledwindow { @@ -154,4 +163,28 @@ window.preferences.csd { preferencesgroup { margin-bottom: rem(12px); } + + viewswitcherbar { + box-shadow: + outset-highlight(), + // Intentionally not in ems since it's used as a stroke + 0 0 0 1px #{'alpha(shade(@color_primary, 0.7), 0.4)'}, + 0 rem(-1px) rem(2px) rgba(black, 0.2); + + @if $color-scheme == "dark" { + box-shadow: + outset-highlight(), + // Intentionally not in ems since it's used as a stroke + 0 0 0 1px #{'alpha(shade(@color_primary, 0.5), 0.5)'}, + 0 rem(-1px) rem(1px) rgba(black, 0.2); + } + + actionbar { + padding: rem(3px) rem(6px); + } + + button { + padding: rem(3px) rem(6px); + } + } } From c5d376928f89da5c7339dba234cd05d3c273acf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 14:36:41 -0800 Subject: [PATCH 09/25] Keep viewswitcher CSS separate --- src/gtk-4.0/widgets/_viewswitcher.scss | 67 +++++++++++++++----------- src/gtk-4.0/widgets/_windows.scss | 24 --------- 2 files changed, 40 insertions(+), 51 deletions(-) diff --git a/src/gtk-4.0/widgets/_viewswitcher.scss b/src/gtk-4.0/widgets/_viewswitcher.scss index 662c20d0..b4dce8fe 100644 --- a/src/gtk-4.0/widgets/_viewswitcher.scss +++ b/src/gtk-4.0/widgets/_viewswitcher.scss @@ -1,15 +1,8 @@ viewswitcher button { - margin: 0; - padding: 0; - border-radius: 0; - border-top: 0; - border-bottom: 0; - box-shadow: none; - image { -gtk-icon-palette: error #{'@text_color'}, success #{'@text_color'}, warning #{'@text_color'}; } - + &:not(:checked):not(:hover) { background: transparent; } @@ -67,28 +60,48 @@ viewswitcher button { padding: 0 9px; } } +} - headerbar & { - &:not(:checked):hover:not(:backdrop) { - background-image: linear-gradient( - to top, - #{'shade(alpha(@color_primary, 0.7), 0.96)'} rem(2px), - #{'alpha(@color_primary, 0.7)'} - ); - } +headerbar viewswitcher button.toggle { + border-radius: rem(3px); - &:not(:checked):not(only-child):first-child:hover, - &:not(:checked):hover + &:not(:checked):not(:hover), - &:not(:checked):not(:hover) + &:not(:checked):hover { - border-left-color: #{'@color_primary'}; - } + image { + opacity: 0; + -gtk-icon-size: 0; + } - &:not(:checked):not(only-child):last-child:hover { - border-right-color: #{'@color_primary'}; - } + &:not(:checked):hover:not(:backdrop) { + background-image: linear-gradient( + to top, + #{'shade(alpha(@color_primary, 0.7), 0.96)'} rem(2px), + #{'alpha(@color_primary, 0.7)'} + ); + } - &:not(:checked):hover:backdrop { - background-image: #{'image(@color_primary)'}; - } + &:not(:checked):not(only-child):first-child:hover, + &:not(:checked):hover + &:not(:checked):not(:hover), + &:not(:checked):not(:hover) + &:not(:checked):hover { + border-left-color: #{'@color_primary'}; + } + + &:not(:checked):not(only-child):last-child:hover { + border-right-color: #{'@color_primary'}; + } + + &:not(:checked):hover:backdrop { + background-image: #{'image(@color_primary)'}; + } +} + +viewswitcherbar actionbar viewswitcher { + border-top: 1px solid $toplevel-border-color; + padding: rem(3px) rem(6px); + + button { + margin: 0; + border-radius: 0; + border-top: 0; + border-bottom: 0; + box-shadow: none; } } diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index d8e1bed4..5704724b 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -163,28 +163,4 @@ window.preferences.csd { preferencesgroup { margin-bottom: rem(12px); } - - viewswitcherbar { - box-shadow: - outset-highlight(), - // Intentionally not in ems since it's used as a stroke - 0 0 0 1px #{'alpha(shade(@color_primary, 0.7), 0.4)'}, - 0 rem(-1px) rem(2px) rgba(black, 0.2); - - @if $color-scheme == "dark" { - box-shadow: - outset-highlight(), - // Intentionally not in ems since it's used as a stroke - 0 0 0 1px #{'alpha(shade(@color_primary, 0.5), 0.5)'}, - 0 rem(-1px) rem(1px) rgba(black, 0.2); - } - - actionbar { - padding: rem(3px) rem(6px); - } - - button { - padding: rem(3px) rem(6px); - } - } } From 2088ad6213a41ca9e6308dbd7e0268f7667e77f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 14:41:59 -0800 Subject: [PATCH 10/25] Contain some of the wilder CSS --- src/gtk-4.0/widgets/_viewswitcher.scss | 71 +++++++++++++------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/src/gtk-4.0/widgets/_viewswitcher.scss b/src/gtk-4.0/widgets/_viewswitcher.scss index b4dce8fe..a1ddd9c4 100644 --- a/src/gtk-4.0/widgets/_viewswitcher.scss +++ b/src/gtk-4.0/widgets/_viewswitcher.scss @@ -3,41 +3,6 @@ viewswitcher button { -gtk-icon-palette: error #{'@text_color'}, success #{'@text_color'}, warning #{'@text_color'}; } - &:not(:checked):not(:hover) { - background: transparent; - } - - &:not(:only-child):not(:last-child) { - border-right-width: 0; - } - - &:not(only-child):first-child:not(:checked):not(:hover), - &:not(:checked):not(:hover) + &:not(:checked):not(:hover) { - border-left-color: transparent; - } - - &:not(only-child):last-child:not(:checked):not(:hover) { - border-right-color: transparent; - } - - &:not(:checked):hover:not(:backdrop) { - background-image: #{'image(lighter(@color_primary))'}; - } - - &:not(only-child):first-child:not(:checked):hover, - &:not(:checked):hover + &:not(:checked):not(:hover), - &:not(:checked):not(:hover) + &:not(:checked):hover { - border-left-color: #{'shade(@color_primary, 1.15)'}; - } - - &:not(only-child):last-child:not(:checked):hover { - border-right-color: #{'shade(@color_primary, 1.15)'}; - } - - &:not(:checked):hover:backdrop { - background-image: #{'image(@color_primary)'}; - } - stack > box { & label.active { @@ -95,7 +60,6 @@ headerbar viewswitcher button.toggle { viewswitcherbar actionbar viewswitcher { border-top: 1px solid $toplevel-border-color; - padding: rem(3px) rem(6px); button { margin: 0; @@ -103,5 +67,40 @@ viewswitcherbar actionbar viewswitcher { border-top: 0; border-bottom: 0; box-shadow: none; + + &:not(:checked):not(:hover) { + background: transparent; + } + + &:not(:only-child):not(:last-child) { + border-right-width: 0; + } + + &:not(only-child):first-child:not(:checked):not(:hover), + &:not(:checked):not(:hover) + &:not(:checked):not(:hover) { + border-left-color: transparent; + } + + &:not(only-child):last-child:not(:checked):not(:hover) { + border-right-color: transparent; + } + + &:not(:checked):hover:not(:backdrop) { + background-image: #{'image(lighter(@color_primary))'}; + } + + &:not(only-child):first-child:not(:checked):hover, + &:not(:checked):hover + &:not(:checked):not(:hover), + &:not(:checked):not(:hover) + &:not(:checked):hover { + border-left-color: #{'shade(@color_primary, 1.15)'}; + } + + &:not(only-child):last-child:not(:checked):hover { + border-right-color: #{'shade(@color_primary, 1.15)'}; + } + + &:not(:checked):hover:backdrop { + background-image: #{'image(@color_primary)'}; + } } } From dfcd297292aaa044c0158cb8ff3082ec8012c1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 14:51:09 -0800 Subject: [PATCH 11/25] More viewswitcher stuff --- src/gtk-4.0/widgets/_viewswitcher.scss | 57 ++++++++++++-------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/src/gtk-4.0/widgets/_viewswitcher.scss b/src/gtk-4.0/widgets/_viewswitcher.scss index a1ddd9c4..91fe2b63 100644 --- a/src/gtk-4.0/widgets/_viewswitcher.scss +++ b/src/gtk-4.0/widgets/_viewswitcher.scss @@ -1,11 +1,6 @@ viewswitcher button { - image { - -gtk-icon-palette: error #{'@text_color'}, success #{'@text_color'}, warning #{'@text_color'}; - } - stack > box { - - & label.active { + label.active { font-weight: bold; } @@ -27,41 +22,19 @@ viewswitcher button { } } -headerbar viewswitcher button.toggle { +headerbar viewswitcher button { border-radius: rem(3px); image { opacity: 0; -gtk-icon-size: 0; } - - &:not(:checked):hover:not(:backdrop) { - background-image: linear-gradient( - to top, - #{'shade(alpha(@color_primary, 0.7), 0.96)'} rem(2px), - #{'alpha(@color_primary, 0.7)'} - ); - } - - &:not(:checked):not(only-child):first-child:hover, - &:not(:checked):hover + &:not(:checked):not(:hover), - &:not(:checked):not(:hover) + &:not(:checked):hover { - border-left-color: #{'@color_primary'}; - } - - &:not(:checked):not(only-child):last-child:hover { - border-right-color: #{'@color_primary'}; - } - - &:not(:checked):hover:backdrop { - background-image: #{'image(@color_primary)'}; - } } -viewswitcherbar actionbar viewswitcher { +viewswitcherbar actionbar { border-top: 1px solid $toplevel-border-color; - button { + viewswitcher button { margin: 0; border-radius: 0; border-top: 0; @@ -99,8 +72,30 @@ viewswitcherbar actionbar viewswitcher { border-right-color: #{'shade(@color_primary, 1.15)'}; } + &:not(:checked):hover:not(:backdrop) { + background-image: linear-gradient( + to top, + #{'shade(alpha(@color_primary, 0.7), 0.96)'} rem(2px), + #{'alpha(@color_primary, 0.7)'} + ); + } + + &:not(:checked):not(only-child):first-child:hover, + &:not(:checked):hover + &:not(:checked):not(:hover), + &:not(:checked):not(:hover) + &:not(:checked):hover { + border-left-color: #{'@color_primary'}; + } + + &:not(:checked):not(only-child):last-child:hover { + border-right-color: #{'@color_primary'}; + } + &:not(:checked):hover:backdrop { background-image: #{'image(@color_primary)'}; } + + image { + -gtk-icon-palette: error #{'@text_color'}, success #{'@text_color'}, warning #{'@text_color'}; + } } } From d6085e8646a1db0ed22c9f7c2e19fda95ff62311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 14:58:11 -0800 Subject: [PATCH 12/25] More viewswitcher --- src/gtk-4.0/widgets/_viewswitcher.scss | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/gtk-4.0/widgets/_viewswitcher.scss b/src/gtk-4.0/widgets/_viewswitcher.scss index 91fe2b63..379a8261 100644 --- a/src/gtk-4.0/widgets/_viewswitcher.scss +++ b/src/gtk-4.0/widgets/_viewswitcher.scss @@ -31,7 +31,7 @@ headerbar viewswitcher button { } } -viewswitcherbar actionbar { +viewswitcherbar revealer > box { border-top: 1px solid $toplevel-border-color; viewswitcher button { @@ -72,14 +72,6 @@ viewswitcherbar actionbar { border-right-color: #{'shade(@color_primary, 1.15)'}; } - &:not(:checked):hover:not(:backdrop) { - background-image: linear-gradient( - to top, - #{'shade(alpha(@color_primary, 0.7), 0.96)'} rem(2px), - #{'alpha(@color_primary, 0.7)'} - ); - } - &:not(:checked):not(only-child):first-child:hover, &:not(:checked):hover + &:not(:checked):not(:hover), &:not(:checked):not(:hover) + &:not(:checked):hover { From e59b2cd7df95900690627e2309e4a827babffaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 7 Mar 2023 15:06:46 -0800 Subject: [PATCH 13/25] Fix subtitle --- src/gtk-4.0/_typography.scss | 5 +++++ src/gtk-4.0/widgets/_viewswitcher.scss | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/gtk-4.0/_typography.scss b/src/gtk-4.0/_typography.scss index 6726ad99..e0e6c8a3 100644 --- a/src/gtk-4.0/_typography.scss +++ b/src/gtk-4.0/_typography.scss @@ -155,3 +155,8 @@ label:disabled { .monospace { font-family: monospace; } + +.subtitle { + @extend .small-label; + @extend .dim-label; +} diff --git a/src/gtk-4.0/widgets/_viewswitcher.scss b/src/gtk-4.0/widgets/_viewswitcher.scss index 379a8261..8f308c34 100644 --- a/src/gtk-4.0/widgets/_viewswitcher.scss +++ b/src/gtk-4.0/widgets/_viewswitcher.scss @@ -58,10 +58,6 @@ viewswitcherbar revealer > box { border-right-color: transparent; } - &:not(:checked):hover:not(:backdrop) { - background-image: #{'image(lighter(@color_primary))'}; - } - &:not(only-child):first-child:not(:checked):hover, &:not(:checked):hover + &:not(:checked):not(:hover), &:not(:checked):not(:hover) + &:not(:checked):hover { @@ -72,6 +68,14 @@ viewswitcherbar revealer > box { border-right-color: #{'shade(@color_primary, 1.15)'}; } + &:not(:checked):hover:not(:backdrop) { + background-image: linear-gradient( + to top, + #{'shade(alpha(@color_primary, 0.7), 0.96)'} rem(2px), + #{'alpha(@color_primary, 0.7)'} + ); + } + &:not(:checked):not(only-child):first-child:hover, &:not(:checked):hover + &:not(:checked):not(:hover), &:not(:checked):not(:hover) + &:not(:checked):hover { From 79a42853ec969c24ea3053b321916f169a0476f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 14:55:38 -0700 Subject: [PATCH 14/25] Move PreferencesWindow to its own file --- .../widgets/Adwaita/PreferencesWindow.scss | 36 ++++++++++++++++++ src/gtk-4.0/widgets/Adwaita/_index.scss | 1 + src/gtk-4.0/widgets/_index.scss | 1 + src/gtk-4.0/widgets/_windows.scss | 38 ------------------- 4 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss create mode 100644 src/gtk-4.0/widgets/Adwaita/_index.scss diff --git a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss new file mode 100644 index 00000000..3921d06b --- /dev/null +++ b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss @@ -0,0 +1,36 @@ +window.preferences.csd { + @extend .dialog; + + headerbar { + @extend .flat; + + viewswitcher button.toggle { + border-radius: rem(3px); + + image { + opacity: 0; + -gtk-icon-size: 0; + } + } + } + + preferencespage > scrolledwindow { + undershoot.top { + background: + linear-gradient( + $toplevel-border-color, + rgba(black, 0.05) 1px, + rgba(black, 0.0) 0.444rem + ); + } + + > viewport > clamp > box { + padding-left: rem(12px); + padding-right: rem(12px); + } + } + + preferencesgroup { + margin-bottom: rem(12px); + } +} diff --git a/src/gtk-4.0/widgets/Adwaita/_index.scss b/src/gtk-4.0/widgets/Adwaita/_index.scss new file mode 100644 index 00000000..cd6d31d5 --- /dev/null +++ b/src/gtk-4.0/widgets/Adwaita/_index.scss @@ -0,0 +1 @@ +@import 'PreferencesWindow.scss'; diff --git a/src/gtk-4.0/widgets/_index.scss b/src/gtk-4.0/widgets/_index.scss index e73b99d6..4baa07cf 100644 --- a/src/gtk-4.0/widgets/_index.scss +++ b/src/gtk-4.0/widgets/_index.scss @@ -95,3 +95,4 @@ selection { @import '_viewswitcher.scss'; @import '_windowcontrols.scss'; @import '_windows.scss'; +@import 'Adwaita/_index.scss'; diff --git a/src/gtk-4.0/widgets/_windows.scss b/src/gtk-4.0/widgets/_windows.scss index 5704724b..80563dbd 100644 --- a/src/gtk-4.0/widgets/_windows.scss +++ b/src/gtk-4.0/widgets/_windows.scss @@ -126,41 +126,3 @@ window.aboutdialog { -gtk-icon-size: 128px; } } - -// Adw.PreferencesWindow -window.preferences.csd { - @extend .dialog; - - headerbar { - @extend .flat; - - viewswitcher button.toggle { - border-radius: rem(3px); - - image { - opacity: 0; - -gtk-icon-size: 0; - } - } - } - - preferencespage > scrolledwindow { - undershoot.top { - background: - linear-gradient( - $toplevel-border-color, - rgba(black, 0.05) 1px, - rgba(black, 0.0) 0.444rem - ); - } - - > viewport > clamp > box { - padding-left: rem(12px); - padding-right: rem(12px); - } - } - - preferencesgroup { - margin-bottom: rem(12px); - } -} From d44781032d30fa97419c09d4236d94841f54f3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 15:29:12 -0700 Subject: [PATCH 15/25] Add adw folder --- src/gtk-4.0/widgets/Adwaita/List.scss | 47 +++++++++++++++++++ .../widgets/Adwaita/PreferencesWindow.scss | 20 ++++++++ src/gtk-4.0/widgets/Adwaita/_index.scss | 1 + src/gtk-4.0/widgets/_lists.scss | 16 ------- 4 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 src/gtk-4.0/widgets/Adwaita/List.scss diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/Adwaita/List.scss new file mode 100644 index 00000000..0c898d45 --- /dev/null +++ b/src/gtk-4.0/widgets/Adwaita/List.scss @@ -0,0 +1,47 @@ +list.boxed-list { + @extend .frame; + + border-radius: rem(6px); + box-shadow: 0 1px 3px rgba(black, 0.1); + + > row { + padding: rem(6px); + min-height: rem(32px); //Try to force homogeneous row height + } + + > row:not(.separator) + row:not(.separator) { + border-top: 1px solid #{'@menu_separator'}; + } + + row { + > .icon, + > .prefixes { + &:dir(ltr) { margin-right: rem(6px); } + &:dir(rtl) { margin-left: rem(6px); } + } + } + + row.expander { + image.expander-row-arrow { + transition: all duration("in-place") $easing; + + &:dir(ltr) { + -gtk-icon-transform: rotate(0.25turn); + } + + &:dir(rtl) { + -gtk-icon-transform: rotate(-0.25turn); + } + } + + &:checked image.expander-row-arrow { + &:dir(ltr) { + -gtk-icon-transform: rotate(0.5turn); + } + + &:dir(rtl) { + -gtk-icon-transform: rotate(-0.5turn); + } + } + } +} diff --git a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss index 3921d06b..04c6a56f 100644 --- a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss +++ b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss @@ -34,3 +34,23 @@ window.preferences.csd { margin-bottom: rem(12px); } } + + +// preferencespage > scrolledwindow > viewport > clamp > box { +// margin: 24px 12px; +// border-spacing: 24px; +// } + +// preferencesgroup > box { +// &, .labels { +// border-spacing: 6px; +// } + +// > box.header:not(.single-line) { +// margin-bottom: 6px; +// } + +// > box.single-line { +// min-height: 34px; +// } +// } diff --git a/src/gtk-4.0/widgets/Adwaita/_index.scss b/src/gtk-4.0/widgets/Adwaita/_index.scss index cd6d31d5..e5bc9fd4 100644 --- a/src/gtk-4.0/widgets/Adwaita/_index.scss +++ b/src/gtk-4.0/widgets/Adwaita/_index.scss @@ -1 +1,2 @@ +@import 'List.scss'; @import 'PreferencesWindow.scss'; diff --git a/src/gtk-4.0/widgets/_lists.scss b/src/gtk-4.0/widgets/_lists.scss index 21b1fef8..fb8b806f 100644 --- a/src/gtk-4.0/widgets/_lists.scss +++ b/src/gtk-4.0/widgets/_lists.scss @@ -48,20 +48,4 @@ listview { &.separators:not(.horizontal) > row:not(.separator) + row:not(.separator) { border-top: 1px solid #{'@menu_separator'}; } - - &.boxed-list { - @extend .frame; - - border-radius: rem(6px); - box-shadow: 0 1px 3px rgba(black, 0.1); - - > row { - padding: rem(6px); - min-height: rem(32px); //Try to force homogeneous row height - } - - > row:not(.separator) + row:not(.separator) { - border-top: 1px solid #{'@menu_separator'}; - } - } } From c071e51e06d94ba9f3b94157cbec2a9c2018dcb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 15:37:49 -0700 Subject: [PATCH 16/25] Fix prefixes margin, style text --- src/gtk-4.0/widgets/Adwaita/List.scss | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/Adwaita/List.scss index 0c898d45..b5743d83 100644 --- a/src/gtk-4.0/widgets/Adwaita/List.scss +++ b/src/gtk-4.0/widgets/Adwaita/List.scss @@ -7,20 +7,22 @@ list.boxed-list { > row { padding: rem(6px); min-height: rem(32px); //Try to force homogeneous row height + + .icon, + .prefixes { + &:dir(ltr) { margin-right: rem(3px); } + &:dir(rtl) { margin-left: rem(3px); } + } + + text { + @extend entry; + } } > row:not(.separator) + row:not(.separator) { border-top: 1px solid #{'@menu_separator'}; } - row { - > .icon, - > .prefixes { - &:dir(ltr) { margin-right: rem(6px); } - &:dir(rtl) { margin-left: rem(6px); } - } - } - row.expander { image.expander-row-arrow { transition: all duration("in-place") $easing; From ad892a6b4e4a18cf15233755e8b85fb2271586d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 15:49:43 -0700 Subject: [PATCH 17/25] Rounded fix, padding to box not row --- src/gtk-4.0/widgets/Adwaita/List.scss | 31 +++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/Adwaita/List.scss index b5743d83..a3cac035 100644 --- a/src/gtk-4.0/widgets/Adwaita/List.scss +++ b/src/gtk-4.0/widgets/Adwaita/List.scss @@ -5,8 +5,26 @@ list.boxed-list { box-shadow: 0 1px 3px rgba(black, 0.1); > row { - padding: rem(6px); - min-height: rem(32px); //Try to force homogeneous row height + // Rounded top + &:first-child { + &, &.expander row.header { + border-top-left-radius: rem(6px); + border-top-right-radius: rem(6px); + } + } + + // Rounded bottom + &:last-child { + &, + &.expander:not(:checked), + &.expander:not(:checked) row.header, + &.expander:checked list.nested, + &.expander:checked list.nested > row:last-child { + border-bottom-left-radius: rem(6px); + border-bottom-right-radius: rem(6px); + border-bottom-width: 0; + } + } .icon, .prefixes { @@ -14,8 +32,9 @@ list.boxed-list { &:dir(rtl) { margin-left: rem(3px); } } - text { - @extend entry; + > box { + padding: rem(6px); + min-height: rem(32px); //Try to force homogeneous row height } } @@ -23,6 +42,10 @@ list.boxed-list { border-top: 1px solid #{'@menu_separator'}; } + row.entry { + + } + row.expander { image.expander-row-arrow { transition: all duration("in-place") $easing; From af454529ecb7ee829b756508f2143e1af0c57b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 15:56:09 -0700 Subject: [PATCH 18/25] only set padding and height on header box --- src/gtk-4.0/widgets/Adwaita/List.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/Adwaita/List.scss index a3cac035..3a8ffef4 100644 --- a/src/gtk-4.0/widgets/Adwaita/List.scss +++ b/src/gtk-4.0/widgets/Adwaita/List.scss @@ -32,7 +32,7 @@ list.boxed-list { &:dir(rtl) { margin-left: rem(3px); } } - > box { + > box.header { padding: rem(6px); min-height: rem(32px); //Try to force homogeneous row height } From 8ce148686315319a7186fc1dd0af2493e40c8d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 16:17:47 -0700 Subject: [PATCH 19/25] Fix a selector, actionbar --- src/gtk-4.0/widgets/Adwaita/List.scss | 12 +++++-- .../widgets/Adwaita/PreferencesWindow.scss | 31 +++++++------------ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/Adwaita/List.scss index 3a8ffef4..df70414f 100644 --- a/src/gtk-4.0/widgets/Adwaita/List.scss +++ b/src/gtk-4.0/widgets/Adwaita/List.scss @@ -32,8 +32,12 @@ list.boxed-list { &:dir(rtl) { margin-left: rem(3px); } } - > box.header { - padding: rem(6px); + .title + .subtitle { + margin-top: 0.25em; + } + + box.header { + padding: rem(6px) rem(9px); min-height: rem(32px); //Try to force homogeneous row height } } @@ -68,5 +72,9 @@ list.boxed-list { -gtk-icon-transform: rotate(-0.5turn); } } + + list { + background: transparent; + } } } diff --git a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss index 04c6a56f..1ee0c3ee 100644 --- a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss +++ b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss @@ -33,24 +33,17 @@ window.preferences.csd { preferencesgroup { margin-bottom: rem(12px); } -} - - -// preferencespage > scrolledwindow > viewport > clamp > box { -// margin: 24px 12px; -// border-spacing: 24px; -// } - -// preferencesgroup > box { -// &, .labels { -// border-spacing: 6px; -// } -// > box.header:not(.single-line) { -// margin-bottom: 6px; -// } + actionbar { + background: none; + box-shadow: none; + padding-top: rem(16px); + padding-right: rem(7px); + padding-left: rem(7px); + padding-bottom: rem(8px); -// > box.single-line { -// min-height: 34px; -// } -// } + button.text-button { + min-width: rem(60px); + } + } +} From 4a9213932a4f2db70411e8092596a6b72e339f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 17:22:54 -0700 Subject: [PATCH 20/25] bunch of other little fixes --- src/gtk-4.0/widgets/Adwaita/List.scss | 16 ++++++++++++++++ .../widgets/Adwaita/PreferencesWindow.scss | 19 ++++++++++--------- src/gtk-4.0/widgets/_popovers.scss | 5 +++++ 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/Adwaita/List.scss index df70414f..afd4c0a7 100644 --- a/src/gtk-4.0/widgets/Adwaita/List.scss +++ b/src/gtk-4.0/widgets/Adwaita/List.scss @@ -32,6 +32,11 @@ list.boxed-list { &:dir(rtl) { margin-left: rem(3px); } } + .prefixes, + .suffixes { + border-spacing: rem(6px); + } + .title + .subtitle { margin-top: 0.25em; } @@ -47,7 +52,18 @@ list.boxed-list { } row.entry { + .edit-icon, + .indicator { + min-width: rem(24px); + } + .edit-icon { + opacity: 0; + } + + &:hover:not(:focus-within) .edit-icon { + opacity: 1; + } } row.expander { diff --git a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss index 1ee0c3ee..af09005c 100644 --- a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss +++ b/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss @@ -31,18 +31,19 @@ window.preferences.csd { } preferencesgroup { - margin-bottom: rem(12px); + margin-bottom: 2rem; } - actionbar { - background: none; - box-shadow: none; - padding-top: rem(16px); - padding-right: rem(7px); - padding-left: rem(7px); - padding-bottom: rem(8px); + leaflet stack + actionbar { + background: #{'@theme_bg_color'}; + box-shadow: + outset-highlight(), + // Intentionally not in ems since it's used as a stroke + 0 0 0 1px #{'@menu_separator'}, + 0 rem(-1px) rem(3px) rgba(black, 0.1); + padding: rem(6px); - button.text-button { + button { min-width: rem(60px); } } diff --git a/src/gtk-4.0/widgets/_popovers.scss b/src/gtk-4.0/widgets/_popovers.scss index 9d068e48..cb79ea39 100644 --- a/src/gtk-4.0/widgets/_popovers.scss +++ b/src/gtk-4.0/widgets/_popovers.scss @@ -170,6 +170,10 @@ popover.background { shadow(3); } + listview { + background: none; + } + .menuitem { &:dir(ltr) { image:first-child { @@ -244,6 +248,7 @@ popover.background { } } + &.menu > contents listview row, modelbutton, .menuitem { @extend %menuitem; From 3cfe80fa57f0a3ff392103e7d67fc02e2fc1e493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 17:26:16 -0700 Subject: [PATCH 21/25] Move ViewSwitcher to adw folder --- .../widgets/{_viewswitcher.scss => Adwaita/ViewSwitcher.scss} | 0 src/gtk-4.0/widgets/Adwaita/_index.scss | 1 + 2 files changed, 1 insertion(+) rename src/gtk-4.0/widgets/{_viewswitcher.scss => Adwaita/ViewSwitcher.scss} (100%) diff --git a/src/gtk-4.0/widgets/_viewswitcher.scss b/src/gtk-4.0/widgets/Adwaita/ViewSwitcher.scss similarity index 100% rename from src/gtk-4.0/widgets/_viewswitcher.scss rename to src/gtk-4.0/widgets/Adwaita/ViewSwitcher.scss diff --git a/src/gtk-4.0/widgets/Adwaita/_index.scss b/src/gtk-4.0/widgets/Adwaita/_index.scss index e5bc9fd4..90523657 100644 --- a/src/gtk-4.0/widgets/Adwaita/_index.scss +++ b/src/gtk-4.0/widgets/Adwaita/_index.scss @@ -1,2 +1,3 @@ @import 'List.scss'; @import 'PreferencesWindow.scss'; +@import 'ViewSwitcher.scss'; From 1179b25703d6ba9c0a54222f6bab122027bae13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Tue, 21 Mar 2023 17:28:59 -0700 Subject: [PATCH 22/25] More moving --- src/gtk-4.0/widgets/_index.scss | 3 +-- src/gtk-4.0/widgets/{Adwaita => adw}/List.scss | 0 src/gtk-4.0/widgets/{Adwaita => adw}/PreferencesWindow.scss | 0 src/gtk-4.0/widgets/{Adwaita => adw}/ViewSwitcher.scss | 0 src/gtk-4.0/widgets/{Adwaita => adw}/_index.scss | 0 5 files changed, 1 insertion(+), 2 deletions(-) rename src/gtk-4.0/widgets/{Adwaita => adw}/List.scss (100%) rename src/gtk-4.0/widgets/{Adwaita => adw}/PreferencesWindow.scss (100%) rename src/gtk-4.0/widgets/{Adwaita => adw}/ViewSwitcher.scss (100%) rename src/gtk-4.0/widgets/{Adwaita => adw}/_index.scss (100%) diff --git a/src/gtk-4.0/widgets/_index.scss b/src/gtk-4.0/widgets/_index.scss index 4baa07cf..90c0a9c2 100644 --- a/src/gtk-4.0/widgets/_index.scss +++ b/src/gtk-4.0/widgets/_index.scss @@ -92,7 +92,6 @@ selection { @import '_tooltips.scss'; @import '_treeviews.scss'; @import '_views.scss'; -@import '_viewswitcher.scss'; @import '_windowcontrols.scss'; @import '_windows.scss'; -@import 'Adwaita/_index.scss'; +@import 'adw/_index.scss'; diff --git a/src/gtk-4.0/widgets/Adwaita/List.scss b/src/gtk-4.0/widgets/adw/List.scss similarity index 100% rename from src/gtk-4.0/widgets/Adwaita/List.scss rename to src/gtk-4.0/widgets/adw/List.scss diff --git a/src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss b/src/gtk-4.0/widgets/adw/PreferencesWindow.scss similarity index 100% rename from src/gtk-4.0/widgets/Adwaita/PreferencesWindow.scss rename to src/gtk-4.0/widgets/adw/PreferencesWindow.scss diff --git a/src/gtk-4.0/widgets/Adwaita/ViewSwitcher.scss b/src/gtk-4.0/widgets/adw/ViewSwitcher.scss similarity index 100% rename from src/gtk-4.0/widgets/Adwaita/ViewSwitcher.scss rename to src/gtk-4.0/widgets/adw/ViewSwitcher.scss diff --git a/src/gtk-4.0/widgets/Adwaita/_index.scss b/src/gtk-4.0/widgets/adw/_index.scss similarity index 100% rename from src/gtk-4.0/widgets/Adwaita/_index.scss rename to src/gtk-4.0/widgets/adw/_index.scss From 3d4ef2d2e95ed87375bf74bf87c622a099de63c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 22 Mar 2023 11:05:09 -0700 Subject: [PATCH 23/25] More specific with subtitle --- src/gtk-4.0/_typography.scss | 5 ----- src/gtk-4.0/widgets/adw/List.scss | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gtk-4.0/_typography.scss b/src/gtk-4.0/_typography.scss index e0e6c8a3..6726ad99 100644 --- a/src/gtk-4.0/_typography.scss +++ b/src/gtk-4.0/_typography.scss @@ -155,8 +155,3 @@ label:disabled { .monospace { font-family: monospace; } - -.subtitle { - @extend .small-label; - @extend .dim-label; -} diff --git a/src/gtk-4.0/widgets/adw/List.scss b/src/gtk-4.0/widgets/adw/List.scss index afd4c0a7..267a68aa 100644 --- a/src/gtk-4.0/widgets/adw/List.scss +++ b/src/gtk-4.0/widgets/adw/List.scss @@ -38,6 +38,9 @@ list.boxed-list { } .title + .subtitle { + @extend .small-label; + @extend .dim-label; + margin-top: 0.25em; } From 6d8db97e9f1ff5eb1519f8c217e383ffa2856d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Wed, 22 Mar 2023 11:06:38 -0700 Subject: [PATCH 24/25] Comment actionbar selector --- src/gtk-4.0/widgets/adw/PreferencesWindow.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gtk-4.0/widgets/adw/PreferencesWindow.scss b/src/gtk-4.0/widgets/adw/PreferencesWindow.scss index af09005c..e5750e89 100644 --- a/src/gtk-4.0/widgets/adw/PreferencesWindow.scss +++ b/src/gtk-4.0/widgets/adw/PreferencesWindow.scss @@ -34,6 +34,7 @@ window.preferences.csd { margin-bottom: 2rem; } + // Eg. Passwords page in Ephy leaflet stack + actionbar { background: #{'@theme_bg_color'}; box-shadow: From cf21adaa7557470851cbe3317a16fd9ef8b6abd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 23 Mar 2023 10:09:42 -0700 Subject: [PATCH 25/25] Update PreferencesWindow.scss --- src/gtk-4.0/widgets/adw/PreferencesWindow.scss | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/gtk-4.0/widgets/adw/PreferencesWindow.scss b/src/gtk-4.0/widgets/adw/PreferencesWindow.scss index e5750e89..46b016bc 100644 --- a/src/gtk-4.0/widgets/adw/PreferencesWindow.scss +++ b/src/gtk-4.0/widgets/adw/PreferencesWindow.scss @@ -33,19 +33,4 @@ window.preferences.csd { preferencesgroup { margin-bottom: 2rem; } - - // Eg. Passwords page in Ephy - leaflet stack + actionbar { - background: #{'@theme_bg_color'}; - box-shadow: - outset-highlight(), - // Intentionally not in ems since it's used as a stroke - 0 0 0 1px #{'@menu_separator'}, - 0 rem(-1px) rem(3px) rgba(black, 0.1); - padding: rem(6px); - - button { - min-width: rem(60px); - } - } }