Commit 619c8920 authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'sass-no-extend-compound-master' into 'master'

themes: remove various @extend with compound selectors

See merge request !1223
parents fe385c28 87ea0253
Pipeline #134881 passed with stages
in 21 minutes and 9 seconds
......@@ -196,11 +196,11 @@ label {
button & { color: inherit; }
}
selection { @extend %selected_items:disabled; }
selection { @extend %selected_items_disabled; }
}
&:backdrop {
selection { @extend %selected_items:backdrop; }
selection { @extend %selected_items_backdrop; }
}
}
......@@ -569,6 +569,7 @@ button {
@include button(normal);
@at-root %button_basic_flat,
&.flat {
@include button(undecorated);
// to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set
......@@ -616,6 +617,7 @@ button {
}
}
@at-root %button_basic_flat,
&.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
&:disabled {
......@@ -646,6 +648,7 @@ button {
}
}
@at-root %button_basic_drop_active,
&:drop(active) {
color: $drop_target_color;
border-color: $drop_target_color;
......@@ -656,12 +659,16 @@ button {
@at-root %button_selected, & {
row:selected & {
@if $variant == 'light' { border-color: $selected_borders_color; }
}
&.flat:not(:active):not(:checked):not(:hover):not(disabled) {
color: $selected_fg_color;
border-color: transparent;
@at-root %button_selected_flat, &.flat {
row:selected & {
&:not(:active):not(:checked):not(:hover):not(disabled) {
color: $selected_fg_color;
border-color: transparent;
&:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
&:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
}
}
}
}
......@@ -949,8 +956,15 @@ button {
// More inline toolbar buttons
toolbar.inline-toolbar toolbutton {
&:not(:first-child) > button.flat { @extend %linked:not(:first-child); }
&:not(:last-child) > button.flat { @extend %linked:not(:last-child); }
&:dir(ltr) {
&:not(:first-child) > button.flat { @extend %linked_not_left; }
&:not(:last-child) > button.flat { @extend %linked_not_right; }
}
&:dir(rtl) {
&:not(:first-child) > button.flat { @extend %linked_not_right; }
&:not(:last-child) > button.flat { @extend %linked_not_left; }
}
}
%linked_not_left {
......@@ -977,17 +991,21 @@ toolbar.inline-toolbar toolbutton {
}
}
%linked_not_top {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
%linked_not_bottom {
border-bottom-style: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
%linked_vertical{
&:not(:first-child) {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
&:not(:first-child) { @extend %linked_not_top; }
&:not(:last-child) {
border-bottom-style: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
&:not(:last-child) { @extend %linked_not_bottom; }
}
%undecorated_button {
......@@ -1104,7 +1122,7 @@ button:link,
button:visited {
@extend %undecorated_button;
@extend *:link;
@extend %link;
text-shadow: none;
......@@ -1346,13 +1364,16 @@ combobox {
}
&.linked {
button:nth-child(2) { @extend %linked:not(:first-child); }
button:nth-child(2) {
&:dir(ltr) { @extend %linked_not_left; }
&:dir(rtl) { @extend %linked_not_right; }
}
}
&:drop(active) { // FIXME: untested
box-shadow: none;
button.combo { @extend %button_basic:drop(active); }
button.combo { @extend %button_basic_drop_active; }
}
}
......@@ -1361,13 +1382,20 @@ combobox {
// https://bugzilla.gnome.org/show_bug.cgi?id=733979
.linked:not(.vertical) > combobox {
&:not(:first-child) > box > button.combo { @extend %linked:not(:first-child); }
&:not(:last-child) > box > button.combo { @extend %linked:not(:last-child); }
&:dir(ltr) {
&:not(:first-child) > box > button.combo { @extend %linked_not_left; }
&:not(:last-child) > box > button.combo { @extend %linked_not_right; }
}
&:dir(rtl) {
&:not(:first-child) > box > button.combo { @extend %linked_not_right; }
&:not(:last-child) > box > button.combo { @extend %linked_not_left; }
}
}
.linked.vertical > combobox {
&:not(:first-child) > box > button.combo { @extend %linked_vertical:not(:first-child); }
&:not(:last-child) > box > button.combo { @extend %linked_vertical:not(:last-child); }
&:not(:first-child) > box > button.combo { @extend %linked_not_top; }
&:not(:last-child) > box > button.combo { @extend %linked_not_bottom; }
}
......@@ -1537,11 +1565,12 @@ headerbar {
}
}
.subtitle:link { @extend *:link:selected; }
.subtitle:link { @extend %link_selected; }
button {
@include button(normal, $selected_bg_color, $selected_fg_color);
@at-root %selection_mode_button_flat,
&.flat { @include button(undecorated); }
&:hover { @include button(hover, $selected_bg_color, $selected_fg_color); }
......@@ -1577,6 +1606,7 @@ headerbar {
}
}
@at-root %selection_mode_button_flat,
&.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
&:disabled {
......@@ -2354,7 +2384,7 @@ notebook {
> tabs > arrow {
@extend %button_basic;
@extend %button_basic.flat;
@extend %button_basic_flat;
min-height: 16px;
min-width: 16px;
......@@ -4075,9 +4105,9 @@ placessidebar {
}
@at-root button.sidebar-button {
@extend %button_basic.flat;
@extend %button_basic_flat;
@extend %button_selected.flat;
@extend %button_selected_flat;
min-height: 26px;
min-width: 26px;
......@@ -4569,7 +4599,7 @@ decoration {
button.titlebutton {
@extend %button_basic;
@extend %button_basic.flat;
@extend %button_basic_flat;
@include _button_text_shadow;
......@@ -4583,7 +4613,7 @@ button.titlebutton {
}
.selection-mode & {
@extend %button.flat.suggested-action;
@extend %selection_mode_button_flat;
@extend %nobg_selected_items;
}
......@@ -4609,8 +4639,10 @@ headerbar.selection-mode button.titlebutton,
@at-root %nobg_selected_items, & {
color: $selected_fg_color;
@at-root %selected_items_disabled,
&:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
@at-root %selected_items_backdrop,
&:backdrop {
color: $backdrop_selected_fg_color;
......
This diff is collapsed.
This diff is collapsed.
......@@ -105,6 +105,7 @@ flowboxchild:focus {
color: $insensitive_fg_color;
background-color: $insensitive_bg_color;
}
@at-root %view_selected,
&:selected,
&:selected:focus,
&:selected:hover { @extend %selected_items; }
......@@ -410,6 +411,7 @@ button {
}
}
@at-root %button_basic_flat,
&.flat {
@include button(undecorated);
......@@ -467,6 +469,7 @@ button {
}
}
@at-root %button_basic_drop_active,
&:drop(active) {
color: $fg_color;
border-color: $fg_color;
......@@ -477,12 +480,16 @@ button {
@at-root %button_selected, & {
row:selected & {
@if $variant == 'light' { border-color: $selected_borders_color; }
}
&.flat:not(:active):not(:checked):not(:hover):not(disabled) {
color: $selected_fg_color;
border-color: transparent;
@at-root %button_selected_flat, &.flat {
row:selected & {
&:not(:active):not(:checked):not(:hover):not(disabled) {
color: $selected_fg_color;
border-color: transparent;
&:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
&:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
}
}
}
}
......@@ -738,8 +745,15 @@ button {
// More inline toolbar buttons
toolbar.inline-toolbar toolbutton {
&:not(:first-child) > button.flat { @extend %linked:not(:first-child); }
&:not(:last-child) > button.flat { @extend %linked:not(:last-child); }
&:dir(ltr) {
&:not(:first-child) > button.flat { @extend %linked_not_left; }
&:not(:last-child) > button.flat { @extend %linked_not_right; }
}
&:dir(rtl) {
&:not(:first-child) > button.flat { @extend %linked_not_right; }
&:not(:last-child) > button.flat { @extend %linked_not_left; }
}
}
%linked_not_left {
......@@ -766,17 +780,21 @@ toolbar.inline-toolbar toolbutton {
}
}
%linked_not_top {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
%linked_not_bottom {
border-bottom-style: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
%linked_vertical{
&:not(:first-child) {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
&:not(:first-child) { @extend %linked_not_top; }
&:not(:last-child) {
border-bottom-style: none;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
&:not(:last-child) { @extend %linked_not_bottom; }
}
%undecorated_button {
......@@ -790,6 +808,7 @@ toolbar.inline-toolbar toolbutton {
}
/* menu buttons */
%modelbutton_flat,
modelbutton.flat,
.menuitem.button.flat {
min-height: 26px;
......@@ -1089,13 +1108,16 @@ combobox {
}
&.linked {
button:nth-child(2) { @extend %linked:not(:first-child); }
button:nth-child(2) {
&:dir(ltr) { @extend %linked_not_left; }
&:dir(rtl) { @extend %linked_not_right; }
}
}
&:drop(active) { // FIXME: untested
box-shadow: none;
button.combo { @extend %button_basic:drop(active); }
button.combo { @extend %button_basic_drop_active; }
}
}
......@@ -1104,13 +1126,20 @@ combobox {
// https://bugzilla.gnome.org/show_bug.cgi?id=733979
.linked:not(.vertical) > combobox {
&:not(:first-child) > box > button.combo { @extend %linked:not(:first-child); }
&:not(:last-child) > box > button.combo { @extend %linked:not(:last-child); }
&:dir(ltr) {
&:not(:first-child) > box > button.combo { @extend %linked_not_left; }
&:not(:last-child) > box > button.combo { @extend %linked_not_right; }
}
&:dir(rtl) {
&:not(:first-child) > box > button.combo { @extend %linked_not_right; }
&:not(:last-child) > box > button.combo { @extend %linked_not_left; }
}
}
.linked.vertical > combobox {
&:not(:first-child) > box > button.combo { @extend %linked_vertical:not(:first-child); }
&:not(:last-child) > box > button.combo { @extend %linked_vertical:not(:last-child); }
&:not(:first-child) > box > button.combo { @extend %linked_not_top; }
&:not(:last-child) > box > button.combo { @extend %linked_not_bottom; }
}
......@@ -1568,7 +1597,7 @@ popover.background {
list separator { margin: 0px; }
checkbutton,
radiobutton { @extend modelbutton.flat; }
radiobutton { @extend %modelbutton_flat; }
}
/*****************
......@@ -2783,7 +2812,7 @@ expander-widget title:hover > expander {
calendar {
border: 1px solid $borders_color;
&:selected {
@extend .view:selected;
@extend %view_selected;
}
&.button {
@extend %undecorated_button;
......@@ -3007,9 +3036,9 @@ placessidebar {
}
@at-root button.sidebar-button {
@extend %button_basic.flat;
@extend %button_basic_flat;
@extend %button_selected.flat;
@extend %button_selected_flat;
min-height: 26px;
min-width: 26px;
......@@ -3339,7 +3368,7 @@ decoration {
button.titlebutton {
@extend %button_basic;
@extend %button_basic.flat;
@extend %button_basic_flat;
}
/**********************
......
......@@ -184,15 +184,15 @@ button.titlebutton:backdrop:disabled, button:backdrop:disabled { border-width: 2
button.titlebutton:backdrop:disabled:active, button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: #494949; background-image: none; background-color: #090909; }
button.sidebar-button, button.titlebutton, button.flat { border-width: 2px; border-style: solid; color: #fff; background-color: transparent; background-image: none; border-color: transparent; transition: none; }
button.sidebar-button, button.titlebutton, button.flat.titlebutton, button.flat { border-width: 2px; border-style: solid; color: #fff; background-color: transparent; background-image: none; border-color: transparent; transition: none; }
button.sidebar-button:hover, button.titlebutton:hover, button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
button.sidebar-button:hover, button.titlebutton:hover, button.flat.titlebutton:hover, button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: transparent; background-image: none; border-color: transparent; }
button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, button.flat.titlebutton:backdrop, button.flat.titlebutton:disabled, button.flat.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: transparent; background-image: none; border-color: transparent; }
button.titlebutton:hover, button.sidebar-button:hover, button.titlebutton:hover, button:hover, button.flat:hover { border-width: 2px; border-style: solid; color: #fff; background-color: #000; border-color: gray; background-image: none; -gtk-icon-filter: brightness(1.2); }
button.titlebutton:hover, button.flat.titlebutton:hover, button:hover, button.flat:hover { border-width: 2px; border-style: solid; color: #fff; background-color: #000; border-color: gray; background-image: none; -gtk-icon-filter: brightness(1.2); }
button.titlebutton:active, button.titlebutton:checked, button:active, button:checked { border-width: 2px; border-style: solid; background-image: none; color: black; background-color: white; border-color: gray; transition-duration: 50ms; }
......@@ -344,32 +344,32 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
.inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: #494949; background-image: none; background-color: #090909; }
.linked:not(.vertical) > spinbutton:dir(ltr):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:first-child), .linked:not(.vertical) > entry:dir(ltr):not(:first-child), .inline-toolbar button:dir(ltr):not(:first-child), .linked:not(.vertical) > button:dir(ltr):not(:first-child), toolbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(ltr), combobox.linked button:dir(ltr):nth-child(2), .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:last-child), .linked:not(.vertical) > entry:dir(rtl):not(:last-child), .inline-toolbar button:dir(rtl):not(:last-child), .linked:not(.vertical) > button:dir(rtl):not(:last-child), toolbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(rtl), .linked:not(.vertical) > combobox:not(:last-child) > box > button.combo:dir(rtl) { border-top-left-radius: 0; border-bottom-left-radius: 0; }
toolbar.inline-toolbar toolbutton:dir(ltr):not(:first-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(ltr):not(:first-child) > button.flat, toolbar.inline-toolbar toolbutton:dir(rtl):not(:last-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(rtl):not(:last-child) > button.flat, .linked:not(.vertical) > spinbutton:dir(ltr):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:first-child), .linked:not(.vertical) > entry:dir(ltr):not(:first-child), .inline-toolbar button:dir(ltr):not(:first-child), .linked:not(.vertical) > button:dir(ltr):not(:first-child), .linked:not(.vertical) > spinbutton:dir(rtl):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:last-child), .linked:not(.vertical) > entry:dir(rtl):not(:last-child), .inline-toolbar button:dir(rtl):not(:last-child), .linked:not(.vertical) > button:dir(rtl):not(:last-child), combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:dir(ltr):not(:first-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:last-child) > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; }
.linked:not(.vertical) > spinbutton:dir(ltr):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:last-child), .linked:not(.vertical) > entry:dir(ltr):not(:last-child), .inline-toolbar button:dir(ltr):not(:last-child), .linked:not(.vertical) > button:dir(ltr):not(:last-child), toolbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(ltr), .linked:not(.vertical) > combobox:not(:last-child) > box > button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:first-child), .linked:not(.vertical) > entry:dir(rtl):not(:first-child), .inline-toolbar button:dir(rtl):not(:first-child), .linked:not(.vertical) > button:dir(rtl):not(:first-child), toolbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(rtl), combobox.linked button:dir(rtl):nth-child(2), .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo:dir(rtl) { border-right-style: none; border-top-right-radius: 0; border-bottom-right-radius: 0; }
toolbar.inline-toolbar toolbutton:dir(ltr):not(:last-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(ltr):not(:last-child) > button.flat, toolbar.inline-toolbar toolbutton:dir(rtl):not(:first-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(rtl):not(:first-child) > button.flat, .linked:not(.vertical) > spinbutton:dir(ltr):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:last-child), .linked:not(.vertical) > entry:dir(ltr):not(:last-child), .inline-toolbar button:dir(ltr):not(:last-child), .linked:not(.vertical) > button:dir(ltr):not(:last-child), .linked:not(.vertical) > spinbutton:dir(rtl):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:first-child), .linked:not(.vertical) > entry:dir(rtl):not(:first-child), .inline-toolbar button:dir(rtl):not(:first-child), .linked:not(.vertical) > button:dir(rtl):not(:first-child), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:dir(ltr):not(:last-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:first-child) > box > button.combo { border-right-style: none; border-top-right-radius: 0; border-bottom-right-radius: 0; }
.linked.vertical > spinbutton:not(:first-child):not(.vertical), spinbutton.vertical .linked.vertical > text:not(:first-child), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child), .linked.vertical > combobox:not(:first-child) > box > button.combo { border-top-left-radius: 0; border-top-right-radius: 0; }
.linked.vertical > spinbutton:not(:last-child):not(.vertical), spinbutton.vertical .linked.vertical > text:not(:last-child), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child), .linked.vertical > combobox:not(:last-child) > box > button.combo { border-bottom-style: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat, modelbutton.flat:backdrop, popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, modelbutton.flat:backdrop:hover, popover.background checkbutton:backdrop:hover, popover.background radiobutton:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat, popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, popover.background checkbutton:backdrop:hover, popover.background radiobutton:backdrop:hover, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
/* menu buttons */
modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
modelbutton.flat:hover, popover.background checkbutton:hover, popover.background radiobutton:hover, .menuitem.button.flat:hover { background-color: #0d0d0d; }
popover.background checkbutton:hover, popover.background radiobutton:hover, modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #0d0d0d; }
modelbutton.flat check:last-child, popover.background checkbutton check:last-child, popover.background radiobutton check:last-child, modelbutton.flat radio:last-child, popover.background checkbutton radio:last-child, popover.background radiobutton radio:last-child, .menuitem.button.flat check:last-child, .menuitem.button.flat radio:last-child { margin-left: 8px; }
popover.background checkbutton check:last-child, popover.background radiobutton check:last-child, popover.background checkbutton radio:last-child, popover.background radiobutton radio:last-child, modelbutton.flat check:last-child, modelbutton.flat radio:last-child, .menuitem.button.flat check:last-child, .menuitem.button.flat radio:last-child { margin-left: 8px; }
modelbutton.flat check:first-child, popover.background checkbutton check:first-child, popover.background radiobutton check:first-child, modelbutton.flat radio:first-child, popover.background checkbutton radio:first-child, popover.background radiobutton radio:first-child, .menuitem.button.flat check:first-child, .menuitem.button.flat radio:first-child { margin-right: 8px; }
popover.background checkbutton check:first-child, popover.background radiobutton check:first-child, popover.background checkbutton radio:first-child, popover.background radiobutton radio:first-child, modelbutton.flat check:first-child, modelbutton.flat radio:first-child, .menuitem.button.flat check:first-child, .menuitem.button.flat radio:first-child { margin-right: 8px; }
modelbutton.flat arrow, popover.background checkbutton arrow, popover.background radiobutton arrow { background: none; }
modelbutton.flat arrow { background: none; }
modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, popover.background radiobutton arrow:hover { background: none; }
modelbutton.flat arrow:hover { background: none; }
modelbutton.flat arrow.left, popover.background checkbutton arrow.left, popover.background radiobutton arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
modelbutton.flat arrow.right, popover.background checkbutton arrow.right, popover.background radiobutton arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
button.color { padding: 4px; }
......@@ -1148,9 +1148,9 @@ levelbar block.empty { border-width: 1px; border-style: solid; background-color:
levelbar block.empty:backdrop { border-color: rgba(255, 255, 255, 0.15); }
.view:selected, textview text:selected, iconview:selected, calendar:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus, calendar:focus:selected, .view:selected:hover, textview text:selected:hover, iconview:selected:hover, calendar:hover:selected, textview text selection, textview text selection:focus, textview text selection:hover, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, label selection:backdrop, spinbutton:not(.vertical) selection:focus, spinbutton.vertical text selection:focus, spinbutton:not(.vertical) selection, spinbutton.vertical text selection, entry selection:focus, entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, popover.background radiobutton:selected, .menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected { background-color: #ddd; color: #000; }
calendar:selected, .view:selected, textview text:selected, iconview:selected, .view:selected:focus, textview text:selected:focus, iconview:selected:focus, .view:selected:hover, textview text:selected:hover, iconview:selected:hover, textview text selection, textview text selection:focus, textview text selection:hover, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, label selection:backdrop, spinbutton:not(.vertical) selection:focus, spinbutton.vertical text selection:focus, spinbutton:not(.vertical) selection, spinbutton.vertical text selection, entry selection:focus, entry selection, popover.background checkbutton:selected, popover.background radiobutton:selected, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected, row.activatable:selected, .sidebar:selected { background-color: #ddd; color: #000; }
.view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, calendar:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, calendar:backdrop:focus:selected, textview text:backdrop:selected:hover, iconview:backdrop:selected:hover, calendar:backdrop:hover:selected, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label selection:backdrop, spinbutton:not(.vertical) selection:backdrop, spinbutton.vertical text selection:backdrop, entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, popover.background radiobutton:backdrop:selected, .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected { background-color: gray; color: #000; }
calendar:backdrop:selected, .view:backdrop:selected, textview text:backdrop:selected, iconview:backdrop:selected, textview text:backdrop:selected:focus, iconview:backdrop:selected:focus, textview text:backdrop:selected:hover, iconview:backdrop:selected:hover, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label selection:backdrop, spinbutton:not(.vertical) selection:backdrop, spinbutton.vertical text selection:backdrop, entry selection:backdrop, popover.background checkbutton:backdrop:selected, popover.background radiobutton:backdrop:selected, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row.activatable:backdrop:selected, .sidebar:backdrop:selected { background-color: gray; color: #000; }
.monospace { font-family: monospace; }
......
......@@ -184,15 +184,15 @@ button.titlebutton:backdrop:disabled, button:backdrop:disabled { border-width: 2
button.titlebutton:backdrop:disabled:active, button.titlebutton:backdrop:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: silver; background-image: none; background-color: #f6f6f6; }
button.sidebar-button, button.titlebutton, button.flat { border-width: 2px; border-style: solid; color: #000; background-color: transparent; background-image: none; border-color: transparent; transition: none; }
button.sidebar-button, button.titlebutton, button.flat.titlebutton, button.flat { border-width: 2px; border-style: solid; color: #000; background-color: transparent; background-image: none; border-color: transparent; transition: none; }
button.sidebar-button:hover, button.titlebutton:hover, button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
button.sidebar-button:hover, button.titlebutton:hover, button.flat.titlebutton:hover, button.flat:hover { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 500ms; }
button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
button.sidebar-button:hover:active, button.titlebutton:hover:active, button.flat.titlebutton:hover:active, button.flat:hover:active { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: transparent; background-image: none; border-color: transparent; }
button.sidebar-button:backdrop, button.titlebutton:backdrop, button.sidebar-button:disabled, button.titlebutton:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, button.flat.titlebutton:backdrop, button.flat.titlebutton:disabled, button.flat.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, button.flat:backdrop:disabled { border-width: 2px; border-style: solid; color: gray; background-color: transparent; background-image: none; border-color: transparent; }
button.titlebutton:hover, button.sidebar-button:hover, button.titlebutton:hover, button:hover, button.flat:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; border-color: gray; background-image: none; -gtk-icon-filter: brightness(1.2); }
button.titlebutton:hover, button.flat.titlebutton:hover, button:hover, button.flat:hover { border-width: 2px; border-style: solid; color: #000; background-color: #fff; border-color: gray; background-image: none; -gtk-icon-filter: brightness(1.2); }
button.titlebutton:active, button.titlebutton:checked, button:active, button:checked { border-width: 2px; border-style: solid; background-image: none; color: white; background-color: black; border-color: gray; transition-duration: 50ms; }
......@@ -346,32 +346,32 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch
.inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { border-width: 2px; border-style: solid; color: gray; border-color: silver; background-image: none; background-color: #f6f6f6; }
.linked:not(.vertical) > spinbutton:dir(ltr):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:first-child), .linked:not(.vertical) > entry:dir(ltr):not(:first-child), .inline-toolbar button:dir(ltr):not(:first-child), .linked:not(.vertical) > button:dir(ltr):not(:first-child), toolbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(ltr), combobox.linked button:dir(ltr):nth-child(2), .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:last-child), .linked:not(.vertical) > entry:dir(rtl):not(:last-child), .inline-toolbar button:dir(rtl):not(:last-child), .linked:not(.vertical) > button:dir(rtl):not(:last-child), toolbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(rtl), .linked:not(.vertical) > combobox:not(:last-child) > box > button.combo:dir(rtl) { border-top-left-radius: 0; border-bottom-left-radius: 0; }
toolbar.inline-toolbar toolbutton:dir(ltr):not(:first-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(ltr):not(:first-child) > button.flat, toolbar.inline-toolbar toolbutton:dir(rtl):not(:last-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(rtl):not(:last-child) > button.flat, .linked:not(.vertical) > spinbutton:dir(ltr):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:first-child), .linked:not(.vertical) > entry:dir(ltr):not(:first-child), .inline-toolbar button:dir(ltr):not(:first-child), .linked:not(.vertical) > button:dir(ltr):not(:first-child), .linked:not(.vertical) > spinbutton:dir(rtl):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:last-child), .linked:not(.vertical) > entry:dir(rtl):not(:last-child), .inline-toolbar button:dir(rtl):not(:last-child), .linked:not(.vertical) > button:dir(rtl):not(:last-child), combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:dir(ltr):not(:first-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:last-child) > box > button.combo { border-top-left-radius: 0; border-bottom-left-radius: 0; }
.linked:not(.vertical) > spinbutton:dir(ltr):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:last-child), .linked:not(.vertical) > entry:dir(ltr):not(:last-child), .inline-toolbar button:dir(ltr):not(:last-child), .linked:not(.vertical) > button:dir(ltr):not(:last-child), toolbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(ltr), searchbar.inline-toolbar toolbutton:not(:last-child) > button.flat:dir(ltr), .linked:not(.vertical) > combobox:not(:last-child) > box > button.combo:dir(ltr), .linked:not(.vertical) > spinbutton:dir(rtl):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:first-child), .linked:not(.vertical) > entry:dir(rtl):not(:first-child), .inline-toolbar button:dir(rtl):not(:first-child), .linked:not(.vertical) > button:dir(rtl):not(:first-child), toolbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(rtl), searchbar.inline-toolbar toolbutton:not(:first-child) > button.flat:dir(rtl), combobox.linked button:dir(rtl):nth-child(2), .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo:dir(rtl) { border-right-style: none; border-top-right-radius: 0; border-bottom-right-radius: 0; }
toolbar.inline-toolbar toolbutton:dir(ltr):not(:last-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(ltr):not(:last-child) > button.flat, toolbar.inline-toolbar toolbutton:dir(rtl):not(:first-child) > button.flat, searchbar.inline-toolbar toolbutton:dir(rtl):not(:first-child) > button.flat, .linked:not(.vertical) > spinbutton:dir(ltr):not(:last-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(ltr):not(:last-child), .linked:not(.vertical) > entry:dir(ltr):not(:last-child), .inline-toolbar button:dir(ltr):not(:last-child), .linked:not(.vertical) > button:dir(ltr):not(:last-child), .linked:not(.vertical) > spinbutton:dir(rtl):not(:first-child):not(.vertical), spinbutton.vertical .linked:not(.vertical) > text:dir(rtl):not(:first-child), .linked:not(.vertical) > entry:dir(rtl):not(:first-child), .inline-toolbar button:dir(rtl):not(:first-child), .linked:not(.vertical) > button:dir(rtl):not(:first-child), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:dir(ltr):not(:last-child) > box > button.combo, .linked:not(.vertical) > combobox:dir(rtl):not(:first-child) > box > button.combo { border-right-style: none; border-top-right-radius: 0; border-bottom-right-radius: 0; }
.linked.vertical > spinbutton:not(:first-child):not(.vertical), spinbutton.vertical .linked.vertical > text:not(:first-child), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child), .linked.vertical > combobox:not(:first-child) > box > button.combo { border-top-left-radius: 0; border-top-right-radius: 0; }
.linked.vertical > spinbutton:not(:last-child):not(.vertical), spinbutton.vertical .linked.vertical > text:not(:last-child), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child), .linked.vertical > combobox:not(:last-child) > box > button.combo { border-bottom-style: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }
modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat, modelbutton.flat:backdrop, popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, modelbutton.flat:backdrop:hover, popover.background checkbutton:backdrop:hover, popover.background radiobutton:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat, popover.background checkbutton:backdrop, popover.background radiobutton:backdrop, popover.background checkbutton:backdrop:hover, popover.background radiobutton:backdrop:hover, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, button:link, button:visited, button:link:hover, button:link:active, button:visited:hover, button:visited:active, button:link:backdrop, button:visited:backdrop, notebook tab button, row.activatable, row.activatable:backdrop, row.activatable:backdrop:active, row.activatable:backdrop:checked, row.activatable:backdrop:disabled, row.activatable:backdrop:disabled:active, row.activatable:backdrop:disabled:checked, row.activatable:disabled:active, row.activatable:disabled:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:backdrop:hover { background-color: transparent; background-image: none; border-color: transparent; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
/* menu buttons */
modelbutton.flat, popover.background checkbutton, popover.background radiobutton, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
popover.background checkbutton, popover.background radiobutton, modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 3px; outline-offset: -2px; }
modelbutton.flat:hover, popover.background checkbutton:hover, popover.background radiobutton:hover, .menuitem.button.flat:hover { background-color: white; }
popover.background checkbutton:hover, popover.background radiobutton:hover, modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: white; }
modelbutton.flat check:last-child, popover.background checkbutton check:last-child, popover.background radiobutton check:last-child, modelbutton.flat radio:last-child, popover.background checkbutton radio:last-child, popover.background radiobutton radio:last-child, .menuitem.button.flat check:last-child, .menuitem.button.flat radio:last-child { margin-left: 8px; }
popover.background checkbutton check:last-child, popover.background radiobutton check:last-child, popover.background checkbutton radio:last-child, popover.background radiobutton radio:last-child, modelbutton.flat check:last-child, modelbutton.flat radio:last-child, .menuitem.button.flat check:last-child, .menuitem.button.flat radio:last-child { margin-left: 8px; }
modelbutton.flat check:first-child, popover.background checkbutton check:first-child, popover.background radiobutton check:first-child, modelbutton.flat radio:first-child, popover.background checkbutton radio:first-child, popover.background radiobutton radio:first-child, .menuitem.button.flat check:first-child, .menuitem.button.flat radio:first-child { margin-right: 8px; }
popover.background checkbutton check:first-child, popover.background radiobutton check:first-child, popover.background checkbutton radio:first-child, popover.background radiobutton radio:first-child, modelbutton.flat check:first-child, modelbutton.flat radio:first-child, .menuitem.button.flat check:first-child, .menuitem.button.flat radio:first-child { margin-right: 8px; }
modelbutton.flat arrow, popover.background checkbutton arrow, popover.background radiobutton arrow { background: none; }
modelbutton.flat arrow { background: none; }
modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, popover.background radiobutton arrow:hover { background: none; }
modelbutton.flat arrow:hover { background: none; }
modelbutton.flat arrow.left, popover.background checkbutton arrow.left, popover.background radiobutton arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
modelbutton.flat arrow.right, popover.background checkbutton arrow.right, popover.background radiobutton arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }