[gtk+] Adwaita: fix entry progressbar
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: fix entry progressbar
- Date: Sat, 20 Feb 2016 18:35:19 +0000 (UTC)
commit b23300c89dbd78ce191b827307e2363fefd9f27b
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Sat Feb 20 19:31:58 2016 +0100
Adwaita: fix entry progressbar
it now moves using the whole entry lenght, in the process the
style was tweaked to not need a special case for focused entries.
gtk/theme/Adwaita/_common.scss | 6 +-----
gtk/theme/Adwaita/gtk-contained-dark.css | 4 +---
gtk/theme/Adwaita/gtk-contained.css | 4 +---
3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 51e05d5..b25eef3 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -266,7 +266,7 @@ entry {
selection:focus { @extend %selected_items; }
progress {
- margin: 1px;
+ margin: 2px -6px;
border-radius: 0;
border-width: 0 0 2px;
border-color: $selected_bg_color;
@@ -277,10 +277,6 @@ entry {
&:backdrop { background-color: transparent; }
}
- &:focus progress {
- border-bottom-width: 3px;
- }
-
.linked:not(.vertical) > & { @extend %linked; }
.linked:not(.vertical) > &:focus + entry,
.linked:not(.vertical) > &:focus + button,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3459823..c0881fe 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -227,7 +227,7 @@ entry, spinbutton:not(.vertical) {
background-image: linear-gradient(to bottom, #333636);
box-shadow: none; }
entry progress, spinbutton:not(.vertical) progress {
- margin: 1px;
+ margin: 2px -6px;
border-radius: 0;
border-width: 0 0 2px;
border-color: #215d9c;
@@ -237,8 +237,6 @@ entry, spinbutton:not(.vertical) {
box-shadow: none; }
entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop {
background-color: transparent; }
- entry:focus progress, spinbutton:focus:not(.vertical) progress {
- border-bottom-width: 3px; }
.linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > spinbutton:focus:not(.vertical) +
entry, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) >
spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus + button,
.linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > entry:focus +
combobox > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > button.combo {
border-left-color: #0f2b48; }
entry.error, spinbutton.error:not(.vertical) {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9dffce1..1f23694 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -227,7 +227,7 @@ entry, spinbutton:not(.vertical) {
background-image: linear-gradient(to bottom, #f1f1f1);
box-shadow: none; }
entry progress, spinbutton:not(.vertical) progress {
- margin: 1px;
+ margin: 2px -6px;
border-radius: 0;
border-width: 0 0 2px;
border-color: #4a90d9;
@@ -237,8 +237,6 @@ entry, spinbutton:not(.vertical) {
box-shadow: none; }
entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop {
background-color: transparent; }
- entry:focus progress, spinbutton:focus:not(.vertical) progress {
- border-bottom-width: 3px; }
.linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > spinbutton:focus:not(.vertical) +
entry, .linked:not(.vertical) > entry:focus + spinbutton:not(.vertical), .linked:not(.vertical) >
spinbutton:focus:not(.vertical) + spinbutton:not(.vertical), .linked:not(.vertical) > entry:focus + button,
.linked:not(.vertical) > spinbutton:focus:not(.vertical) + button, .linked:not(.vertical) > entry:focus +
combobox > button.combo, .linked:not(.vertical) > spinbutton:focus:not(.vertical) + combobox > button.combo {
border-left-color: #4a90d9; }
entry.error, spinbutton.error:not(.vertical) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]