* Rewirte spinbutton and linked entry, button. Implement inline-toolbar button linked.

This commit is contained in:
Megax
2016-05-15 13:58:00 +02:00
parent 94e5f7a717
commit 3cb2ee87da
3 changed files with 120 additions and 72 deletions
+72 -4
View File
@@ -14,6 +14,11 @@
border-right-width: 0;
border-bottom-right-radius: 0;
border-top-right-radius: 0;
&:dir(rtl) {
border-left-width: 0;
border-right-width: 1px;
}
}
&:last-child {
@@ -22,10 +27,18 @@
border-left-width: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
&:dir(rtl) {
border-left-width: 1px;
border-right-width: 0;
}
}
&:only-child, &:first-child:only-child {
border-width: 1px;
}
&:only-child {
border-width: 1px;
border-radius: $roundness;
}
}
@@ -39,21 +52,36 @@
&:first-child {
border-width: 1px;
border-radius: $roundness;
border-top-width: 1px;
border-bottom-width: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
&:dir(rtl) {
border-top-width: 0;
border-bottom-width: 1px;
}
}
&:last-child {
border-width: 1px;
border-radius: $roundness;
border-top-width: 0;
border-bottom-width: 1px;
border-top-left-radius: 0;
border-top-right-radius: 0;
&:dir(rtl) {
border-top-width: 1px;
border-bottom-width: 0;
}
}
&:only-child, &:first-child:only-child {
border-width: 1px;
}
&:only-child {
border-width: 1px;
border-radius: $roundness;
}
}
@@ -112,8 +140,48 @@
entry {
@include entry($base_color, $text_color);
&.linked, .linked & { @extend %linked_entry; }
.linked:not(.vertical) > & { @extend %linked_entry; }
.linked:not(.vertical) > &:focus + &,
.linked:not(.vertical) > &:focus + button,
.linked:not(.vertical) > &:focus + combobox > box > button.combo { border-left-color: entry_focus_border(); }
&.linked.vertical, .linked.vertical & { @extend %linked_vertical_entry; }
.linked:not(.vertical) > &:drop(active) + &,
.linked:not(.vertical) > &:drop(active) + button,
.linked:not(.vertical) > &:drop(active) + combobox > box > button.combo { border-left-color: $drop_target_color; }
.linked.vertical > & {
@extend %linked_vertical_entry;
// brighter border between linked entries
&:not(:disabled) + entry:not(:disabled) {
border-top-color: mix($borders_color, $base_color, .3);
&:backdrop { border-top-color: mix($backdrop_borders_color, $backdrop_base_color, .3); }
}
// brighter border between linked insensitive entries
&:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, .3); }
// color back the top border of a linked focused entry following another entry.
// :not(:only-child) is a specificity bump hack.
+ entry:focus:not(:only-child) { border-top-color: entry_focus_border(); }
+ entry:drop(active):not(:only-child) { border-top-color: $drop_target_color; }
// this takes care of coloring the top border of the focused entry subsequent widget.
// :not(:only-child) is a specificity bump hack.
&:focus:not(:only-child) {
+ entry,
+ button,
+ combobox > box > button.combo { border-top-color: entry_focus_border(); }
}
&:drop(active):not(:only-child) {
+ entry,
+ button,
+ combobox > box > button.combo { border-top-color: $drop_target_color; }
}
}
}
}