From d3a153a45e75621bd4c5a89eb4555392bab62d3c Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 16 Feb 2016 18:23:09 +0100 Subject: [PATCH] Adwaita: places sidebar sizing with min-height... ...more to come. --- gtk/theme/Adwaita/_common.scss | 7 ++++--- gtk/theme/Adwaita/gtk-contained-dark.css | 8 +++++--- gtk/theme/Adwaita/gtk-contained.css | 8 +++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index dc8e483d66..8a5b467505 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2875,7 +2875,6 @@ scrolledwindow { } // This is used when content is touch-dragged past boundaries. // draws a box on top of the content, the size changes programmatically. - overshoot { &.top { @include overshoot(top); @@ -3296,11 +3295,12 @@ placessidebar { row { // Needs overriding of the GtkListBoxRow padding padding: 0px; + min-height: 36px; // Using margins/padding directly in the SidebarRow // will make the animation of the new bookmark row jump > revealer { - padding: 6px 14px 6px 12px; + padding: 0 14px; } & image.sidebar-icon { @@ -3316,7 +3316,8 @@ placessidebar { } @at-root button.sidebar-button { - padding: 5px; + margin-top: 1px; + margin-bottom: 1px; @extend button.flat; border-radius: 100%; -gtk-outline-radius: 100%; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index a9d177a14f..c62cee4192 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -3779,9 +3779,10 @@ stacksidebar row { * File chooser * ****************/ placessidebar row { - padding: 0px; } + padding: 0px; + min-height: 36px; } placessidebar row > revealer { - padding: 6px 14px 6px 12px; } + padding: 0 14px; } placessidebar row image.sidebar-icon { opacity: 0.7; } placessidebar row image.sidebar-icon:dir(ltr) { @@ -3793,7 +3794,8 @@ placessidebar row { placessidebar row label.sidebar-label:dir(rtl) { padding-left: 2px; } button.sidebar-button { - padding: 5px; + margin-top: 1px; + margin-bottom: 1px; border-radius: 100%; -gtk-outline-radius: 100%; } button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 2f4e76b0a0..7bab7645bf 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -3818,9 +3818,10 @@ stacksidebar row { * File chooser * ****************/ placessidebar row { - padding: 0px; } + padding: 0px; + min-height: 36px; } placessidebar row > revealer { - padding: 6px 14px 6px 12px; } + padding: 0 14px; } placessidebar row image.sidebar-icon { opacity: 0.7; } placessidebar row image.sidebar-icon:dir(ltr) { @@ -3832,7 +3833,8 @@ placessidebar row { placessidebar row label.sidebar-label:dir(rtl) { padding-left: 2px; } button.sidebar-button { - padding: 5px; + margin-top: 1px; + margin-bottom: 1px; border-radius: 100%; -gtk-outline-radius: 100%; } button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {