Commit b23300c8 authored by Lapo Calamandrei's avatar Lapo Calamandrei

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.
parent 7c577ddf
...@@ -266,7 +266,7 @@ entry { ...@@ -266,7 +266,7 @@ entry {
selection:focus { @extend %selected_items; } selection:focus { @extend %selected_items; }
progress { progress {
margin: 1px; margin: 2px -6px;
border-radius: 0; border-radius: 0;
border-width: 0 0 2px; border-width: 0 0 2px;
border-color: $selected_bg_color; border-color: $selected_bg_color;
...@@ -277,10 +277,6 @@ entry { ...@@ -277,10 +277,6 @@ entry {
&:backdrop { background-color: transparent; } &:backdrop { background-color: transparent; }
} }
&:focus progress {
border-bottom-width: 3px;
}
.linked:not(.vertical) > & { @extend %linked; } .linked:not(.vertical) > & { @extend %linked; }
.linked:not(.vertical) > &:focus + entry, .linked:not(.vertical) > &:focus + entry,
.linked:not(.vertical) > &:focus + button, .linked:not(.vertical) > &:focus + button,
......
...@@ -227,7 +227,7 @@ entry, spinbutton:not(.vertical) { ...@@ -227,7 +227,7 @@ entry, spinbutton:not(.vertical) {
background-image: linear-gradient(to bottom, #333636); background-image: linear-gradient(to bottom, #333636);
box-shadow: none; } box-shadow: none; }
entry progress, spinbutton:not(.vertical) progress { entry progress, spinbutton:not(.vertical) progress {
margin: 1px; margin: 2px -6px;
border-radius: 0; border-radius: 0;
border-width: 0 0 2px; border-width: 0 0 2px;
border-color: #215d9c; border-color: #215d9c;
...@@ -237,8 +237,6 @@ entry, spinbutton:not(.vertical) { ...@@ -237,8 +237,6 @@ entry, spinbutton:not(.vertical) {
box-shadow: none; } box-shadow: none; }
entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop { entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop {
background-color: transparent; } 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 { .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; } border-left-color: #0f2b48; }
entry.error, spinbutton.error:not(.vertical) { entry.error, spinbutton.error:not(.vertical) {
......
...@@ -227,7 +227,7 @@ entry, spinbutton:not(.vertical) { ...@@ -227,7 +227,7 @@ entry, spinbutton:not(.vertical) {
background-image: linear-gradient(to bottom, #f1f1f1); background-image: linear-gradient(to bottom, #f1f1f1);
box-shadow: none; } box-shadow: none; }
entry progress, spinbutton:not(.vertical) progress { entry progress, spinbutton:not(.vertical) progress {
margin: 1px; margin: 2px -6px;
border-radius: 0; border-radius: 0;
border-width: 0 0 2px; border-width: 0 0 2px;
border-color: #4a90d9; border-color: #4a90d9;
...@@ -237,8 +237,6 @@ entry, spinbutton:not(.vertical) { ...@@ -237,8 +237,6 @@ entry, spinbutton:not(.vertical) {
box-shadow: none; } box-shadow: none; }
entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop { entry progress:backdrop, spinbutton:not(.vertical) progress:backdrop {
background-color: transparent; } 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 { .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; } border-left-color: #4a90d9; }
entry.error, spinbutton.error:not(.vertical) { entry.error, spinbutton.error:not(.vertical) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment