[gtk/wip/matthiasc/css-change: 25/27] Adwaita: drop backdrop
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/css-change: 25/27] Adwaita: drop backdrop
- Date: Wed, 15 Jan 2020 20:59:53 +0000 (UTC)
commit 686dacf5befb514cdac893adfae39d8aa6c25629
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jan 15 13:43:53 2020 -0500
Adwaita: drop backdrop
gtk/theme/Adwaita/_common.scss | 675 +++--------------------------------------
1 file changed, 35 insertions(+), 640 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 4af9984668..421b05739c 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4,7 +4,6 @@
$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
$asset_suffix: if($variant=='dark', '-dark', '');
-$backdrop_transition: 200ms ease-out;
$button_transition: all 200ms $ease-out-quad;
$button_radius: 5px;
$menu_radius: 5px;
@@ -43,13 +42,6 @@ flowboxchild:focus(visible) {
.background {
color: $fg_color;
background-color: $bg_color;
-
- &:backdrop {
- color: $backdrop_fg_color;
- background-color: $backdrop_bg_color;
- text-shadow: none;
- -gtk-icon-shadow: none;
- }
}
.normal-icons {
@@ -103,12 +95,6 @@ image.drag-icon {
color: $text_color;
background-color: $base_color;
- &:backdrop {
- color: $backdrop_text_color;
- background-color: $backdrop_base_color;
- &:disabled { color: $backdrop_insensitive_color; }
- }
-
&:disabled {
color: $insensitive_fg_color;
background-color: $insensitive_bg_color;
@@ -182,7 +168,6 @@ flowbox {
border-radius: 0;
padding: 0;
- &:backdrop { background-color: if($variant=='light', transparent, darken($backdrop_base_color,5%)); }
&:active, &:selected { background-color: if($variant=='light', transparent, $selected_bg_color); }
&:disabled { background-color: if($variant=='light', transparent, $insensitive_bg_color); }
}
@@ -206,18 +191,8 @@ label {
button & { color: inherit; }
- &:backdrop {
- color: $backdrop_insensitive_color;
-
- button & { color: inherit; }
- }
-
selection { @extend %selected_items_disabled; }
}
-
- &:backdrop {
- selection { @extend %selected_items_backdrop; }
- }
}
.dim-label {
@@ -229,11 +204,6 @@ assistant {
.sidebar {
background-color: $base_color;
border-top: 1px solid $borders_color;
-
- &:backdrop {
- background-color: $backdrop_base_color;
- border-color: $backdrop_borders_color;
- }
}
&.csd .sidebar { border-top-style: none; }
@@ -251,11 +221,6 @@ assistant {
background-clip: padding-box;
text-shadow: 0 1px black;
-gtk-icon-shadow: 0 1px black;
-
- &:backdrop {
- text-shadow: none;
- -gtk-icon-shadow: none;
- }
}
@@ -335,7 +300,7 @@ entry {
}
&.flat {
- &:focus, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ &:focus, &:disabled, & {
min-height: 0;
padding: 2px;
background-color: transparent;
@@ -353,14 +318,6 @@ entry {
&:disabled { @include entry(insensitive); }
- &:backdrop {
- @include entry(backdrop);
-
- transition: $backdrop_transition;
- }
-
- &:backdrop:disabled { @include entry(backdrop-insensitive); }
-
selection { @extend %selected_items; }
// entry error and warning style
@@ -383,7 +340,6 @@ entry {
&:active { color: $selected_bg_color; }
- &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 80%); }
}
&.password image.caps-lock-indicator {
@@ -402,8 +358,6 @@ entry {
&:focus { @include entry(osd-focus); }
- &:backdrop { @include entry(osd-backdrop); }
-
&:disabled { @include entry(osd-insensitive); }
}
}
@@ -421,7 +375,6 @@ entry {
border-style: solid;
box-shadow: none;
- &:backdrop { background-color: transparent; }
}
// linked entries
@@ -448,7 +401,6 @@ entry {
&:not(:disabled) + %entry:not(:disabled) {
border-top-color: mix($borders_color, $base_color, 30%);
- &:backdrop { border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%); }
}
// brighter border between linked insensitive entries
@@ -538,18 +490,12 @@ treeview entry {
background-color: lighten($_entry_tag_bg, 10%);
}
- :backdrop & {
- color: $backdrop_base_color;
- background-color: if($variant=='light', $selected_bg_color,
- mix($backdrop_fg_color, $backdrop_base_color, 50%));
- }
-
&.button {
background-color: transparent;
color: transparentize($_entry_tag_color, 0.3);
}
- :not(:backdrop) &.button {
+ &.button {
&:hover {
border: 1px solid $_entry_tag_bg;
color: $_entry_tag_color;
@@ -614,27 +560,8 @@ button {
transition-duration: 50ms;
}
- &:backdrop {
- &.flat, & {
- @include button(backdrop);
-
- transition: $backdrop_transition;
- -gtk-icon-filter: none;
-
- &:active,
- &:checked { @include button(backdrop-active); }
-
- &:disabled {
- @include button(backdrop-insensitive);
-
- &:active,
- &:checked { @include button(backdrop-insensitive-active); }
- }
- }
- }
-
@at-root %button_basic_flat,
- &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
+ &.flat { &:disabled, { @include button(undecorated); }}
&:disabled {
@include button(insensitive);
@@ -683,7 +610,6 @@ button {
color: $selected_fg_color;
border-color: transparent;
- &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
}
}
}
@@ -726,20 +652,6 @@ button {
border: none;
box-shadow: none;
}
-
- &:disabled {
- &:backdrop, & {
- @include button(osd-insensitive);
-
- border: none;
- }
- }
-
- &:backdrop {
- @include button(osd-backdrop);
-
- border: none;
- }
}
//overlay / OSD style
@@ -750,11 +662,9 @@ button {
&:hover { @include button(osd-hover); }
&:active,
- &:checked { &:backdrop, & { @include button(osd-active); }}
-
- &:disabled { &:backdrop, & { @include button(osd-insensitive); }}
+ &:checked { @include button(osd-active); }
- &:backdrop { @include button(osd-backdrop); }
+ &:disabled { @include button(osd-insensitive);}
&.flat {
@include button(undecorated);
@@ -772,8 +682,6 @@ button {
box-shadow: none;
}
- &:backdrop { @include button(undecorated); }
-
&:active,
&:checked { @include button(osd-active); }
}
@@ -796,29 +704,6 @@ button {
&:active,
&:checked { @include button(active, $b_color, white); }
- &:backdrop,
- &.flat:backdrop {
- @include button(backdrop, $b_color, white);
-
- &:active,
- &:checked { @include button(backdrop-active, $b_color, white); }
-
- &:disabled {
- @include button(backdrop-insensitive);
-
- &:active,
- &:checked { @include button(backdrop-insensitive-active, $b_color, white); }
- }
- }
-
- &.flat {
- &:backdrop, &:disabled, &:backdrop:disabled {
- @include button(undecorated);
-
- color: transparentize($b_color, 0.2);
- }
- }
-
&:disabled {
@include button(insensitive);
@@ -832,11 +717,9 @@ button {
&:hover { @include button(osd-hover, $b_color); }
&:active,
- &:checked { &:backdrop, & { @include button(osd-active, $b_color); }}
+ &:checked { @include button(osd-active, $b_color); }
- &:disabled { &:backdrop, & { @include button(osd-insensitive, $b_color); }}
-
- &:backdrop { @include button(osd-backdrop, $b_color); }
+ &:disabled { @include button(osd-insensitive, $b_color); }
}
}
}
@@ -927,8 +810,6 @@ button {
@else { background-position: right 3px, right 2px; }
- &:backdrop { background-size: 6px 6px, 0 0;}
-
&:dir(rtl) {
@if $variant == 'light' { background-position: left 3px, left 4px; }
@@ -954,20 +835,6 @@ button {
&:active,
&:checked { @include button(insensitive-active); }
}
-
- &:backdrop {
- @include button(backdrop);
-
- &:active,
- &:checked { @include button(backdrop-active); }
-
- &:disabled {
- @include button(backdrop-insensitive);
-
- &:active,
- &:checked { @include button(backdrop-insensitive-active); }
- }
- }
}
// More inline toolbar buttons
@@ -1049,14 +916,9 @@ modelbutton.flat,
&:disabled {
color: $insensitive_fg_color;
-
- &:backdrop { color: $backdrop_insensitive_color; }
}
&:selected { @extend %selected_items; }
-
- &:backdrop,
- &:backdrop:hover { @extend %undecorated_button; }
}
modelbutton.flat arrow {
@@ -1087,7 +949,6 @@ button.color {
@if $variant == 'light' {
.osd &, & {
&:disabled,
- &:backdrop,
&:active,
&:checked { colorswatch:only-child { box-shadow: none; }}
}
@@ -1132,9 +993,7 @@ list row button.image-button:not(.flat) {
*:selected & { color: mix($selected_fg_color, $link_color, 80%); }
}
- &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color, 100%), 0.2); }
-
- &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: transparentize($link_color, 0.1); }}
+ &:disabled, { color: transparentize(desaturate($link_color, 100%), 0.2); }
@at-root %link_selected,
&:selected,
@@ -1188,8 +1047,6 @@ spinbutton {
border-radius: 0;
box-shadow: none;
padding: 6px;
-
- &:backdrop:disabled { background-color: transparent; }
}
text {
@@ -1227,21 +1084,6 @@ spinbutton {
box-shadow: inset 0 2px 3px -1px transparentize(black, 0.8);
}
- &:backdrop {
- color: mix($backdrop_fg_color, $backdrop_base_color, 90%);
- background-color: transparent;
- border-color: transparentize($backdrop_borders_color, 0.7);
- transition: $backdrop_transition;
- }
-
- &:backdrop:disabled {
- color: transparentize($backdrop_insensitive_color,0.7);
- background-color: transparent;
- border-style: none none none solid; // It is needed or it gets overridden
-
- &:dir(rtl) { border-style: none solid none none; }
- }
-
&:dir(ltr):last-child { border-radius: 0 $button_radius $button_radius 0; }
&:dir(rtl):first-child { border-radius: $button_radius 0 0 $button_radius; }
@@ -1276,15 +1118,6 @@ spinbutton {
box-shadow: none;
}
- &:backdrop {
- @include button(undecorated);
-
- color: $osd_fg_color;
- border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
- -gtk-icon-shadow: none;
- box-shadow: none;
- }
-
&:disabled {
@include button(undecorated);
@@ -1310,8 +1143,6 @@ spinbutton {
// color
&:disabled { color: $insensitive_fg_color; }
- &:backdrop:disabled { color: $backdrop_insensitive_color; }
-
&:drop(active) {
border-color: transparent;
box-shadow: none;
@@ -1358,8 +1189,6 @@ spinbutton {
&:active { @include button(osd-active); }
&:disabled { @include button(osd-insensitive); }
-
- &:backdrop { @include button(osd-backdrop); }
}
// Misc
@@ -1503,13 +1332,6 @@ searchbar {
border-color: $borders_color;
$_bg: mix($bg_color, $borders_color, 70%);
background-color: $_bg;
-
- &:backdrop {
- border-color: $backdrop_borders_color;
- background-color: $backdrop_dark_fill;
- box-shadow: none;
- transition: $backdrop_transition;
- }
}
@@ -1527,15 +1349,6 @@ headerbar {
@include headerbar_fill(darken($bg_color, 10%));
- &:backdrop {
- border-color: $backdrop_borders_color;
- background-color: $bg_color;
- background-image: none;
- box-shadow: inset 0 1px $top_hilight;
-
- transition: $backdrop_transition;
- }
-
> box.start,
> box.end {
border-spacing: 6px;
@@ -1562,9 +1375,6 @@ headerbar {
background: if($variant == 'light', image(darken($bg_color, 17%)), image(darken($bg_color, 9%)));
border-color: darken($borders_color, 3%);
border-top-color: darken($borders_color, 8%);
- &:backdrop {
- @include button(backdrop-active);
- }
}
.selection-mode &,
@@ -1577,17 +1387,6 @@ headerbar {
@include headerbar_fill($selected_bg_color, $_hc);
- &:backdrop {
- background-color: $selected_bg_color;
- background-image: none;
- box-shadow: inset 0 1px mix($top_hilight, $selected_bg_color, 60%);
-
- label {
- text-shadow: none;
- color: $selected_fg_color;
- }
- }
-
.subtitle:link { @extend %link_selected; }
button {
@@ -1601,36 +1400,8 @@ headerbar {
&:active,
&:checked { @include button(active, $selected_bg_color, $selected_fg_color); }
- &:backdrop {
- &.flat, & {
- @include button(backdrop, $selected_bg_color, $selected_fg_color);
-
- -gtk-icon-filter: none;
- border-color: $selected_borders_color;
-
- &:active,
- &:checked {
- @include button(backdrop-active, $selected_bg_color, $selected_fg_color);
-
- border-color: $selected_borders_color;
- }
-
- &:disabled {
- @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color);
-
- border-color: $selected_borders_color;
-
- &:active, &:checked {
- @include button(backdrop-insensitive-active, $selected_bg_color, $selected_fg_color);
-
- border-color: $selected_borders_color;
- }
- }
- }
- }
-
@at-root %selection_mode_button_flat,
- &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
+ &.flat { &:disabled { @include button(undecorated); }}
&:disabled {
@include button(insensitive, $selected_bg_color, $selected_fg_color);
@@ -1661,23 +1432,11 @@ headerbar {
border-color: $selected_borders_color;
}
-
- &:backdrop {
- @include button(backdrop);
-
- border-color: $selected_borders_color;
- }
-
- &:backdrop:disabled {
- @include button(backdrop-insensitive);
-
- border-color: $selected_borders_color;
- }
}
}
.selection-menu {
- &:backdrop, & {
+ & {
border-color: transparentize($selected_bg_color, 1);
background-color: transparentize($selected_bg_color, 1);
background-image: none;
@@ -1702,7 +1461,7 @@ headerbar {
.tiled-bottom &,
.maximized &,
.fullscreen & {
- &:backdrop, & {
+ & {
border-radius: 0;
}
}
@@ -1730,7 +1489,7 @@ headerbar {
separator.titlebutton { opacity: 0; } /* hide the close button separator */
.solid-csd & {
- &:backdrop, & {
+ & {
&:dir(rtl), &:dir(ltr) { // specificity bump
margin-left: -1px;
margin-right: -1px;
@@ -1782,7 +1541,7 @@ headerbar {
.background:not(.tiled-left):not(.maximized):not(.solid-csd) .titlebar,
.background:not(.tiled-right):not(.maximized):not(.solid-csd) .titlebar,
.background:not(.tiled-bottom):not(.maximized):not(.solid-csd) .titlebar {
- &:backdrop, & {
+ & {
border-top-left-radius: 7px;
border-top-right-radius: 7px;
}
@@ -1790,11 +1549,11 @@ headerbar {
headerbar { // headerbar border rounding
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) separator:first-child + &, // tackles
the paned container case
- window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) &:first-child { &:backdrop, & {
border-top-left-radius: 7px; }}
- window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) &:last-child { &:backdrop, & {
border-top-right-radius: 7px; }}
+ window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) &:first-child { & {
border-top-left-radius: 7px; }}
+ window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) &:last-child { & {
border-top-right-radius: 7px; }}
window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack & { // tackles the stacked
headerbars case
&:first-child, &:last-child {
- &:backdrop, & {
+ & {
border-top-left-radius: 7px;
border-top-right-radius: 7px;
}
@@ -1833,11 +1592,6 @@ window.devel {
}
background: $bg_color $gradient;
-
- &:backdrop {
- background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90%
0/256px 256px no-repeat,
- image($bg_color); /* background-color would flash */
- }
}
}
@@ -1889,7 +1643,7 @@ treeview.view {
@extend %selected_items;
}
- &:backdrop, & {
+ & {
border-left-color: mix($selected_fg_color, $selected_bg_color, 50%);
border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly
}
@@ -1900,23 +1654,14 @@ treeview.view {
&:selected {
color: mix($selected_fg_color, $selected_bg_color, 40%);
- &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
}
-
- &:backdrop { color: $backdrop_insensitive_color; }
}
&.separator {
min-height: 2px;
color: $bg_color;
-
- &:backdrop { color: transparentize($bg_color, 0.9); }
}
- &:backdrop {
- border-left-color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
- border-top: $backdrop_bg_color;
- }
&:drop(active) {
box-shadow: none;
}
@@ -1947,12 +1692,10 @@ treeview.view {
&:hover { color: $selected_fg_color; }
- &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 70%); }
}
&:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
- &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 70%); }
}
&.progressbar { // progress bar in treeviews
@@ -1974,21 +1717,8 @@ treeview.view {
background-image: image($base_color);
- &:backdrop {
- @if $variant == 'light' {
- color: $selected_bg_color;
- }
- background-color: $backdrop_base_color;
- }
}
}
-
- &:backdrop {
- @if $variant == 'light' { color: $backdrop_base_color; }
-
- background-image: none;
- box-shadow: none;
- }
}
&.trough { // progress bar trough in treeviews
@@ -2064,20 +1794,7 @@ treeview.view {
background-image: none;
}
- &:backdrop {
- color: mix($backdrop_fg_color, $backdrop_bg_color, 50%);
- border-color: $backdrop_bg_color;
- border-style: none solid solid none;
- background-image: none;
- background-color: $backdrop_base_color;
-
- &:disabled {
- border-color: $backdrop_bg_color;
- background-image: none;
- }
- }
-
- &:last-child { &:backdrop, & { border-right-style: none; }}
+ &:last-child { & { border-right-style: none; }}
}
@@ -2089,7 +1806,6 @@ menubar,
padding: 0px;
box-shadow: inset 0 -1px transparentize(black, 0.9);
- &:backdrop { background-color: $backdrop_bg_color; }
> menuitem {
min-height: 16px;
@@ -2134,7 +1850,6 @@ menu,
border-radius: $menu_radius;
}
- &:backdrop { background-color: $backdrop_menu_color; }
menuitem {
min-height: 16px;
@@ -2149,13 +1864,6 @@ menu,
&:disabled {
color: $insensitive_fg_color;
- &:backdrop { color: $backdrop_insensitive_color; }
- }
-
- &:backdrop,
- &:backdrop:hover {
- color: $backdrop_fg_color;
- background-color: transparent;
}
// submenu indicators
@@ -2207,8 +1915,6 @@ menu,
&:hover { background-color: mix($fg_color, $base_color, 10%); }
- &:backdrop { background-color: $backdrop_menu_color; }
-
&:disabled {
color: transparent;
background-color: transparent;
@@ -2244,11 +1950,6 @@ popover.background {
border: 1px solid $borders_color;
box-shadow: 0 1px 2px transparentize(black, 0.7);
- &:backdrop {
- background-color: $backdrop_bg_color;
- border-color: $backdrop_borders_color;
- box-shadow: none;
- }
}
> contents {
@@ -2298,10 +1999,6 @@ notebook {
border-width: 1px;
background-color: $dark_fill;
- &:backdrop {
- border-color: $backdrop_borders_color;
- background-color: $backdrop_dark_fill;
- }
tabs { margin: -1px; }
@@ -2312,8 +2009,6 @@ notebook {
> tab {
&:hover { box-shadow: inset 0 -3px $borders_color; }
- &:backdrop { box-shadow: none; }
-
&:checked { box-shadow: inset 0 -3px $selected_bg_color; }
}
}
@@ -2326,8 +2021,6 @@ notebook {
> tab {
&:hover { box-shadow: inset 0 3px $borders_color; }
- &:backdrop { box-shadow: none; }
-
&:checked { box-shadow: inset 0 3px $selected_bg_color; }
}
}
@@ -2340,8 +2033,6 @@ notebook {
> tab {
&:hover { box-shadow: inset -3px 0 $borders_color; }
- &:backdrop { box-shadow: none; }
-
&:checked { box-shadow: inset -3px 0 $selected_bg_color; }
}
}
@@ -2354,8 +2045,6 @@ notebook {
> tab {
&:hover { box-shadow: inset 3px 0 $borders_color; }
- &:backdrop { box-shadow: none; }
-
&:checked { box-shadow: inset 3px 0 $selected_bg_color; }
}
}
@@ -2416,7 +2105,7 @@ notebook {
min-width: 16px;
border-radius: 0;
- &:hover:not(:active):not(:backdrop) {
+ &:hover:not(:active) {
background-clip: padding-box;
background-image: none;
background-color: transparentize(white, 0.7);
@@ -2449,15 +2138,6 @@ notebook {
}
}
- &:backdrop {
- color: mix($backdrop_fg_color, $backdrop_bg_color, 60%);
-
- &.reorderable-page {
- border-color: transparent;
- background-color: transparent;
- }
- }
-
&:checked {
color: $fg_color;
&.reorderable-page {
@@ -2468,20 +2148,11 @@ notebook {
}
}
- &:backdrop:checked {
- color: $backdrop_fg_color;
-
- &.reorderable-page {
- border-color: $backdrop_borders_color;
- background-color: $backdrop_bg_color;
- }
- }
-
// colors the button like the label, overridden otherwise
button.flat {
&:hover { color: currentColor; }
- &, &:backdrop { color: gtkalpha(currentColor, 0.3); }
+ & { color: gtkalpha(currentColor, 0.3); }
padding: 0;
margin-top: 4px;
@@ -2554,8 +2225,6 @@ notebook {
> stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
background-color: $base_color;
-
- &:backdrop { background-color: $backdrop_base_color; }
}
}
@@ -2575,12 +2244,6 @@ scrollbar {
&.left { border-right: 1px solid $borders_color; }
&.right { border-left: 1px solid $borders_color; }
- &:backdrop {
- background-color: $backdrop_scrollbar_bg_color;
- border-color: $backdrop_borders_color;
- transition: $backdrop_transition;
- }
-
// slider
slider {
min-width: 6px;
@@ -2595,8 +2258,6 @@ scrollbar {
&:hover:active { background-color: $scrollbar_slider_active_color; }
- &:backdrop { background-color: $backdrop_scrollbar_slider_color; }
-
&:disabled { background-color: transparent; }
}
@@ -2695,17 +2356,6 @@ scrollbar {
color: transparentize($scrollbar_slider_color, 0.8);
}
- &:backdrop {
- @include button(undecorated);
-
- color: $backdrop_scrollbar_slider_color;
-
- &:disabled {
- @include button(undecorated);
-
- color: transparentize($backdrop_scrollbar_slider_color, 0.8);
- }
- }
}
// button icons
@@ -2761,27 +2411,6 @@ switch {
text-shadow: none;
}
- &:backdrop {
- color: $backdrop_fg_color;
- border-color: $backdrop_borders_color;
- background-color: $backdrop_dark_fill;
- text-shadow: none;
- transition: $backdrop_transition;
-
- &:checked {
- @if $variant == 'light' { color: $backdrop_bg_color; }
- border-color: if($variant == 'light', $selected_bg_color,
- $selected_borders_color);
- background-color: $selected_bg_color;
- }
-
- &:disabled {
- color: $backdrop_insensitive_color;
- border-color: $backdrop_borders_color;
- background-color: $insensitive_bg_color;
- }
- }
-
slider {
margin: -1px;
min-width: 24px;
@@ -2813,25 +2442,11 @@ switch {
&:disabled slider { @include button(insensitive); }
- &:backdrop {
- slider {
- transition: $backdrop_transition;
-
- @include button(backdrop);
- }
-
- &:checked slider { border-color: if($variant == 'light', $selected_bg_color, $selected_borders_color); }
-
- &:disabled slider { @include button(backdrop-insensitive); }
- }
-
row:selected & {
@if $variant == 'light' {
box-shadow: none;
border-color: $selected_borders_color;
- &:backdrop { border-color: $selected_borders_color; }
-
slider { &:checked, & { border-color: $selected_borders_color; } }
}
}
@@ -2850,11 +2465,9 @@ switch {
('', 'none', 'transparent', '#{transparentize($selected_bg_color, .05)}'),
(':hover', 'none', 'transparent', '#{transparentize($selected_bg_color, .05)}'),
(':active', 'none', 'transparent', '#{transparentize($selected_bg_color, .05)}'),
- (':backdrop', 'none', 'transparent', '#{transparentize(desaturate($selected_bg_color, 100%), .05)}'),
(':checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}',
'#{transparentize($selected_bg_color, .05)}'),
(':checked:hover', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}',
'#{transparentize($selected_bg_color, .05)}'),
- (':checked:active', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}',
'#{transparentize($selected_bg_color, .05)}'),
- (':backdrop:checked', '-gtk-icontheme(\'object-select-symbolic\')', '#{transparentize($osd_fg_color,
0.2)}', '#{transparentize(desaturate($selected_bg_color, 100%), .05)}'), {
+ (':checked:active', '-gtk-icontheme(\'object-select-symbolic\')', '#{$osd_fg_color}',
'#{transparentize($selected_bg_color, .05)}'), {
.view.content-view.check#{$check_state}:not(list),
.content-view .tile check#{$check_state}:not(list) {
@@ -2898,9 +2511,7 @@ radio {
@each $state, $t in ("", "normal"),
(":hover", "hover"),
(":active", "active"),
- (":disabled", "insensitive"),
- (":backdrop", "backdrop"),
- (":backdrop:disabled", 'backdrop-insensitive') {
+ (":disabled", "insensitive") {
&#{$state} {
@include check($t, $_c);
}
@@ -2914,9 +2525,7 @@ radio {
@each $state, $t in ("", "normal"),
(":hover", "hover"),
(":active", "active"),
- (":disabled", "insensitive"),
- (":backdrop", "backdrop"),
- (":backdrop:disabled", 'backdrop-insensitive') {
+ (":disabled", "insensitive") {
&#{$state} {
@include check($t, $checkradio_bg_color, $checkradio_fg_color, $checked: true);
}
@@ -2925,8 +2534,6 @@ radio {
}
}
- &:backdrop { transition: $backdrop_transition; }
-
@if $variant == 'light' {
// the borders of the light variant versions of checks and radios are too similar in luminosity to the
selected background
// color, hence we need special casing.
@@ -2938,7 +2545,6 @@ radio {
&:hover { @include button(osd); }
&:active { @include button(osd-active); }
- &:backdrop { @include button(osd-backdrop); }
&:disabled { @include button(osd-insensitive); }
}
@@ -2988,15 +2594,15 @@ radio {
// ANIMATION:
// this is made with those pretty convoluted transitions, since checks and radios have to animate only on
state changes,
// the transformation is set on the active state and it get reset on the checked state.
-radio:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: scale(0); }
+radio:not(:indeterminate):not(:checked):active { -gtk-icon-transform: scale(0); }
-check:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: translate(6px, -3px)
rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); }
+check:not(:indeterminate):not(:checked):active { -gtk-icon-transform: translate(6px, -3px) rotate(-45deg)
scaleY(0.2) rotate(45deg) scaleX(0); }
radio,
check {
&:active { -gtk-icon-transform: scale(0, 1); } // should tackle the indeterminate state, untested
- &:checked:not(:backdrop), &:indeterminate:not(:backdrop) {
+ &:checked, &:indeterminate {
-gtk-icon-transform: unset;
transition: 400ms;
}
@@ -3006,7 +2612,7 @@ menu menuitem {
@at-root %menu_check_radio,
radio,
check {
- &:checked:not(:backdrop), &:indeterminate:not(:backdrop) { transition: none; }
+ &:checked, &:indeterminate { transition: none; }
}
}
@@ -3034,14 +2640,6 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work
&:disabled { background-color: $insensitive_bg_color; }
- &:backdrop {
- background-color: $backdrop_dark_fill;
- border-color: $backdrop_borders_color;
- transition: $backdrop_transition;
-
- &:disabled { background-color: $insensitive_bg_color; }
- }
-
// ...on selected list rows
row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
@@ -3064,15 +2662,6 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work
border-color: transparent;
}
- &:backdrop {
- border-color: if($variant=='light', $selected_bg_color,
- $selected_borders_color);
- &:disabled {
- background-color: transparent;
- border-color: transparent;
- }
- }
-
// ...on selected list rows
row:selected & { &:disabled, & { border-color: $selected_borders_color; }}
@@ -3148,10 +2737,8 @@ scale {
fill {
@extend %scale_trough;
- &:backdrop, & { background-color: $borders_color; }
-
&:disabled {
- &:backdrop, & {
+ & {
border-color: transparent;
background-color: transparent;
}
@@ -3162,7 +2749,7 @@ scale {
background-color: mix($osd_fg_color, $osd_borders_color, 25%);
&:disabled {
- &:backdrop, & {
+ & {
border-color: transparent;
background-color: transparent;
}
@@ -3184,14 +2771,6 @@ scale {
&:disabled { @include button(insensitive); }
- &:backdrop {
- transition: $backdrop_transition;
-
- @include button(backdrop);
-
- &:disabled { @include button(backdrop-insensitive); }
- }
-
// ...on selected list rows
row:selected & { &:disabled, & { border-color: $selected_borders_color; } }
@@ -3215,16 +2794,6 @@ scale {
@include button(osd-insensitive);
background-color: opacify($osd_bg_color, 1); // solid background needed here
}
-
- &:backdrop {
- @include button(osd-backdrop);
- background-color: opacify($osd_bg_color, 1); // solid background needed here
-
- &:disabled {
- @include button(osd-backdrop-insensitive);
- background-color: opacify($osd_bg_color, 1); // solid background needed here
- }
- }
}
}
@@ -3290,9 +2859,7 @@ scale {
@each $state, $state_infix in ('', ''),
(':hover', '-hover'),
(':active', '-active'),
- (':disabled', '-insensitive'),
- (':backdrop', '-backdrop'),
- (':backdrop:disabled', '-backdrop-insensitive') {
+ (':disabled', '-insensitive') {
&.#{$dir_class}.#{$marks_class} {
slider {
@@ -3389,7 +2956,7 @@ scale {
slider {
&:dir(ltr), &:dir(rtl) { // specificity bumb
- &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ &:hover, &:disabled, & {
margin-bottom: -15px;
margin-top: 6px;
}
@@ -3409,7 +2976,7 @@ scale {
}
slider {
- &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ &:hover, &:disabled, & {
margin-left: -15px;
margin-right: 6px;
}
@@ -3427,7 +2994,7 @@ scale {
}
slider {
- &:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
+ &:hover, &:disabled, & {
margin-right: -15px;
margin-left: 6px;
}
@@ -3513,11 +3080,6 @@ progressbar {
font-size: smaller;
color: transparentize($fg_color, 0.6);
- &:backdrop {
- box-shadow: none;
- transition: $backdrop_transition;
- }
-
trough { @extend %scale_trough; }
progress {
@@ -3528,12 +3090,6 @@ progressbar {
border-color: $insensitive_fg_color;
}
- &:backdrop:disabled {
- background-color: $backdrop_insensitive_color;
- border-color: $backdrop_insensitive_color;
- }
-
-
border-radius: 1.5px;
&.left {
@@ -3646,9 +3202,6 @@ levelbar {
}
}
- &:backdrop { transition: $backdrop_transition; }
-
-
// trough
trough {
padding: 0;
@@ -3662,29 +3215,22 @@ levelbar {
&.low {
border-color: if($variant == 'light', darken($warning_color, 10%), $borders_color);
background-color: $warning_color;
-
- &:backdrop { border-color:if($variant == 'light', $warning_color, $borders_color); };
}
&.high,
&:not(.empty) {
border-color: if($variant == 'light', darken($selected_bg_color, 10%), $borders_color);
background-color: $selected_bg_color;
-
- &:backdrop { border-color:if($variant == 'light', $selected_bg_color, $borders_color); };
}
&.full {
border-color: if($variant == 'light', darken($success_color, 10%), $borders_color);
background-color: $success_color;
-
- &:backdrop { border-color: $success_color; };
}
&.empty {
background-color: darken($bg_color, 5%);
border-color: $borders_color;
- &:backdrop { border-color:if($variant == 'light', transparentize($borders_color,0.7), $borders_color);
};
}
}
}
@@ -3700,11 +3246,6 @@ printdialog {
border: none;
padding: 0;
- &:backdrop {
- color: $backdrop_fg_color;
- border-color: $backdrop_borders_color;
- }
-
paper {
background: white;
color: #2e3436;
@@ -3729,15 +3270,11 @@ frame,
border: 1px solid $borders_color;
&.flat { border-style: none; }
-
- &:backdrop { border-color: $backdrop_borders_color; }
}
actionbar > revealer > box {
padding: 6px;
border-top: 1px solid $borders_color;
-
- &:backdrop { border-color: $backdrop_borders_color; }
}
scrolledwindow {
@@ -3750,26 +3287,18 @@ scrolledwindow {
overshoot {
&.top {
@include overshoot(top);
-
- &:backdrop { @include overshoot(top, backdrop); }
}
&.bottom {
@include overshoot(bottom);
-
- &:backdrop { @include overshoot(bottom, backdrop); }
}
&.left {
@include overshoot(left);
-
- &:backdrop { @include overshoot(left, backdrop); }
}
&.right {
@include overshoot(right);
-
- &:backdrop { @include overshoot(right, backdrop); }
}
}
@@ -3787,19 +3316,6 @@ scrolledwindow {
linear-gradient(to bottom, transparent 1px, $scrollbar_bg_color 1px),
linear-gradient(to left, transparent 1px, $scrollbar_bg_color 1px);
}
-
- &:backdrop {
- transition: $backdrop_transition;
- background: $backdrop_borders_color,
- linear-gradient(to bottom, transparent 1px, $backdrop_scrollbar_bg_color 1px),
- linear-gradient(to right, transparent 1px, $backdrop_scrollbar_bg_color 1px);
-
- &:dir(rtl) {
- background: $backdrop_borders_color,
- linear-gradient(to bottom, transparent 1px, $backdrop_scrollbar_bg_color 1px),
- linear-gradient(to left, transparent 1px, $backdrop_scrollbar_bg_color 1px);
- }
- }
}
}
@@ -3819,12 +3335,6 @@ list {
background-color: $base_color;
border-color: $borders_color;
- &:backdrop {
- color: $backdrop_text_color;
- background-color: $backdrop_base_color;
- border-color: $backdrop_borders_color;
- }
-
row { padding: 2px; }
row.expander { padding: 0px; }
row.expander .row-header { padding: 2px; }
@@ -3839,8 +3349,6 @@ row {
&:hover { transition: none; }
- &:backdrop { transition: $backdrop_transition; }
-
&.activatable {
&.has-open-popup, // this is for indicathing which row generated a popover see
https://bugzilla.gnome.org/show_bug.cgi?id=754411
@@ -3848,15 +3356,11 @@ row {
&:active { box-shadow: inset 0 2px 2px -2px transparentize(black, 0.8); }
- &:backdrop:hover { background-color: transparent; }
-
&:selected {
&:active { box-shadow: inset 0 2px 3px -1px transparentize(black, 0.5); }
&.has-open-popup,
&:hover { background-color: mix($fg_color, $selected_bg_color, 10%); }
-
- &:backdrop { background-color: $selected_bg_color; }
}
}
@@ -3878,11 +3382,6 @@ row {
transparent 2px);
background-clip: padding-box;
- &:backdrop {
- background-image: none;
- transition: $backdrop_transition;
- }
-
button { @extend %osd_button; }
border { border: none; }
@@ -3899,7 +3398,6 @@ expander {
&:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
&:disabled { color: $insensitive_fg_color; }
- &:disabled:backdrop { color: $backdrop_insensitive_color; }
&:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
}
@@ -3933,8 +3431,6 @@ calendar {
&.header {
border-bottom-color: transparentize(black, 0.9);
-
- &:backdrop { border-bottom-color: transparentize(black, 0.9); }
}
&.button {
@@ -3944,20 +3440,11 @@ calendar {
&:hover { color: $fg_color; }
- &:backdrop { color: transparentize($backdrop_fg_color,0.55); }
-
&:disabled { color: transparentize($insensitive_fg_color,0.55); }
}
&.highlight {
color: $insensitive_fg_color;
-
- &:backdrop { color: $backdrop_insensitive_color; }
- }
-
- &:backdrop {
- color: $backdrop_text_color;
- border-color: $backdrop_borders_color;
}
&:indeterminate { color: gtkalpha(currentColor, 0.1); }
@@ -4017,8 +3504,6 @@ messagedialog { // Message Dialog styling
filechooser {
.dialog-action-box {
border-top: 1px solid $borders_color;
-
- &:backdrop { border-top-color: $backdrop_borders_color; }
}
#pathbarbox { border-bottom: 1px solid $bg_color; }
@@ -4058,12 +3543,6 @@ filechooserbutton:drop(active) {
}
}
- &:backdrop {
- background-color: $backdrop_sidebar_bg_color;
- border-color: $backdrop_borders_color;
- transition: $backdrop_transition;
- }
-
list { background-color: transparent; }
paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; }}
@@ -4089,10 +3568,6 @@ stacksidebar {
separator.sidebar {
background-color: $borders_color;
- &:backdrop {
- background-color: $backdrop_borders_color;
- }
-
&.selection-mode,
.selection-mode & {
background-color: darken($selected_bg_color, 20%);
@@ -4125,14 +3600,6 @@ placessidebar {
&:disabled { color: $insensitive_fg_color; }
- &:backdrop {
- color: $backdrop_fg_color;
-
- &:selected { color: $backdrop_selected_fg_color; }
-
- &:disabled { color: $backdrop_insensitive_color; }
- }
-
image.sidebar-icon {
&:dir(ltr) { padding-right: 8px; }
&:dir(rtl) { padding-left: 8px; }
@@ -4155,9 +3622,6 @@ placessidebar {
padding: 0;
border-radius: 100%;
-gtk-outline-radius: 100%;
-
- &:not(:hover):not(:active),
- &:backdrop { > image { opacity: $_placesidebar_icons_opacity; }}
}
// in the sidebar case it makes no sense to click the selected row
@@ -4182,7 +3646,6 @@ placessidebar {
background-color: $drop_target_color;
}
}
- }
}
placesview {
@@ -4220,20 +3683,12 @@ paned {
&:selected { background-image: image($selected_bg_color); } // FIXME is this needed?
- &:backdrop { background-image: image($backdrop_borders_color); }
-
&.wide {
min-width: 5px;
min-height: 5px;
background-color: $bg_color;
background-image: image($borders_color), image($borders_color);
background-size: 1px 1px, 1px 1px;
-
- &:backdrop {
- background-color: $backdrop_bg_color;
- background-image: image($backdrop_borders_color),
- image($backdrop_borders_color);
- }
}
}
@@ -4303,7 +3758,7 @@ infobar {
&.question,
&.warning,
&.error {
- &:backdrop, & {
+ & {
label, & { color: $fg_color; }
background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 45%), 30%),
desaturate(darken(invert($selected_bg_color),40%), 70%));
@@ -4312,7 +3767,6 @@ infobar {
text-shadow: none;
- &:backdrop { text-shadow: none; }
> revealer > box {
padding-top: 8px; padding-bottom: 8px;
border-bottom: 1px solid lighten($borders_color, 5%);
@@ -4330,18 +3784,8 @@ infobar {
&:checked { @include button(active, $bg_color, $fg_color, none); }
&:disabled { @include button(insensitive,$bg_color,$fg_color,none); }
-
- &:backdrop {
- @include button(backdrop, $bg_color, $fg_color, none);
- border-color: _border_color($bg_color);
-
- &:disabled {
- @include button(backdrop-insensitive, $bg_color,
- $fg_color, none);
- border-color: _border_color($bg_color);
- }
}
- &:backdrop, & {
+ & {
label, & { color: $fg_color; }
}
}
@@ -4448,8 +3892,6 @@ colorswatch {
color: white;
&:hover { border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color); }
-
- &:backdrop { color: transparentize(white, 0.5); }
}
}
@@ -4460,8 +3902,6 @@ colorswatch {
color: black;
&:hover { border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); }
-
- &:backdrop { color: transparentize(black, 0.5); }
}
}
@@ -4488,11 +3928,6 @@ colorswatch {
box-shadow: inset 0 1px transparentize(white, 0.6),
inset 0 -1px transparentize(black, 0.8);
}
-
- &:backdrop, &:backdrop:hover {
- border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color);
- box-shadow: none;
- }
}
&#add-color-button {
@@ -4504,8 +3939,6 @@ colorswatch {
@include button(normal);
&:hover { @include button(hover); }
-
- &:backdrop { @include button(backdrop); }
}
}
@@ -4539,8 +3972,6 @@ colorchooser .popover.osd { border-radius: 5px; }
&:hover { -gtk-icon-filter: brightness(1.2); }
- &:backdrop { background-color: darken($bg_color,7%); }
-
rubberband, .rubberband { @extend rubberband; }
}
@@ -4558,8 +3989,6 @@ colorchooser .popover.osd { border-radius: 5px; }
background-color: transparentize($fg_color,0.9);
border-radius: 5px;
}
-
- &:backdrop { &:hover, &:disabled, & { @extend %undecorated_button; }}
}
}
@@ -4575,7 +4004,6 @@ decoration {
// this needs to be transparent
// see bug #722563
$_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
- $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize($borders_color,
0.1));
box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
0 0 0 1px $_wm_border; //doing borders with box-shadow
@@ -4585,17 +4013,6 @@ decoration {
// this is used for the resize cursor area
margin: 10px;
- &:backdrop {
- // the transparent shadow here is to enforce that the shadow extents don't
- // change when we go to backdrop, to prevent jumping windows.
- // The biggest shadow should be in the same order then in the active state
- // or the jumping will happen during the transition.
- box-shadow: 0 3px 9px 1px transparent,
- 0 2px 6px 2px transparentize(black, 0.8),
- 0 0 0 1px $_wm_border_backdrop;
- transition: $backdrop_transition;
- }
-
.maximized &,
.fullscreen &,
.tiled &,
@@ -4633,8 +4050,6 @@ decoration {
border: solid 1px $borders_color;
border-radius: 0;
box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
-
- &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
}
}
@@ -4660,8 +4075,6 @@ button.titlebutton {
@extend %nobg_selected_items;
}
-
- &:backdrop { -gtk-icon-shadow: none; }
}
.selection-mode headerbar button.titlebutton,
@@ -4669,8 +4082,6 @@ button.titlebutton {
headerbar.selection-mode button.titlebutton,
.titlebar.selection-mode button.titlebutton {
@include _button_text_shadow(white, $selected_bg_color);
-
- &:backdrop { -gtk-icon-shadow: none; }
}
@@ -4684,13 +4095,6 @@ headerbar.selection-mode button.titlebutton,
@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;
-
- &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
- }
}
}
@@ -4767,12 +4171,6 @@ shortcut > .keycap {
border-radius: 5px;
box-shadow: if($variant == 'light', inset 0 -3px mix($base_color, $bg_color, 20%), inset 0 -3px
mix($borders_color, $base_color, 60%));
font-size: smaller;
-
- &:backdrop {
- background-color: $backdrop_base_color;
- color: $backdrop_fg_color;
- transition: $backdrop_transition;
- }
}
:not(decoration):not(window):drop(active):focus,
@@ -4843,7 +4241,6 @@ button.emoji-section {
&:dir(ltr):not(:last-child) { margin-right: 0; }
&:dir(rtl):not(:last-child) { margin-left: 0; }
- &:backdrop:not(:checked) { border-color: transparent; }
&:hover { border-color: if($variant == 'light', $borders_color, transparentize($fg_color, .9)); }
&:checked { border-color: $selected_bg_color; }
@@ -4885,8 +4282,6 @@ menubar {
padding: 0px;
box-shadow: inset 0 -1px transparentize(black, 0.9);
- &:backdrop { background-color: $backdrop_bg_color; }
-
> item {
min-height: 16px;
padding: 4px 8px;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]