[libadwaita] Revert "stylesheet: Use toggle group style for GtkStackSwitcher"
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita] Revert "stylesheet: Use toggle group style for GtkStackSwitcher"
- Date: Mon, 13 Sep 2021 11:09:02 +0000 (UTC)
commit 8ae929f12a64579faf5275ce1a83d444ba867ef2
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Mon Sep 13 11:09:02 2021 +0000
Revert "stylesheet: Use toggle group style for GtkStackSwitcher"
This reverts commit 76c0ebe44470240d49b317c22a7211463cbb5ea1
src/stylesheet/widgets/_buttons.scss | 21 +++++++++++++++++++++
src/stylesheet/widgets/_toggle-group.scss | 28 ----------------------------
src/stylesheet/widgets/_toolbars.scss | 9 +++------
3 files changed, 24 insertions(+), 34 deletions(-)
---
diff --git a/src/stylesheet/widgets/_buttons.scss b/src/stylesheet/widgets/_buttons.scss
index ebc978a0..c56d97ce 100644
--- a/src/stylesheet/widgets/_buttons.scss
+++ b/src/stylesheet/widgets/_buttons.scss
@@ -240,6 +240,27 @@ button {
}
}
+ stackswitcher > & {
+ // to position the needs attention dot, padding is added to the button
+ // child, a label needs just lateral padding while an icon needs vertical
+ // padding added too.
+
+ > label {
+ padding: 0 6px;
+ margin: 0 -6px;
+ }
+
+ > image {
+ padding: 3px 6px;
+ margin: -3px -6px;
+ }
+
+ &.needs-attention {
+ > label,
+ > image { @extend %needs_attention; }
+ }
+ }
+
// hide separators
&.font {
separator { background-color: transparent; }
diff --git a/src/stylesheet/widgets/_toggle-group.scss b/src/stylesheet/widgets/_toggle-group.scss
index 739e41f1..584e2864 100644
--- a/src/stylesheet/widgets/_toggle-group.scss
+++ b/src/stylesheet/widgets/_toggle-group.scss
@@ -1,4 +1,3 @@
-stackswitcher,
.toggle-group {
background-color: gtkalpha(currentColor, .1);
padding: 3px;
@@ -50,30 +49,3 @@ stackswitcher,
}
}
}
-
-/********************
- * GtkStackSwitcher *
- ********************/
-
-stackswitcher {
- > button {
- // to position the needs attention dot, padding is added to the button
- // child, a label needs just lateral padding while an icon needs vertical
- // padding added too.
-
- > label {
- padding: 0 6px;
- margin: 0 -6px;
- }
-
- > image {
- padding: 3px 6px;
- margin: -3px -6px;
- }
-
- &.needs-attention {
- > label,
- > image { @extend %needs_attention; }
- }
- }
-}
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index 838e3d59..feba0e60 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -24,8 +24,7 @@
}
}
- .toggle-group,
- stackswitcher {
+ .toggle-group {
button:not(.raised):not(.suggested-action):not(.destructive-action).toggle {
&.arrow-button,
&.image-button,
@@ -80,8 +79,7 @@
margin-bottom: 10px;
}
- .toggle-group,
- stackswitcher {
+ .toggle-group {
margin-top: 6px;
margin-bottom: 6px;
@@ -114,8 +112,7 @@
button,
menubutton,
switch,
- .toggle-group,
- stackswitcher {
+ .toggle-group {
margin-top: 0;
margin-bottom: 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]