AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: vertically linked entries fix.

Browse Source 
I was axing the edge hilight on the last linked entry which needs
to be there, fixed.
This commit is contained in:
Lapo Calamandrei 2015-04-22 16:09:29 +02:00
parent 5e5cfc62a9
commit fa1f2c0df6
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/theme/Adwaita/_common.scss
View File

@ -313,11 +313,10 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
.linked.vertical { .linked.vertical {
> .entry { @extend %linked_vertical; } > .entry { @extend %linked_vertical; }
// remove the edge hilight // remove the edge hilight and the focus shadow (unfortunatelly)
> .entry:not(:last-child) { box-shadow: none; } > .entry:not(:last-child) { box-shadow: none; }
// add back the focus shadow on focused entries // add back the focus shadow
> .entry:focus:not(last-child) { box-shadow: entry_focus_shadow(); } > .entry:focus:not(:last-child) { box-shadow: entry_focus_shadow(); }
// brighter border between linked entries // brighter border between linked entries
> .entry:not(:insensitive) + .entry:not(:insensitive) { > .entry:not(:insensitive) + .entry:not(:insensitive) {
@ -330,13 +329,18 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
} }
// color back the top border of a linked focused entry following another entry and add back the focus shadow. // color back the top border of a linked focused entry following another entry and add back the focus shadow.
// :not(:only-child) is a specificity bump hack. > .entry + .entry:focus:not(:last-child) {
> .entry:not(:only-child) + .entry:focus {
border-top-color: entry_focus_border(); border-top-color: entry_focus_border();
box-shadow: entry_focus_shadow(); box-shadow: entry_focus_shadow();
} }
// just recolor the top border on the last focused entry, since we don't reset the shadow here letting that be
// inherited by the entry styling.
> .entry + .entry:focus:last-child {
border-top-color: entry_focus_border();
}
// this takes care of coloring the top border of the focused entry subsequent widget // this takes care of coloring the top border of the focused entry subsequent widget.
// :not(:only-child) is a specificity bump hack.
> .entry:focus:not(:only-child) + .entry, > .entry:focus:not(:only-child) + .entry,
> .entry:focus:not(:only-child) + .button, > .entry:focus:not(:only-child) + .button,
> .entry:focus:not(:only-child) + GtkComboBox > .button, > .entry:focus:not(:only-child) + GtkComboBox > .button,

6
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -296,7 +296,7 @@ GtkTextView {
.linked.vertical > .entry:not(:last-child) { .linked.vertical > .entry:not(:last-child) {
box-shadow: none; } box-shadow: none; }
.linked.vertical > .entry:focus:not(last-child) { .linked.vertical > .entry:focus:not(:last-child) {
box-shadow: inset 0 0 0 1px #215d9c; } box-shadow: inset 0 0 0 1px #215d9c; }
.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) { .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
border-top-color: #252626; border-top-color: #252626;
@ -304,9 +304,11 @@ GtkTextView {
.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop { .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
border-top-color: #272929; border-top-color: #272929;
background-image: linear-gradient(to bottom, #2c2c2c); } background-image: linear-gradient(to bottom, #2c2c2c); }
.linked.vertical > .entry:not(:only-child) + .entry:focus { .linked.vertical > .entry + .entry:focus:not(:last-child) {
border-top-color: #0f2b48; border-top-color: #0f2b48;
box-shadow: inset 0 0 0 1px #215d9c; } box-shadow: inset 0 0 0 1px #215d9c; }
.linked.vertical > .entry + .entry:focus:last-child {
border-top-color: #0f2b48; }
.linked.vertical > .entry:focus:not(:only-child) + .entry, .linked.vertical > .entry:focus:not(:only-child) + .entry,
.linked.vertical > .entry:focus:not(:only-child) + .button, .linked.vertical > .entry:focus:not(:only-child) + .button,
.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .button, .linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .button,

6
gtk/theme/Adwaita/gtk-contained.css
View File

@ -296,7 +296,7 @@ GtkTextView {
.linked.vertical > .entry:not(:last-child) { .linked.vertical > .entry:not(:last-child) {
box-shadow: none; } box-shadow: none; }
.linked.vertical > .entry:focus:not(last-child) { .linked.vertical > .entry:focus:not(:last-child) {
box-shadow: inset 0 0 0 1px #4a90d9; } box-shadow: inset 0 0 0 1px #4a90d9; }
.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) { .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive) {
border-top-color: #e2e2e2; border-top-color: #e2e2e2;
@ -304,9 +304,11 @@ GtkTextView {
.linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop { .linked.vertical > .entry:not(:insensitive) + .entry:not(:insensitive):backdrop {
border-top-color: #e4e4e4; border-top-color: #e4e4e4;
background-image: linear-gradient(to bottom, white); } background-image: linear-gradient(to bottom, white); }
.linked.vertical > .entry:not(:only-child) + .entry:focus { .linked.vertical > .entry + .entry:focus:not(:last-child) {
border-top-color: #4a90d9; border-top-color: #4a90d9;
box-shadow: inset 0 0 0 1px #4a90d9; } box-shadow: inset 0 0 0 1px #4a90d9; }
.linked.vertical > .entry + .entry:focus:last-child {
border-top-color: #4a90d9; }
.linked.vertical > .entry:focus:not(:only-child) + .entry, .linked.vertical > .entry:focus:not(:only-child) + .entry,
.linked.vertical > .entry:focus:not(:only-child) + .button, .linked.vertical > .entry:focus:not(:only-child) + .button,
.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .button, .linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .button,