From 0060f8447739442d8accc16890193c7570037c3a Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Fri, 12 Sep 2014 12:57:52 +0200 Subject: [PATCH] Adwaita: space pathbar better https://bugzilla.gnome.org/show_bug.cgi?id=736535 --- gtk/resources/theme/Adwaita/_common.scss | 15 +++++------ .../theme/Adwaita/gtk-contained-dark.css | 27 +++++++++++-------- gtk/resources/theme/Adwaita/gtk-contained.css | 27 +++++++++++-------- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 5a4fc2119e..f7fb68a8d6 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1095,22 +1095,21 @@ GtkComboBox { ************/ .path-bar .button { - padding: 5px 6px 6px; + padding: 6px; &:first-child { padding-left: 8px; } &:last-child { padding-right: 8px; } &:only-child { padding-left: 12px; padding-right: 12px; } + + // the following is for spacing the icon and the label inside the home button + GtkLabel:last-child { padding-left: 2px; } + GtkLabel:first-child { padding-right: 2px; } + GtkLabel:only-child { padding-right: 0; padding-left: 0; } + GtkImage { padding-top: 1px; } } -// the following is for spacing the icon and the label inside the home button -.path-bar .button GtkLabel:last-child { padding-left: 2px; } -.path-bar .button GtkLabel:first-child { padding-right: 2px; } -.path-bar .button GtkLabel:only-child { padding-right: 0; padding-left: 0; } - - - /************** * Tree Views * **************/ diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 11b317aa23..c4b78b4a91 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1725,7 +1725,7 @@ GtkComboBox { .titlebar .path-bar .button.titlebutton, .path-bar GtkCalendar.header .button.titlebutton, GtkCalendar.header .path-bar .button.titlebutton { - padding: 5px 6px 6px; } + padding: 6px; } .path-bar .button:first-child { padding-left: 8px; } .path-bar .button:last-child { @@ -1733,16 +1733,19 @@ GtkCalendar.header .path-bar .button.titlebutton { .path-bar .button:only-child { padding-left: 12px; padding-right: 12px; } - -.path-bar .button GtkLabel:last-child { - padding-left: 2px; } - -.path-bar .button GtkLabel:first-child { - padding-right: 2px; } - -.path-bar .button GtkLabel:only-child { - padding-right: 0; - padding-left: 0; } + .path-bar .button GtkLabel:last-child { + padding-left: 2px; } + .path-bar .button GtkLabel:first-child { + padding-right: 2px; } + .path-bar .button GtkLabel:only-child { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage, + .path-bar .titlebar .button.titlebutton GtkImage, + .titlebar .path-bar .button.titlebutton GtkImage, + .path-bar GtkCalendar.header .button.titlebutton GtkImage, + GtkCalendar.header .path-bar .button.titlebutton GtkImage { + padding-top: 1px; } /************** * Tree Views * @@ -4172,3 +4175,5 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { @define-color wm_button_active_color_b shade(#393f3f, 0.89); @define-color wm_button_active_color_c shade(#393f3f, 0.9); @define-color content_view_bg #292929; + +/*# sourceMappingURL=gtk-contained-dark.css.map */ diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 7670456766..6d4bab849d 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1717,7 +1717,7 @@ GtkComboBox { .titlebar .path-bar .button.titlebutton, .path-bar GtkCalendar.header .button.titlebutton, GtkCalendar.header .path-bar .button.titlebutton { - padding: 5px 6px 6px; } + padding: 6px; } .path-bar .button:first-child { padding-left: 8px; } .path-bar .button:last-child { @@ -1725,16 +1725,19 @@ GtkCalendar.header .path-bar .button.titlebutton { .path-bar .button:only-child { padding-left: 12px; padding-right: 12px; } - -.path-bar .button GtkLabel:last-child { - padding-left: 2px; } - -.path-bar .button GtkLabel:first-child { - padding-right: 2px; } - -.path-bar .button GtkLabel:only-child { - padding-right: 0; - padding-left: 0; } + .path-bar .button GtkLabel:last-child { + padding-left: 2px; } + .path-bar .button GtkLabel:first-child { + padding-right: 2px; } + .path-bar .button GtkLabel:only-child { + padding-right: 0; + padding-left: 0; } + .path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage, + .path-bar .titlebar .button.titlebutton GtkImage, + .titlebar .path-bar .button.titlebutton GtkImage, + .path-bar GtkCalendar.header .button.titlebutton GtkImage, + GtkCalendar.header .path-bar .button.titlebutton GtkImage { + padding-top: 1px; } /************** * Tree Views * @@ -4331,3 +4334,5 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { @define-color wm_button_active_color_b shade(#ededed, 0.89); @define-color wm_button_active_color_c shade(#ededed, 0.9); @define-color content_view_bg #ffffff; + +/*# sourceMappingURL=gtk-contained.css.map */