[gtk+] Adwaita: avoid too tall headerbars
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: avoid too tall headerbars
- Date: Fri, 8 Jan 2016 20:01:04 +0000 (UTC)
commit 48fbe5137e98e82dbff40d8b56584c39466fb06a
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Fri Jan 8 20:56:40 2016 +0100
Adwaita: avoid too tall headerbars
the vertical padding from the headerbar has been removed, now the
sizing is done with min-height, this avoids title and subtitle
labels making the headbar.
gtk/theme/Adwaita/_common.scss | 11 ++++++++---
gtk/theme/Adwaita/gtk-contained-dark.css | 9 ++++++---
gtk/theme/Adwaita/gtk-contained.css | 9 ++++++---
3 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index ec5c0e5..8fe4f85 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1112,7 +1112,8 @@ searchbar,
%titlebar,
headerbar {
- padding: 6px;
+ padding: 0 6px;
+ min-height: 46px;
border-width: 0 0 1px;
border-style: solid;
border-color: $borders_color;
@@ -1277,8 +1278,12 @@ headerbar {
}
&.default-decoration {
- padding: 4px;
- button { padding: 5px; }
+ padding: 0 4px;
+ min-height: 36px;
+ button {
+ min-height: 26px;
+ padding: 0 5px;
+ }
}
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9ec4f4f..a39fbd2 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1603,7 +1603,8 @@ searchbar,
***************/
.titlebar:not(headerbar),
headerbar {
- padding: 6px;
+ padding: 0 6px;
+ min-height: 46px;
border-width: 0 0 1px;
border-style: solid;
border-color: #1c1f1f;
@@ -1918,12 +1919,14 @@ headerbar {
border-radius: 0; }
.default-decoration.titlebar:not(headerbar),
headerbar.default-decoration {
- padding: 4px; }
+ padding: 0 4px;
+ min-height: 36px; }
.default-decoration.titlebar:not(headerbar) button,
headerbar.default-decoration button,
headerbar.default-decoration .titlebar button.titlebutton,
.titlebar headerbar.default-decoration button.titlebutton {
- padding: 5px; }
+ min-height: 26px;
+ padding: 0 5px; }
.titlebar, .titlebar:backdrop {
border-top-left-radius: 7px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3efff0d..ec03ad2 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1607,7 +1607,8 @@ searchbar,
***************/
.titlebar:not(headerbar),
headerbar {
- padding: 6px;
+ padding: 0 6px;
+ min-height: 46px;
border-width: 0 0 1px;
border-style: solid;
border-color: #9d9d99;
@@ -1922,12 +1923,14 @@ headerbar {
border-radius: 0; }
.default-decoration.titlebar:not(headerbar),
headerbar.default-decoration {
- padding: 4px; }
+ padding: 0 4px;
+ min-height: 36px; }
.default-decoration.titlebar:not(headerbar) button,
headerbar.default-decoration button,
headerbar.default-decoration .titlebar button.titlebutton,
.titlebar headerbar.default-decoration button.titlebutton {
- padding: 5px; }
+ min-height: 26px;
+ padding: 0 5px; }
.titlebar, .titlebar:backdrop {
border-top-left-radius: 7px;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]