From 425f455ab7665a046060fe140c861aeb7ea8209b Mon Sep 17 00:00:00 2001
From: Jeremy Attali <jeremy.attali@gmail.com>
Date: Thu, 26 Dec 2019 18:24:21 -0500
Subject: [PATCH] fix(ui): tweak button sizes

---
 res/style/swappy.css | 10 ++++++++++
 res/swappy.ui        |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/res/style/swappy.css b/res/style/swappy.css
index 31a71a5..7d915aa 100644
--- a/res/style/swappy.css
+++ b/res/style/swappy.css
@@ -1,5 +1,15 @@
 .drawing .text-button {
   font-family: "FontAwesome 5 Free Solid";
+  padding: 4px;
+}
+
+.drawing .text-button radio,
+.color-box .text-button radio {
+  padding: 0;
+}
+
+.color-box button {
+    padding: 6px 10px;
 }
 
 .color-box image {
diff --git a/res/swappy.ui b/res/swappy.ui
index 3eb6d6a..6e918dd 100644
--- a/res/swappy.ui
+++ b/res/swappy.ui
@@ -56,8 +56,8 @@
                 <property name="image">edit-redo</property>
                 <property name="always_show_image">True</property>
                 <signal name="clicked" handler="redo_clicked_handler" swapped="no"/>
-                <accelerator key="z" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                 <accelerator key="y" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
+                <accelerator key="z" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -234,6 +234,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_bottom">15</property>
+                    <property name="spacing">6</property>
                     <property name="homogeneous">True</property>
                     <child>
                       <object class="GtkRadioButton" id="brush">
@@ -425,7 +426,7 @@
                       <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="margin_left">50</property>
+                        <property name="margin_left">12</property>
                         <property name="spacing">5</property>
                         <child>
                           <object class="GtkRadioButton" id="color-button-custom">
@@ -477,7 +478,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>