[gtk+/wip/baedert/drawing: 93/102] adwaita: Adjust entry progress styling
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 93/102] adwaita: Adjust entry progress styling
- Date: Thu, 29 Jun 2017 15:45:50 +0000 (UTC)
commit c55d27a76b07c7ff3a55dd607ea554997c551694
Author: Timm Bäder <mail baedert org>
Date: Wed Jun 28 07:25:34 2017 +0200
adwaita: Adjust entry progress styling
Now that the entry>progress node is a full GtkProgressBar, we need to
apply the style to its trough>progress node.
gtk/theme/Adwaita/_common.scss | 5 ++++-
gtk/theme/Adwaita/gtk-contained-dark.css | 10 ++++++----
gtk/theme/Adwaita/gtk-contained.css | 10 ++++++----
3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 063b8df..b50ee97 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -328,7 +328,10 @@ entry {
}
progress {
- margin: 2px -6px;
+ margin-bottom: 2px;
+ }
+
+ progress>trough>progress {
background-color: transparent;
background-image: none;
border-radius: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index cd3f82c..39dfa86 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -134,9 +134,11 @@ spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.verti
.osd spinbutton:disabled:not(.vertical), .osd entry:disabled { color: #858786; border-color: rgba(0, 0, 0,
0.7); background-color: rgba(49, 52, 52, 0.5); background-clip: padding-box; box-shadow: none; text-shadow:
none; -gtk-icon-shadow: none; }
-spinbutton:not(.vertical) progress, entry progress { margin: 2px -6px; background-color: transparent;
background-image: none; border-radius: 0; border-width: 0 0 2px; border-color: #215d9c; border-style: solid;
box-shadow: none; }
+spinbutton:not(.vertical) progress, entry progress { margin-bottom: 2px; }
-spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { background-color: transparent; }
+spinbutton:not(.vertical) progress > trough > progress, entry progress > trough > progress {
background-color: transparent; background-image: none; border-radius: 0; border-width: 0 0 2px; border-color:
#215d9c; border-style: solid; box-shadow: none; }
+
+spinbutton:not(.vertical) progress > trough > progress:backdrop, entry progress > trough > progress:backdrop
{ background-color: transparent; }
.linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical)
spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) +
combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical),
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box >
button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) >
entry:focus + entry { border-left-color: #0f2b48; }
@@ -1848,9 +1850,9 @@ headerbar.selection-mode button.titlebutton, .titlebar.selection-mode button.tit
headerbar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.titlebutton:backdrop {
-gtk-icon-shadow: none; }
-.view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus,
iconview text:selected:focus, textview text:selected:focus, .view text:selected, iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection,
iconview text selection, textview text selection:focus, textview text selection, flowbox
flowboxchild:selected, spinbutton:not(.vertical) selection, entry selection, modelbutton.flat:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected { background-color: #215d9c; }
+.view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection,
iconview text selection, textview text selection:focus, textview text selection, flowbox
flowboxchild:selected, spinbutton:not(.vertical) selection, entry selection, modelbutton.flat:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected { background-color: #215d9c; }
-row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus,
iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview
text:selected:focus, textview text:selected:focus, .view text:selected, iconview text:selected, textview
text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text
selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected,
spinbutton:not(.vertical) selection, entry selection, modelbutton.flat:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected { color: #ffffff; }
+row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus,
.view:selected, iconview:selected, .view text:selected, iconview text:selected, textview text:selected, .view
text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview
text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical)
selection, entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected,
treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; }
row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled,
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview
text:disabled:selected:focus, textview text:disabled:selected:focus, .view text:disabled:selected, iconview
text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text
selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox
flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, entry
selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected,
row:disabled:selected, calendar:disabled:selected { color: #90aece; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index eea058a..39f7661 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -134,9 +134,11 @@ spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.verti
.osd spinbutton:disabled:not(.vertical), .osd entry:disabled { color: #858786; border-color: rgba(0, 0, 0,
0.7); background-color: rgba(49, 52, 52, 0.5); background-clip: padding-box; box-shadow: none; text-shadow:
none; -gtk-icon-shadow: none; }
-spinbutton:not(.vertical) progress, entry progress { margin: 2px -6px; background-color: transparent;
background-image: none; border-radius: 0; border-width: 0 0 2px; border-color: #4a90d9; border-style: solid;
box-shadow: none; }
+spinbutton:not(.vertical) progress, entry progress { margin-bottom: 2px; }
-spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { background-color: transparent; }
+spinbutton:not(.vertical) progress > trough > progress, entry progress > trough > progress {
background-color: transparent; background-image: none; border-radius: 0; border-width: 0 0 2px; border-color:
#4a90d9; border-style: solid; box-shadow: none; }
+
+spinbutton:not(.vertical) progress > trough > progress:backdrop, entry progress > trough > progress:backdrop
{ background-color: transparent; }
.linked:not(.vertical) > spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical)
spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > spinbutton:focus:not(.vertical) +
combobox > box > button.combo, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical),
.linked:not(.vertical) > entry:focus + button, .linked:not(.vertical) > entry:focus + combobox > box >
button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + entry, .linked:not(.vertical) >
entry:focus + entry { border-left-color: #4a90d9; }
@@ -1868,9 +1870,9 @@ headerbar.selection-mode button.titlebutton, .titlebar.selection-mode button.tit
headerbar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.titlebutton:backdrop {
-gtk-icon-shadow: none; }
-.view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus,
iconview text:selected:focus, textview text:selected:focus, .view text:selected, iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection,
iconview text selection, textview text selection:focus, textview text selection, flowbox
flowboxchild:selected, spinbutton:not(.vertical) selection, entry selection, modelbutton.flat:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected { background-color: #4a90d9; }
+.view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection,
iconview text selection, textview text selection:focus, textview text selection, flowbox
flowboxchild:selected, spinbutton:not(.vertical) selection, entry selection, modelbutton.flat:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected { background-color: #4a90d9; }
-row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus,
iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview
text:selected:focus, textview text:selected:focus, .view text:selected, iconview text:selected, textview
text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text
selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected,
spinbutton:not(.vertical) selection, entry selection, modelbutton.flat:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected,
calendar:selected { color: #ffffff; }
+row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus,
.view:selected, iconview:selected, .view text:selected, iconview text:selected, textview text:selected, .view
text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview
text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical)
selection, entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected,
treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; }
row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled,
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview
text:disabled:selected:focus, textview text:disabled:selected:focus, .view text:disabled:selected, iconview
text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text
selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox
flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, entry
selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected,
row:disabled:selected, calendar:disabled:selected { color: #a5c8ec; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]