[gtk: 1/2] adwaita: Fix the padding of row.expander
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] adwaita: Fix the padding of row.expander
- Date: Tue, 22 Jan 2019 12:57:29 +0000 (UTC)
commit 773efe41a9b7021155c35b04f90aab2deb94f1ae
Author: Adrien Plazas <kekun plazas laposte net>
Date: Tue Jan 22 12:43:07 2019 +0100
adwaita: Fix the padding of row.expander
This will allow to implement the expanding rows pattern.
gtk/theme/Adwaita/_common.scss | 3 ++-
gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++++--
gtk/theme/Adwaita/gtk-contained.css | 8 ++++++--
3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 0ec41d5a10..369b651cb9 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3662,7 +3662,8 @@ list {
border-color: $backdrop_borders_color;
}
- row { padding: 2px; }
+ row:not(.expander) { padding: 2px; }
+ row.expander .row-header { padding: 2px; }
}
row {
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 57ac4d3461..814067a29a 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -68,7 +68,7 @@ label:disabled:backdrop { color: #656466; }
label:backdrop { color: #969696; }
-.dim-label, label.separator, .titlebar:not(headerbar) .subtitle, headerbar .subtitle { opacity: 0.55;
text-shadow: none; }
+.dim-label, label.separator, spinbutton:not(.vertical) placeholder, entry placeholder,
.titlebar:not(headerbar) .subtitle, headerbar .subtitle { opacity: 0.55; text-shadow: none; }
assistant .sidebar { background-color: #26232d; border-top: 1px solid #2a2a2b; }
@@ -108,6 +108,8 @@ spinbutton.flat:focus:not(.vertical), spinbutton.flat:backdrop:not(.vertical), s
spinbutton:focus:not(.vertical), entry:focus { box-shadow: inset 0 0 0 1px #15539e; border-color: #092444;
outline: none; }
+spinbutton:focus:not(.vertical) > placeholder, entry:focus > placeholder { opacity: 0; /* We hide
placeholders on focus */ }
+
spinbutton:disabled:not(.vertical), entry:disabled { color: #969696; border-color: #2a2a2b;
background-color: #353338; box-shadow: none; }
spinbutton:backdrop:not(.vertical), entry:backdrop { color: #d4d3d6; border-color: #2f2e2f;
background-color: #282530; box-shadow: none; transition: 200ms ease-out; }
@@ -1588,7 +1590,9 @@ list { color: white; background-color: #26232d; border-color: #2a2a2b; }
list:backdrop { background-color: #282530; border-color: #2f2e2f; }
-list row { padding: 2px; }
+list row:not(.expander) { padding: 2px; }
+
+list row.expander .row-header { padding: 2px; }
row { transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 2cc80dbbd7..d120401504 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -68,7 +68,7 @@ label:disabled:backdrop { color: #d4cfca; }
label:backdrop { color: #929595; }
-.dim-label, label.separator, .titlebar:not(headerbar) .subtitle, headerbar .subtitle { opacity: 0.55;
text-shadow: none; }
+.dim-label, label.separator, spinbutton:not(.vertical) placeholder, entry placeholder,
.titlebar:not(headerbar) .subtitle, headerbar .subtitle { opacity: 0.55; text-shadow: none; }
assistant .sidebar { background-color: #ffffff; border-top: 1px solid #dad6d2; }
@@ -108,6 +108,8 @@ spinbutton.flat:focus:not(.vertical), spinbutton.flat:backdrop:not(.vertical), s
spinbutton:focus:not(.vertical), entry:focus { box-shadow: inset 0 0 0 1px #3584e4; border-color: #3584e4;
outline: none; }
+spinbutton:focus:not(.vertical) > placeholder, entry:focus > placeholder { opacity: 0; /* We hide
placeholders on focus */ }
+
spinbutton:disabled:not(.vertical), entry:disabled { color: #929595; border-color: #dad6d2;
background-color: #faf9f8; box-shadow: none; }
spinbutton:backdrop:not(.vertical), entry:backdrop { color: #323232; border-color: #e0ddd9;
background-color: #fcfcfc; box-shadow: none; transition: 200ms ease-out; }
@@ -1608,7 +1610,9 @@ list { color: black; background-color: #ffffff; border-color: #dad6d2; }
list:backdrop { background-color: #fcfcfc; border-color: #e0ddd9; }
-list row { padding: 2px; }
+list row:not(.expander) { padding: 2px; }
+
+list row.expander .row-header { padding: 2px; }
row { transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]