[libadwaita/wip/exalm/borderless: 5/7] stylesheet: Shrink back .linked and remove rounding




commit 4a4d1cbe339c2c2b4c46f606f92173795d4a3952
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Jun 29 14:19:20 2021 +0500

    stylesheet: Shrink back .linked and remove rounding
    
    Since we're not going with the grow-on-hover thing, no need to do either.

 examples/adw-view-switcher-demo-window.ui | 168 +++++++++++++++++++++++++++++-
 src/stylesheet/widgets/_linked.scss       |  18 ++--
 2 files changed, 174 insertions(+), 12 deletions(-)
---
diff --git a/examples/adw-view-switcher-demo-window.ui b/examples/adw-view-switcher-demo-window.ui
index ceab7979..a56b2218 100644
--- a/examples/adw-view-switcher-demo-window.ui
+++ b/examples/adw-view-switcher-demo-window.ui
@@ -57,7 +57,7 @@
             <child type="end">
               <object class="GtkBox">
                 <style>
-                  <class name="linked"/>
+                  <class name="linked2"/>
                 </style>
                 <child>
                   <object class="GtkButton">
@@ -75,6 +75,57 @@
             </child>
           </object>
         </child>
+        <child>
+          <object class="GtkBox">
+            <style>
+              <class name="toolbar"/>
+            </style>
+            <child>
+              <object class="GtkBox">
+                <style>
+                  <class name="linked"/>
+                </style>
+                <child>
+                  <object class="GtkSearchEntry"/>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="icon-name">go-up-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="icon-name">go-down-symbolic</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton">
+                <property name="icon-name">edit-find-symbolic</property>
+                <property name="hexpand">True</property>
+                <property name="halign">end</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton">
+                <property name="icon-name">edit-find-replace-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">view-more-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <style>
+              <class name="sidebar"/>
+            </style>
+          </object>
+        </child>
         <child>
           <object class="GtkLabel">
             <property name="label">Borderless Demo</property>
@@ -84,6 +135,118 @@
             </style>
           </object>
         </child>
+        <child>
+          <object class="GtkSeparator">
+            <style>
+              <class name="sidebar"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <style>
+              <class name="toolbar"/>
+            </style>
+            <child>
+              <object class="GtkBox">
+                <style>
+                  <class name="linked2"/>
+                </style>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-text-bold-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-text-italic-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-text-underline-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-text-strikethrough-symbolic</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <style>
+                  <class name="linked2"/>
+                </style>
+                <child>
+                  <object class="GtkToggleButton" id="bold">
+                    <property name="icon-name">format-justify-left-symbolic</property>
+                    <property name="active">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-justify-center-symbolic</property>
+                    <property name="group">bold</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-justify-right-symbolic</property>
+                    <property name="group">bold</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkToggleButton">
+                    <property name="icon-name">format-justify-fill-symbolic</property>
+                    <property name="group">bold</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkVolumeButton">
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkVolumeButton">
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <style>
+                  <class name="linked2"/>
+                </style>
+                <child>
+                  <object class="GtkButton">
+                    <property name="icon-name">format-indent-less-symbolic</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="icon-name">format-indent-more-symbolic</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">insert-image-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">insert-link-symbolic</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="icon-name">insert-object-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkActionBar">
             <child type="start">
@@ -108,8 +271,7 @@
               <object class="GtkButton">
                 <property name="label">Properties</property>
               </object>
-            </child>
-            <child type="end">
+            </child>            <child type="end">
               <object class="GtkBox">
                 <style>
                   <class name="linked"/>
diff --git a/src/stylesheet/widgets/_linked.scss b/src/stylesheet/widgets/_linked.scss
index 68bbf225..a319feff 100644
--- a/src/stylesheet/widgets/_linked.scss
+++ b/src/stylesheet/widgets/_linked.scss
@@ -11,7 +11,7 @@ $_linked_widgets: ("%button",          ""),
                   ("entry",            "");
 
 .linked {
-  border-spacing: 3px;
+  border-spacing: 2px;
 }
 
 @each $widget, $child in $_linked_widgets {
@@ -19,14 +19,14 @@ $_linked_widgets: ("%button",          ""),
     #{$widget} {
       &:dir(ltr):not(:first-child) #{$child},
       &:dir(rtl):not(:last-child) #{$child} {
-        border-top-left-radius: 2px;
-        border-bottom-left-radius: 2px;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
       }
 
       &:dir(ltr):not(:last-child) #{$child},
       &:dir(rtl):not(:first-child) #{$child} {
-        border-top-right-radius: 2px;
-        border-bottom-right-radius: 2px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
       }
     }
   }
@@ -34,13 +34,13 @@ $_linked_widgets: ("%button",          ""),
   .linked.vertical {
     #{$widget} {
       &:not(:first-child) #{$child} {
-        border-top-left-radius: 2px;
-        border-top-right-radius: 2px;
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
       }
 
       &:not(:last-child) #{$child} {
-        border-bottom-left-radius: 2px;
-        border-bottom-right-radius: 2px;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
       }
     }
   }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]