Mercurial > repos > other > Adwaita-Dark-Green
changeset 43:d8eaee5178b7
Update to GTK 3.22 at revision ecf9c06
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 01 Apr 2017 11:21:01 +0100 |
| parents | 464e0bd93ed9 |
| children | 61cd8144597e |
| files | gtk-3.20/_common.scss gtk-3.20/gtk-contained-dark.css gtk-3.20/gtk-contained.css gtk-3.20/gtk-dark.css gtk-3.20/gtk.css |
| diffstat | 5 files changed, 1613 insertions(+), 1009 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk-3.20/_common.scss Wed Mar 15 20:27:10 2017 +0000 +++ b/gtk-3.20/_common.scss Sat Apr 01 11:21:01 2017 +0100 @@ -31,7 +31,7 @@ // to the adwaita engine: using real CSS properties is faster, // and we don't use any outlines for now. - outline-color: transparentize($fg_color, 0.7); + outline-color: gtkalpha(currentColor, 0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; @@ -98,6 +98,12 @@ &: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; } &:selected { @@ -133,7 +139,6 @@ flowboxchild { padding: 3px; - border-radius: 3px; &:selected { @extend %selected_items; @@ -143,6 +148,17 @@ } } +.content-view .tile { + margin: 2px; + background-color: if($variant=='light', transparent, black); + 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); } +} + label { caret-color: currentColor; // this shouldn't be needed. @@ -200,12 +216,12 @@ .sidebar label.highlight { background-color: mix($bg_color, $fg_color, 80%); } } -%osd, .osd { +%osd, +.osd { color: $osd_fg_color; border: none; background-color: $osd_bg_color; background-clip: padding-box; - outline-color: transparentize($osd_fg_color, 0.7); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; @@ -254,8 +270,8 @@ @include entry(normal); image { // icons inside the entry - &.left { padding-left: 0; padding-right: 6px; } - &.right { padding-left: 6px; padding-right: 0; } + &.left { margin-right: 6px; } + &.right { margin-left: 6px; } } undershoot { @@ -267,7 +283,7 @@ &:focus, & { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } @@ -300,7 +316,7 @@ } } - & image { // entry icons colors + image { // entry icons colors color: mix($fg_color, $base_color, 80%); &:hover { color: $fg_color; } @@ -360,19 +376,15 @@ &:not(:disabled) + entry:not(:disabled), &:not(:disabled) + %entry:not(:disabled) { border-top-color: mix($borders_color, $base_color, 30%); - background-image: linear-gradient(to bottom, $base_color); - - &:backdrop { - border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%); - background-image: linear-gradient(to bottom, $backdrop_base_color); - } + + &:backdrop { border-top-color: mix($backdrop_borders_color, $backdrop_base_color, 30%); } } // brighter border between linked insensitive entries &:disabled + %entry:disabled, &:disabled + entry:disabled { border-top-color: mix($borders_color, $base_color, 30%); } - // 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. // :not(:only-child) is a specificity bump hack. + %entry:focus:not(:only-child), + entry:focus:not(:only-child) { border-top-color: entry_focus_border(); } @@ -560,7 +572,6 @@ color: $osd_fg_color; border-radius: 5px; - outline-color: transparentize($osd_fg_color, 0.7); //FIXME: define a color var? @include button(osd); @@ -743,7 +754,13 @@ } } - //inline-toolbar buttons + // hide separators + &.font, + &.file { separator { background-color: transparent; }} + + &.font { > box > box > label { font-weight: bold; }} + + // inline-toolbar buttons .inline-toolbar &, .inline-toolbar &:backdrop { border-radius: 2px; border-width: 1px; @@ -763,6 +780,35 @@ .linked.vertical > &:active, .linked.vertical > &:checked, .linked.vertical > &:backdrop { @extend %linked_vertical; } + + &.circular { // The Bloody Circul Button + border-radius: 9999px; + -gtk-outline-radius: 9999px; + + label { padding: 0; } + + // the followind code is needed since we use a darker bottom border on buttons, which looks pretty + // bad with a 100% border radius (see https://bugzilla.gnome.org/show_bug.cgi?id=771205 for details), + // so on relevant states we an additional background-image with a gradient clipped on the border-box, + // so setting a transparent border would reveal it. + // FIXME: take care of colored circular button. + $_border_bg: linear-gradient(to top, $alt-borders-color 25%, $borders-color 50%); + + &:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + @include button(normal); + background-image: $button_fill, $_border_bg; + border-color: transparent; + } + + &:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + @include button(hover); + background-image: $button_fill, $_border_bg; + border-color: transparent; + } + + background-origin: padding-box, border-box; + background-clip: padding-box, border-box; + } } %needs_attention { @@ -895,7 +941,7 @@ background-color: transparent; background-image: none; border-color: transparent; - box-shadow: inset 0 1px transparentize(white,1), + box-shadow: inset 0 1px transparentize(white, 1), 0 1px transparentize(white, 1); text-shadow: none; -gtk-icon-shadow: none; @@ -918,13 +964,6 @@ &:backdrop, &:backdrop:hover { @extend %undecorated_button; } - - // FIXME: remove the following when the checks/radios rewrite lands - check:last-child, - radio:last-child { margin-left: 8px; } - - check:first-child, - radio:first-child { margin-right: 8px; } } modelbutton.flat arrow { @@ -946,8 +985,16 @@ @if $variant == 'light' { box-shadow: 0 1px _text_shadow_color(); + .osd & { box-shadow: none; } + } + } + + @if $variant == 'light' { + .osd &, & { &:disabled, - &:backdrop { box-shadow: none; } + &:backdrop, + &:active, + &:checked { colorswatch:only-child { box-shadow: none; }} } } } @@ -956,6 +1003,8 @@ /********* * Links * *********/ + +%link, *:link { color: $link_color; @@ -1000,7 +1049,11 @@ text-shadow: none; } - > label { text-decoration-line: underline; } + > label { + @extend %link; + + text-decoration-line: underline; + } } @@ -1025,6 +1078,8 @@ border: none; border-radius: 0; box-shadow: none; + + &:backdrop:disabled { background-color: transparent; } } button { @@ -1046,7 +1101,10 @@ background-color: $base_hover_color; } - &:disabled { color: transparentize($insensitive_fg_color, 0.7); } + &:disabled { + color: transparentize($insensitive_fg_color, 0.7); + background-color: transparent; + } &:active { background-color: transparentize(black, 0.9); @@ -1062,11 +1120,15 @@ &:backdrop:disabled { color: transparentize($backdrop_insensitive_color,0.7); - background-image: none; + 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 3px 3px 0; } + + &:dir(rtl):first-child { border-radius: 3px 0 0 3px; } } } @@ -1112,7 +1174,7 @@ box-shadow: none; } - &:last-child { border-radius: 0 3px 3px 0; } + &:dir(ltr):last-child { border-radius: 0 3px 3px 0; } &:dir(rtl):first-child { border-radius: 3px 0 0 3px; } } @@ -1127,6 +1189,7 @@ // FIXME: this should not be set at all, but otherwise it gets the wrong // color &:disabled { color: $insensitive_fg_color; } + &:backdrop:disabled { color: $backdrop_insensitive_color; } &:drop(active) { @@ -1323,7 +1386,7 @@ min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: $borders_color; + border-color: $alt_borders_color; border-radius: 0; @include headerbar_fill; @@ -1338,9 +1401,9 @@ } .title { - font-weight: bold; padding-left: 12px; padding-right: 12px; + font-weight: bold; } .subtitle { @@ -1355,8 +1418,8 @@ $_hc: mix($top_hilight,$selected_bg_color, 50%); // hilight color color: $selected_fg_color; + border-color: $selected_borders_color; text-shadow: 0 -1px transparentize(black, 0.5); - border-color: $selected_borders_color; @include headerbar_fill($selected_bg_color, $_hc); @@ -1455,7 +1518,8 @@ .selection-menu { &:backdrop, & { border-color: transparentize($selected_bg_color, 1); - background-image: linear-gradient(to bottom, transparentize($selected_bg_color, 1)); + background-color: transparentize($selected_bg_color, 1); + background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; @@ -1475,8 +1539,8 @@ .maximized & { &:backdrop, & { border-radius: 0; }} // squared corners when the window is maximized or tiled &.default-decoration { + min-height: 28px; padding: 4px; - min-height: 28px; button.titlebutton { min-height: 26px; @@ -1485,6 +1549,18 @@ padding: 0; } } + + .solid-csd & { + &:backdrop, & { + &:dir(rtl), &:dir(ltr) { // specificity bump + margin-left: -1px; + margin-right: -1px; + margin-top: -1px; + border-radius: 0; + box-shadow: none; + } + } + } } headerbar { @@ -1502,18 +1578,25 @@ } } -.background:not(.tiled):not(.maximized) .titlebar { +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { &:backdrop, & { border-top-left-radius: 7px; border-top-right-radius: 7px; } } -headerbar { - window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case - window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }} - - window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }} +headerbar { // headerbar border rounding + window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + &, // tackles the paned container case + window:not(.tiled):not(.maximized):not(.solid-csd) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }} + window:not(.tiled):not(.maximized):not(.solid-csd) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }} + window:not(.tiled):not(.maximized):not(.solid-csd) stack & { // tackles the stacked headerbars case + &:first-child, &:last-child { + &:backdrop, & { + border-top-left-radius: 7px; + border-top-right-radius: 7px; + } + } + } } .titlebar:not(headerbar) { @@ -1527,7 +1610,7 @@ box-shadow: none; } - > separator { background-color: $borders_color; } + > separator { background-color: $borders_color; } // FIXME: use darker border? @extend %titlebar; } @@ -1574,7 +1657,7 @@ -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; - } + } border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color, border-top-color: $bg_color; // while this is the grid lines color, better then nothing @@ -1631,9 +1714,9 @@ &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - color: mix($fg_color, $base_color, 70%); - - &:hover { color: $fg_color; } + color: mix($text_color, $base_color, 70%); + + &:hover { color: $text_color; } &:selected { color: mix($selected_fg_color, $selected_bg_color, 70%); @@ -1656,11 +1739,9 @@ background-color: $selected_bg_color; background-image: linear-gradient(to bottom, $selected_bg_color, - darken($selected_bg_color,10%)); - box-shadow: inset 0 1px if($variant=='light', transparentize(white,0.7), - transparentize(white,0.85)), - 0 1px if($variant=='light', transparentize(black, 0.8), - transparentize(black,0.9)); + darken($selected_bg_color, 10%)); + box-shadow: inset 0 1px if($variant=='light', transparentize(white, 0.7), transparentize(white, 0.85)), + 0 1px if($variant=='light', transparentize(black, 0.8), transparentize(black, 0.9)); &:selected { &:focus, & { @@ -1673,9 +1754,7 @@ @else { box-shadow: inset 0 1px transparentize(white, 0.95); } - background-image: linear-gradient(to bottom, - $base_color, - darken($base_color,10%)); + background-image: linear-gradient(to bottom, $base_color, darken($base_color,10%)); &:backdrop { @if $variant == 'light' { @@ -1755,14 +1834,14 @@ header.button.dnd { // for treeview-like derive widgets &:active, &:selected, &:hover, & { padding: 0 6px; - transition: none; + color: $base_color; background-image: none; background-color: $selected_bg_color; - color: $base_color; + border-style: none; border-radius: 0; - border-style: none; box-shadow: inset 0 0 0 1px $base_color; text-shadow: none; + transition: none; } } @@ -1771,11 +1850,11 @@ %column_header_button { padding: 0 6px; - border-radius: 0; background-image: none; - text-shadow: none; border-style: none solid solid none; border-color: $bg_color; + border-radius: 0; + text-shadow: none; &:disabled { border-color: $bg_color; @@ -1783,9 +1862,9 @@ } &:backdrop { + color: mix($backdrop_fg_color, $backdrop_bg_color, 50%); border-color: $backdrop_bg_color; border-style: none solid solid none; - color: mix($backdrop_fg_color, $backdrop_bg_color, 50%); background-image: none; background-color: $backdrop_base_color; @@ -1967,9 +2046,6 @@ separator { margin: 3px; } list separator { margin: 0px; } - - checkbutton, - radiobutton { @extend modelbutton.flat; } } /************* @@ -2409,9 +2485,9 @@ &.horizontal { button { - &.down { -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); } - - &.up { -gtk-icon-source: -gtk-icontheme('pan-left-symbolic'); } + &.down { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } + + &.up { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); } } } } @@ -2428,22 +2504,18 @@ font-weight: bold; font-size: smaller; outline-offset: -4px; - box-shadow: inset 0 1px transparentize(black, 0.9), // needs to be set here - _widget_edge(transparent); // otherwise it gets - // clipped + // similar to the .scale border: 1px solid $borders_color; border-radius: 3px; color: $fg_color; - background-image: linear-gradient(to bottom, mix($bg_color, $borders_color, 60%)); + background-color: $dark_fill; text-shadow: 0 1px transparentize(black, 0.9); &:checked { - color: white; + color: $selected_fg_color; border-color: $selected_borders_color; background-color: $selected_bg_color; - background-image: none; - box-shadow: _widget_edge(transparent); text-shadow: 0 1px transparentize($selected_borders_color, 0.5), 0 0 2px transparentize(white, 0.4); } @@ -2451,17 +2523,14 @@ &:disabled { color: $insensitive_fg_color; border-color: $borders_color; - background-image: none; background-color: $insensitive_bg_color; - box-shadow: _widget_edge(transparent); text-shadow: none; } &:backdrop { color: $backdrop_fg_color; border-color: $backdrop_borders_color; - background-image: linear-gradient(to bottom, $backdrop_dark_fill); - box-shadow: none; + background-color: $backdrop_dark_fill; text-shadow: none; transition: $backdrop_transition; @@ -2469,16 +2538,14 @@ @if $variant == 'light' { color: $backdrop_bg_color; } border-color: if($variant == 'light', $selected_bg_color, $selected_borders_color); - background-image: linear-gradient(to bottom, $selected_bg_color); - box-shadow: none; + background-color: $selected_bg_color; } - } - - &:disabled { - color: $backdrop_insensitive_color; - border-color: $backdrop_borders_color; - background-image: none; - background-color: $insensitive_bg_color; + + &:disabled { + color: $backdrop_insensitive_color; + border-color: $backdrop_borders_color; + background-color: $insensitive_bg_color; + } } slider { @@ -2542,11 +2609,17 @@ (':checked:hover', '-checked-hover-selectionmode'), (':checked:active', '-checked-active-selectionmode'), (':backdrop:checked', '-checked-backdrop-selectionmode') { - .view.content-view.check#{$s}:not(list) { + .view.content-view.check#{$s}:not(list), + .content-view .tile check#{$s}:not(list) { -gtk-icon-shadow: none; - -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"), - url("assets/checkbox#{$as}@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"), url("assets/checkbox#{$as}@2.png")); background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } } @@ -2612,7 +2685,6 @@ -gtk-icon-shadow: none; color: inherit; border-color: currentColor; - animation: none; } } } @@ -2639,34 +2711,28 @@ -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); } } -// let's animate things -@keyframes check_check { - from { -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } - to { -gtk-icon-transform: unset; } -} - -@keyframes check_radio { - from { -gtk-icon-transform: scale(0); } - to { -gtk-icon-transform: unset; } +// 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); } + +check:not(:indeterminate):not(:checked):active:not(:backdrop) { -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) { + -gtk-icon-transform: unset; + transition: 400ms; + } } -@keyframes check_indeterminate { - from { -gtk-icon-transform: scale(0, 1); } - to { -gtk-icon-transform: unset; } -} - -check:not(:indeterminate):checked { animation: check_check 400ms; } - -radio:not(:indeterminate):checked { animation: check_radio 400ms; } - -check:indeterminate:checked, radio:indeterminate:checked { animation: check_indeterminate 400ms; } - -// no animations in menus menu menuitem { - check:not(:indeterminate):checked, - radio:not(:indeterminate):checked, - check:indeterminate:checked:active, - radio:indeterminate:checked { animation: none; } + radio, + check { + &:checked:not(:backdrop), &:indeterminate:not(:backdrop) { transition: none; } + } } treeview.view check, @@ -2698,35 +2764,24 @@ border: 1px solid $borders_color; border-radius: 3px; background-color: $dark_fill; - box-shadow: inset 1px 1px transparentize(black, 0.9); - - &:disabled { - background-color: $insensitive_bg_color; - box-shadow: none; - } + + &:disabled { background-color: $insensitive_bg_color; } &:backdrop { background-color: $backdrop_dark_fill; border-color: $backdrop_borders_color; - box-shadow: none; transition: $backdrop_transition; &:disabled { background-color: $insensitive_bg_color; } } // ...on selected list rows - row:selected & { - box-shadow: none; - - &, &:disabled { border-color: $selected_borders_color; } - } + row:selected & { &:disabled, & { border-color: $selected_borders_color; }} // OSD .osd & { border-color: $osd_borders_color; background-color: transparentize($osd_borders_color, 0.2); - box-shadow: none; - outline-color: transparentize($osd_fg_color, 0.8); &:disabled { background-color: $osd_insensitive_bg_color; } } @@ -2752,7 +2807,7 @@ } // ...on selected list rows - row:selected & { &:disabled, & { border-color: $selected_borders_color; } } + row:selected & { &:disabled, & { border-color: $selected_borders_color; }} // OSD .osd & { @@ -2824,13 +2879,10 @@ fill { @extend %scale_trough; - &, &:backdrop { - background-color: $borders_color; - box-shadow: none; - } + &:backdrop, & { background-color: $borders_color; } &:disabled { - &, &:backdrop { + &:backdrop, & { border-color: transparent; background-color: transparent; } @@ -2841,7 +2893,7 @@ background-color: mix($osd_fg_color, $osd_borders_color, 25%); &:disabled { - &, &:backdrop { + &:backdrop, & { border-color: transparent; background-color: transparent; } @@ -2852,7 +2904,7 @@ slider { @include button(normal-alt, $edge: $shadow_color); - border: 1px solid darken($borders_color, 3%); + border: 1px solid darken($alt_borders_color, 3%); border-radius: 100%; transition: $button_transition; transition-property: background, border, box-shadow; @@ -2861,7 +2913,7 @@ &:active { border-color: $selected_borders_color; } - &:disabled { @include button (insensitive); } + &:disabled { @include button(insensitive); } &:backdrop { transition: $backdrop_transition; @@ -2872,7 +2924,7 @@ } // ...on selected list rows - row:selected & { &, &:disabled { border-color: $selected_borders_color; } } + row:selected & { &:disabled, & { border-color: $selected_borders_color; } } // OSD .osd & { @@ -2880,24 +2932,37 @@ border-color: darken($osd_borders_color, 3%); background-color: opacify($osd_bg_color, 1); // solid background needed here - &:hover { @include button(osd-hover); } - - &:active { @include button(osd-active); } - - &:disabled { @include button(osd-insensitive); } + &:hover { + @include button(osd-hover); + background-color: opacify($osd_bg_color, 1); // solid background needed here + } + + &:active { + @include button(osd-active); + background-color: opacify($osd_bg_color, 1); // solid background needed here + } + + &:disabled { + @include button(osd-insensitive); + background-color: opacify($osd_bg_color, 1); // solid background needed here + } &:backdrop { @include button(osd-backdrop); - - &:disabled { @include button(osd-backdrop-insensitive); } + 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 + } } } } - value { color: gtkalpha(currentColor, 0.4); } + value { color: gtkalpha(currentColor, 0.55); } marks { - color: gtkalpha(currentColor, 0.4); + color: gtkalpha(currentColor, 0.55); @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), (bottom, bottom, top), @@ -2921,6 +2986,7 @@ } } } + &.horizontal { indicator { min-height: $_marks_lenght; @@ -2929,6 +2995,7 @@ &.fine-tune indicator { min-height: ($_marks_lenght - 3px); } } + &.vertical { indicator { min-height: 1px; @@ -2937,6 +3004,7 @@ &.fine-tune indicator { min-width: ($_marks_lenght - 3px); } } + // *WARNING* scale with marks madness following // FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those... @@ -2963,6 +3031,7 @@ border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png')); $_scale_slider_bg_pos: bottom; @@ -3029,7 +3098,7 @@ min-width: 0; trough { - background-image: linear-gradient(to top, $borders_color); + background-image: image($borders_color); background-repeat: no-repeat; } @@ -3219,6 +3288,8 @@ border-radius: 0; } } + + trough.empty progress { all: unset; } // makes the progress indicator disappear, when the fraction is 0 } @@ -3254,9 +3325,6 @@ block { border: 1px solid; border-radius: 1px; - box-shadow: 0 1px transparentize(black, 0.8); - - &:backdrop { box-shadow: none; } &.low { border-color: if($variant == 'light', darken($warning_color, 20%), $warning_color); @@ -3283,7 +3351,6 @@ &.empty { background-color: transparent; border-color: if($variant == 'light', transparentize($fg_color,0.8), transparentize($fg_color,0.9)); - box-shadow: none; &:backdrop { border-color: transparentize($backdrop_fg_color,0.85); } } @@ -3917,11 +3984,9 @@ // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is // applied to the overlay box. - &, &:drop(active) { border-style: none; } // FIXME: implement a proper drop(active) state + &:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state $_colorswatch_radius: 5px; - $_colorswatch_overlay_shadow: if($variant == 'light', inset 0 2px 2px -3px transparentize(black, 0.3), - inset 0 3px 2px -2px transparentize(black, 0.5)); // base color corners rounding // to avoid the artifacts caused by rounded corner anti-aliasing the base color @@ -4003,10 +4068,12 @@ } overlay { - box-shadow: $_colorswatch_overlay_shadow; border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color); - &:hover { box-shadow: inset 0 1px transparentize(white, 0.7); } + &:hover { + 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); @@ -4060,7 +4127,7 @@ &:backdrop { background-color: darken($bg_color,7%); } - rubberband { @extend rubberband; } + rubberband, .rubberband { @extend rubberband; } } .scale-popup { @@ -4127,7 +4194,7 @@ .csd.popup & { border-radius: 0; box-shadow: 0 1px 2px transparentize(black, 0.8), - 0 0 0 1px transparentize($_wm_border,0.1); + 0 0 0 1px transparentize($_wm_border, 0.1); } tooltip.csd & { @@ -4138,15 +4205,18 @@ messagedialog.csd & { border-radius: 7px; box-shadow: 0 1px 2px transparentize(black, 0.8), - 0 0 0 1px transparentize($_wm_border,0.1); + 0 0 0 1px transparentize($_wm_border, 0.1); } .solid-csd & { + margin: 0; + padding: 4px; + background-color: $borders_color; + border: solid 1px $borders_color; border-radius: 0; - margin: 4px; - background-color: $backdrop_bg_color; - border: solid 1px $backdrop_borders_color; - box-shadow: none; + 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; } } } @@ -4183,8 +4253,6 @@ @at-root %nobg_selected_items, & { color: $selected_fg_color; - @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); } - &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); } &:backdrop { @@ -4195,7 +4263,7 @@ } } -.monospace { font: Monospace; } +.monospace { font-family: monospace; } /********************** @@ -4235,13 +4303,6 @@ .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview -button.circular { // FIXME: aggregate to buttons - border-radius: 9999px; - -gtk-outline-radius: 9999px; - - label { padding: 0; } -} - // shortcut window keys .keycap { min-width: 20px; @@ -4270,6 +4331,7 @@ :not(decoration):not(window):drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die border-color: $drop_target_color; box-shadow: inset 0 0 0 1px $drop_target_color; + caret-color: $drop_target_color; } stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons
--- a/gtk-3.20/gtk-contained-dark.css Wed Mar 15 20:27:10 2017 +0000 +++ b/gtk-3.20/gtk-contained-dark.css Sat Apr 01 11:21:01 2017 +0100 @@ -8,7 +8,7 @@ -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; - outline-color: rgba(238, 238, 236, 0.3); + outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; @@ -64,6 +64,17 @@ textview text:backdrop { color: #d3d4d5; background-color: #252a2c; } + .view:backdrop:disabled, iconview:backdrop:disabled, + .view text:backdrop:disabled, + iconview text:backdrop:disabled, + textview text:backdrop:disabled { + color: #566164; } + .view:disabled, iconview:disabled, + .view text:disabled, + iconview text:disabled, + textview text:disabled { + color: #919494; + background-color: #2d3234; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, @@ -80,16 +91,28 @@ rubberband, flowbox rubberband, treeview.view rubberband, -.content-view rubberband { +.content-view rubberband, +.content-view .rubberband { border: 1px solid #184472; background-color: rgba(24, 68, 114, 0.2); } flowbox flowboxchild { - padding: 3px; - border-radius: 3px; } + padding: 3px; } flowbox flowboxchild:selected { outline-offset: -2px; } +.content-view .tile { + margin: 2px; + background-color: black; + border-radius: 0; + padding: 0; } + .content-view .tile:backdrop { + background-color: #1a1d1e; } + .content-view .tile:active, .content-view .tile:selected { + background-color: #215d9c; } + .content-view .tile:disabled { + background-color: #2d3234; } + label { caret-color: currentColor; } label.separator { @@ -125,15 +148,16 @@ background-color: #585d5e; } .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, -.app-notification.frame, .osd .scale-popup, .osd { +.app-notification.frame, .osd .scale-popup, +.osd { color: #eeeeec; border: none; background-color: rgba(28, 31, 32, 0.7); background-clip: padding-box; - outline-color: rgba(238, 238, 236, 0.3); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } - popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { + popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, + .osd:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -170,12 +194,10 @@ box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); } spinbutton:not(.vertical) image.left, entry image.left { - padding-left: 0; - padding-right: 6px; } + margin-right: 6px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 6px; - padding-right: 0; } + margin-left: 6px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; @@ -203,7 +225,7 @@ entry.flat { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), @@ -336,13 +358,11 @@ .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):not(.vertical) { - border-top-color: #212526; - background-image: linear-gradient(to bottom, #232729); } + border-top-color: #212526; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical) { - border-top-color: #24282a; - background-image: linear-gradient(to bottom, #252a2c); } + border-top-color: #24282a; } .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical), .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical), .linked.vertical > entry:disabled + entry:disabled { @@ -585,7 +605,6 @@ min-height: 32px; color: #eeeeec; border-radius: 5px; - outline-color: rgba(238, 238, 236, 0.3); color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; @@ -1144,6 +1163,11 @@ button.needs-attention:checked > image { animation: none; background-image: none; } +button.font separator, +button.file separator { + background-color: transparent; } +button.font > box > box > label { + font-weight: bold; } .inline-toolbar button, .inline-toolbar button:backdrop { @@ -1152,6 +1176,35 @@ .primary-toolbar button { -gtk-icon-shadow: none; } +button.circular { + border-radius: 9999px; + -gtk-outline-radius: 9999px; + background-origin: padding-box, border-box; + background-clip: padding-box, border-box; } + button.circular label { + padding: 0; } + button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); + border-color: #1b1f20; + border-bottom-color: #0b0c0c; + background-image: linear-gradient(to bottom, #2e3436, #2a2e30 60%, #25292b); + text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.82745); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #2e3436, #2a2e30 60%, #25292b), linear-gradient(to top, #0b0c0c 25%, #1b1f20 50%); + border-color: transparent; } + button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); + border-color: #1b1f20; + border-bottom-color: #0b0c0c; + text-shadow: 0 -1px rgba(0, 0, 0, 0.77945); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.77945); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); + background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30), linear-gradient(to top, #0b0c0c 25%, #1b1f20 50%); + border-color: transparent; } .stack-switcher > button.needs-attention > label, @@ -1305,11 +1358,8 @@ border-radius: 3px; border-style: solid; } -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, +modelbutton.flat, +.menuitem.button.flat, 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:link:checked, @@ -1324,46 +1374,24 @@ -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, 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, + modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #3f4649; } - 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; } - 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; } -modelbutton.flat arrow, popover.background checkbutton arrow, -popover.background radiobutton arrow { +modelbutton.flat arrow { background: none; } - modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, - popover.background radiobutton arrow:hover { + modelbutton.flat arrow:hover { background: none; } - modelbutton.flat arrow.left, popover.background checkbutton arrow.left, - popover.background radiobutton arrow.left { + 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 { + modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } button.color { @@ -1374,40 +1402,77 @@ /********* * Links * *********/ -*:link, button:link, +button:link > label, +button:visited > label, +*:link, +button:link, button:visited { color: #4a90d9; } + button:link > label:visited, + button:visited > label:visited, *:link:visited, button:visited { color: #2a76c6; } - *:selected *:link:visited, *:selected button:visited:link, + *:selected button:link > label:visited, + *:selected button:visited > label:visited, *:selected + *:link:visited, *:selected + button:visited:link, *:selected button:visited { color: #a6bed7; } - *:link:hover, button:hover:link, + button:link > label:hover, + button:visited > label:hover, + *:link:hover, + button:hover:link, button:hover:visited { color: #74aae2; } - *:selected *:link:hover, *:selected button:hover:link, + *:selected button:link > label:hover, + *:selected button:visited > label:hover, *:selected + *:link:hover, *:selected + button:hover:link, *:selected button:hover:visited { color: #e9eff5; } - *:link:active, button:active:link, + button:link > label:active, + button:visited > label:active, + *:link:active, + button:active:link, button:active:visited { color: #4a90d9; } - *:selected *:link:active, *:selected button:active:link, + *:selected button:link > label:active, + *:selected button:visited > label:active, *:selected + *:link:active, *:selected + button:active:link, *:selected button:active:visited { color: #d3dfeb; } - *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link, - button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, - button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, - headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, + button:link > label:backdrop:backdrop:hover, + button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, + button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, + button:visited > label:backdrop, + *:link:backdrop:backdrop:hover, + button:backdrop:backdrop:hover:link, + button:backdrop:backdrop:hover:visited, + *:link:backdrop:backdrop:hover:selected, + button:backdrop:backdrop:hover:selected:link, + button:backdrop:backdrop:hover:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, + headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, + *:link:backdrop, + button:backdrop:link, button:backdrop:visited { color: #215d9c; } infobar.info *:link, infobar.info button:link, infobar.info button:visited, infobar.question *:link, infobar.question button:link, infobar.question button:visited, infobar.warning *:link, infobar.warning button:link, infobar.warning button:visited, infobar.error *:link, infobar.error button:link, - infobar.error button:visited, *:link:selected, button:selected:link, - button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link, - headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, + infobar.error button:visited, button:link > label:selected, + button:visited > label:selected, *:selected button:link > label, + *:selected button:visited > label, + *:link:selected, + button:selected:link, + button:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:link, + headerbar.selection-mode .subtitle:link, *:selected + *:link, *:selected + button:link, *:selected button:visited { color: #d3dfeb; } @@ -1436,6 +1501,8 @@ border: none; border-radius: 0; box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } spinbutton:not(.vertical) button { min-height: 16px; margin: 0; @@ -1453,7 +1520,8 @@ color: #eeeeec; background-color: rgba(238, 238, 236, 0.05); } spinbutton:not(.vertical) button:disabled { - color: rgba(145, 148, 148, 0.3); } + color: rgba(145, 148, 148, 0.3); + background-color: transparent; } spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } @@ -1464,10 +1532,14 @@ transition: 200ms ease-out; } spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(86, 97, 100, 0.3); - background-image: none; + background-color: transparent; border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 3px 3px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 3px 0 0 3px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; @@ -1517,7 +1589,7 @@ border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } - .osd spinbutton:not(.vertical) button:last-child { + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } @@ -1672,7 +1744,7 @@ min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: #1b1f20; + border-color: #0b0c0c; border-radius: 0; background: #2c3133 linear-gradient(to top, #25292b, #2a2e30 2px, #2c3133 3px); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); } @@ -1685,9 +1757,9 @@ transition: 200ms ease-out; } .titlebar:not(headerbar) .title, headerbar .title { - font-weight: bold; padding-left: 12px; - padding-right: 12px; } + padding-right: 12px; + font-weight: bold; } .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; @@ -1696,8 +1768,8 @@ .selection-mode.titlebar:not(headerbar), headerbar.selection-mode { color: #ffffff; + border-color: #0f2b48; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); - border-color: #0f2b48; background: #215d9c linear-gradient(to top, #1e5690, #205b98 2px, #215d9c 3px); box-shadow: inset 0 1px rgba(40, 98, 159, 0.535); } .selection-mode.titlebar:backdrop:not(headerbar), @@ -1913,7 +1985,8 @@ headerbar.selection-mode .selection-menu:backdrop, headerbar.selection-mode .selection-menu { border-color: rgba(33, 93, 156, 0); - background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0)); + background-color: rgba(33, 93, 156, 0); + background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; } @@ -1935,14 +2008,24 @@ border-radius: 0; } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { - padding: 4px; - min-height: 28px; } + min-height: 28px; + padding: 4px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } + .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd + headerbar:backdrop:dir(rtl), .solid-csd + headerbar:backdrop:dir(ltr), .solid-csd + headerbar:dir(rtl), .solid-csd + headerbar:dir(ltr) { + margin-left: -1px; + margin-right: -1px; + margin-top: -1px; + border-radius: 0; + box-shadow: none; } headerbar entry, headerbar spinbutton, @@ -1954,13 +2037,16 @@ margin-top: 9px; margin-bottom: 9px; } -.background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar { +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { border-top-left-radius: 7px; border-top-right-radius: 7px; } -window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child { +window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child { border-top-left-radius: 7px; } -window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { +window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child { + border-top-right-radius: 7px; } +window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child { + border-top-left-radius: 7px; border-top-right-radius: 7px; } window.csd > .titlebar:not(headerbar) { @@ -2037,11 +2123,11 @@ border-bottom-style: none; } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #b1b2b2; } + color: #bdbebf; } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { - color: #eeeeec; } + color: white; } treeview.view.expander:selected { color: #bccee1; } treeview.view.expander:selected:hover { @@ -2096,31 +2182,31 @@ treeview.view header.button.dnd:hover, treeview.view header.button.dnd { padding: 0 6px; - transition: none; + color: #232729; background-image: none; background-color: #215d9c; - color: #232729; + border-style: none; border-radius: 0; - border-style: none; box-shadow: inset 0 0 0 1px #232729; - text-shadow: none; } + text-shadow: none; + transition: none; } treeview.view acceleditor > label { background-color: #215d9c; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; + background-image: none; + border-style: none solid solid none; + border-color: #33393b; border-radius: 0; - background-image: none; - text-shadow: none; - border-style: none solid solid none; - border-color: #33393b; } + text-shadow: none; } treeview.view header button:disabled { border-color: #33393b; background-image: none; } treeview.view header button:backdrop { + color: #626768; border-color: #33393b; border-style: none solid solid none; - color: #626768; background-image: none; background-color: #252a2c; } treeview.view header button:backdrop:disabled { @@ -2615,9 +2701,9 @@ scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } scrollbar.horizontal button.down { - -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } scrollbar.horizontal button.up { - -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } treeview ~ scrollbar.vertical { border-top: 1px solid #1b1f20; @@ -2630,42 +2716,34 @@ font-weight: bold; font-size: smaller; outline-offset: -4px; - box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px transparent; border: 1px solid #1b1f20; border-radius: 3px; color: #eeeeec; - background-image: linear-gradient(to bottom, #292f30); + background-color: #272c2e; text-shadow: 0 1px rgba(0, 0, 0, 0.1); } switch:checked { - color: white; + color: #ffffff; border-color: #0f2b48; background-color: #215d9c; - background-image: none; - box-shadow: 0 1px transparent; text-shadow: 0 1px rgba(15, 43, 72, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { color: #919494; border-color: #1b1f20; - background-image: none; background-color: #2d3234; - box-shadow: 0 1px transparent; text-shadow: none; } switch:backdrop { color: #919494; border-color: #202425; - background-image: linear-gradient(to bottom, #2c3233); - box-shadow: none; + background-color: #2c3233; text-shadow: none; transition: 200ms ease-out; } switch:backdrop:checked { border-color: #0f2b48; - background-image: linear-gradient(to bottom, #215d9c); - box-shadow: none; } - switch:disabled { - color: #566164; - border-color: #202425; - background-image: none; - background-color: #2d3234; } + background-color: #215d9c; } + switch:backdrop:disabled { + color: #566164; + border-color: #202425; + background-color: #2d3234; } switch slider { margin: -1px; min-width: 44px; @@ -2719,45 +2797,101 @@ /************************* * Check and Radio items * *************************/ -.view.content-view.check:not(list), iconview.content-view.check:not(list) { +.view.content-view.check:not(list), iconview.content-view.check:not(list), +.content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) { +.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list), +.content-view .tile check:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list) { +.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list), +.content-view .tile check:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) { +.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list), +.content-view .tile check:backdrop:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) { +.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list), +.content-view .tile check:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) { +.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list), +.content-view .tile check:checked:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) { +.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list), +.content-view .tile check:checked:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) { +.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list), +.content-view .tile check:backdrop:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } checkbutton.text-button, radiobutton.text-button { padding: 2px 0; @@ -2901,8 +3035,7 @@ box-shadow: none; -gtk-icon-shadow: none; color: inherit; - border-color: currentColor; - animation: none; } + border-color: currentColor; } check { border-radius: 3px; } @@ -2921,35 +3054,25 @@ radio:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")), -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); } -@keyframes check_check { - from { - -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_radio { - from { - -gtk-icon-transform: scale(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_indeterminate { - from { - -gtk-icon-transform: scale(0, 1); } - to { - -gtk-icon-transform: unset; } } -check:not(:indeterminate):checked { - animation: check_check 400ms; } +radio:not(:indeterminate):not(:checked):active:not(:backdrop) { + -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); } -radio:not(:indeterminate):checked { - animation: check_radio 400ms; } - -check:indeterminate:checked, radio:indeterminate:checked { - animation: check_indeterminate 400ms; } +radio:active, +check:active { + -gtk-icon-transform: scale(0, 1); } +radio:checked:not(:backdrop), radio:indeterminate:not(:backdrop), +check:checked:not(:backdrop), +check:indeterminate:not(:backdrop) { + -gtk-icon-transform: unset; + transition: 400ms; } -menu menuitem check:not(:indeterminate):checked, -menu menuitem radio:not(:indeterminate):checked, -menu menuitem check:indeterminate:checked:active, -menu menuitem radio:indeterminate:checked { - animation: none; } +menu menuitem radio:checked:not(:backdrop), menu menuitem radio:indeterminate:not(:backdrop), +menu menuitem check:checked:not(:backdrop), +menu menuitem check:indeterminate:not(:backdrop) { + transition: none; } treeview.view check:selected:focus, treeview.view check:selected, treeview.view radio:selected:focus, @@ -2972,27 +3095,20 @@ scale trough, scale fill, progressbar trough { border: 1px solid #1b1f20; border-radius: 3px; - background-color: #272c2e; - box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } + background-color: #272c2e; } scale trough:disabled, scale fill:disabled, progressbar trough:disabled { - background-color: #2d3234; - box-shadow: none; } + background-color: #2d3234; } scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { background-color: #2c3233; border-color: #202425; - box-shadow: none; transition: 200ms ease-out; } scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { background-color: #2d3234; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { - box-shadow: none; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled { - border-color: #0f2b48; } + row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled, row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { + border-color: #0f2b48; } .osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); - background-color: rgba(0, 0, 0, 0.5); - box-shadow: none; - outline-color: rgba(238, 238, 236, 0.2); } + background-color: rgba(0, 0, 0, 0.5); } .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(49, 52, 52, 0.5); } @@ -3044,15 +3160,14 @@ scale trough { outline-offset: 2px; -gtk-outline-radius: 5px; } - scale fill, scale fill:backdrop { - background-color: #1b1f20; - box-shadow: none; } - scale fill:disabled, scale fill:disabled:backdrop { + scale fill:backdrop, scale fill { + background-color: #1b1f20; } + scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; background-color: transparent; } .osd scale fill { background-color: rgba(91, 91, 90, 0.775); } - .osd scale fill:disabled, .osd scale fill:disabled:backdrop { + .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: transparent; } scale slider { @@ -3063,7 +3178,7 @@ -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.82745); background-image: linear-gradient(to bottom, #2c3133 20%, #25292b 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2a2e30, inset 0 -1px #1e2122, 0 1px rgba(0, 0, 0, 0.1); - border: 1px solid #141717; + border: 1px solid #040404; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; } @@ -3100,7 +3215,7 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop:disabled label, scale slider:backdrop:disabled { color: #566164; } - row:selected scale slider, row:selected scale slider:disabled { + row:selected scale slider:disabled, row:selected scale slider { border-color: #0f2b48; } .osd scale slider { color: #eeeeec; @@ -3123,7 +3238,8 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); @@ -3133,7 +3249,8 @@ box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:disabled { color: #858786; border-color: rgba(0, 0, 0, 0.7); @@ -3142,7 +3259,8 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } .osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); @@ -3151,11 +3269,14 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } + .osd scale slider:backdrop:disabled { + background-color: #1c1f20; } scale value { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3194,6 +3315,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3208,6 +3330,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3222,6 +3345,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3236,6 +3360,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3250,6 +3375,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3264,6 +3390,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3278,6 +3405,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3292,6 +3420,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3306,6 +3435,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3320,6 +3450,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3334,6 +3465,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3348,6 +3480,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3362,6 +3495,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3376,6 +3510,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3390,6 +3525,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3404,6 +3540,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3418,6 +3555,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3432,6 +3570,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3446,6 +3585,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3460,6 +3600,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3474,6 +3615,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3488,6 +3630,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3502,6 +3645,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3516,6 +3660,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3530,7 +3675,7 @@ min-height: 0; min-width: 0; } scale.color trough { - background-image: linear-gradient(to top, #1b1f20); + background-image: image(#1b1f20); background-repeat: no-repeat; } scale.color.horizontal { padding: 0 0 15px 0; } @@ -3632,6 +3777,8 @@ progressbar.osd progress { border-style: none; border-radius: 0; } + progressbar trough.empty progress { + all: unset; } /************* * Level Bar * @@ -3663,10 +3810,7 @@ margin: 1px 0; } levelbar block { border: 1px solid; - border-radius: 1px; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); } - levelbar block:backdrop { - box-shadow: none; } + border-radius: 1px; } levelbar block.low { border-color: #f57900; background-color: #f57900; } @@ -3684,8 +3828,7 @@ border-color: #5aa411; } levelbar block.empty { background-color: transparent; - border-color: rgba(238, 238, 236, 0.1); - box-shadow: none; } + border-color: rgba(238, 238, 236, 0.1); } levelbar block.empty:backdrop { border-color: rgba(145, 148, 148, 0.15); } @@ -4221,7 +4364,7 @@ /***************** * Color Chooser * *****************/ -colorswatch, colorswatch:drop(active) { +colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { border-top-left-radius: 5.5px; @@ -4268,10 +4411,9 @@ border-color: #4e9a06; box-shadow: inset 0 0 0 2px #1b1f20, inset 0 0 0 1px #4e9a06; } colorswatch overlay { - box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5); border: 1px solid #1b1f20; } colorswatch overlay:hover { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); } colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { border-color: #1b1f20; box-shadow: none; } @@ -4364,11 +4506,14 @@ border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 31, 32, 0.8); } .solid-csd decoration { + margin: 0; + padding: 4px; + background-color: #1b1f20; + border: solid 1px #1b1f20; border-radius: 0; - margin: 4px; - background-color: #33393b; - border: solid 1px #202425; - box-shadow: none; } + box-shadow: inset 0 0 0 3px #2c3133, inset 0 1px rgba(238, 238, 236, 0.07); } + .solid-csd decoration:backdrop { + box-shadow: inset 0 0 0 3px #33393b, inset 0 1px rgba(238, 238, 236, 0.07); } button.titlebutton { text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); @@ -4393,8 +4538,7 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, -entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, -popover.background radiobutton:selected, +entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { background-color: #215d9c; } row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, @@ -4406,8 +4550,7 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, - entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, - popover.background radiobutton:selected, + entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; } row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, @@ -4417,8 +4560,7 @@ iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, - entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, - popover.background radiobutton:disabled:selected, + entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected { color: #90aece; } row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, @@ -4428,8 +4570,7 @@ iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, - entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, - popover.background radiobutton:backdrop:selected, + entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected { color: #d3d4d5; } row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, @@ -4437,13 +4578,12 @@ iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, - entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, - popover.background radiobutton:backdrop:disabled:selected, + entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #5681ad; } .monospace { - font: Monospace; } + font-family: monospace; } /********************** * Touch Copy & Paste * @@ -4481,12 +4621,6 @@ .context-menu { font: initial; } -button.circular { - border-radius: 9999px; - -gtk-outline-radius: 9999px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; @@ -4509,7 +4643,8 @@ :not(decoration):not(window):drop(active):focus, :not(decoration):not(window):drop(active) { border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + box-shadow: inset 0 0 0 1px #4e9a06; + caret-color: #4e9a06; } stackswitcher button.text-button { min-width: 100px; }
--- a/gtk-3.20/gtk-contained.css Wed Mar 15 20:27:10 2017 +0000 +++ b/gtk-3.20/gtk-contained.css Sat Apr 01 11:21:01 2017 +0100 @@ -8,7 +8,7 @@ -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; - outline-color: rgba(46, 52, 54, 0.3); + outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; @@ -64,6 +64,17 @@ textview text:backdrop { color: #323232; background-color: #fcfcfc; } + .view:backdrop:disabled, iconview:backdrop:disabled, + .view text:backdrop:disabled, + iconview text:backdrop:disabled, + textview text:backdrop:disabled { + color: #c3c3c0; } + .view:disabled, iconview:disabled, + .view text:disabled, + iconview text:disabled, + textview text:disabled { + color: #8b8e8f; + background-color: #f1f1f1; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, @@ -80,16 +91,28 @@ rubberband, flowbox rubberband, treeview.view rubberband, -.content-view rubberband { +.content-view rubberband, +.content-view .rubberband { border: 1px solid #2a76c6; background-color: rgba(42, 118, 198, 0.2); } flowbox flowboxchild { - padding: 3px; - border-radius: 3px; } + padding: 3px; } flowbox flowboxchild:selected { outline-offset: -2px; } +.content-view .tile { + margin: 2px; + background-color: transparent; + border-radius: 0; + padding: 0; } + .content-view .tile:backdrop { + background-color: transparent; } + .content-view .tile:active, .content-view .tile:selected { + background-color: transparent; } + .content-view .tile:disabled { + background-color: transparent; } + label { caret-color: currentColor; } label.separator { @@ -125,15 +148,16 @@ background-color: #c3c4c4; } .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, -.app-notification.frame, .osd .scale-popup, .osd { +.app-notification.frame, .osd .scale-popup, +.osd { color: #eeeeec; border: none; background-color: rgba(28, 31, 32, 0.7); background-clip: padding-box; - outline-color: rgba(238, 238, 236, 0.3); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } - popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { + popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, + .osd:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -170,12 +194,10 @@ box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); } spinbutton:not(.vertical) image.left, entry image.left { - padding-left: 0; - padding-right: 6px; } + margin-right: 6px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 6px; - padding-right: 0; } + margin-left: 6px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; @@ -203,7 +225,7 @@ entry.flat { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), @@ -336,13 +358,11 @@ .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):not(.vertical) { - border-top-color: #e9e9e8; - background-image: linear-gradient(to bottom, #ffffff); } + border-top-color: #e9e9e8; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical) { - border-top-color: #eaeae9; - background-image: linear-gradient(to bottom, #fcfcfc); } + border-top-color: #eaeae9; } .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical), .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical), .linked.vertical > entry:disabled + entry:disabled { @@ -588,7 +608,6 @@ min-height: 32px; color: #eeeeec; border-radius: 5px; - outline-color: rgba(238, 238, 236, 0.3); color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; @@ -1147,6 +1166,11 @@ button.needs-attention:checked > image { animation: none; background-image: none; } +button.font separator, +button.file separator { + background-color: transparent; } +button.font > box > box > label { + font-weight: bold; } .inline-toolbar button, .inline-toolbar button:backdrop { @@ -1155,6 +1179,35 @@ .primary-toolbar button { -gtk-icon-shadow: none; } +button.circular { + border-radius: 9999px; + -gtk-outline-radius: 9999px; + background-origin: padding-box, border-box; + background-clip: padding-box, border-box; } + button.circular label { + padding: 0; } + button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #b6b6b3; + border-bottom-color: #91918c; + background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); + background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd), linear-gradient(to top, #91918c 25%, #b6b6b3 50%); + border-color: transparent; } + button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #b6b6b3; + border-bottom-color: #91918c; + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px white; + background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); + background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd), linear-gradient(to top, #91918c 25%, #b6b6b3 50%); + border-color: transparent; } .stack-switcher > button.needs-attention > label, @@ -1308,11 +1361,8 @@ border-radius: 3px; border-style: solid; } -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, +modelbutton.flat, +.menuitem.button.flat, 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:link:checked, @@ -1327,46 +1377,24 @@ -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, 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, + modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #f4f4f4; } - 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; } - 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; } -modelbutton.flat arrow, popover.background checkbutton arrow, -popover.background radiobutton arrow { +modelbutton.flat arrow { background: none; } - modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, - popover.background radiobutton arrow:hover { + modelbutton.flat arrow:hover { background: none; } - modelbutton.flat arrow.left, popover.background checkbutton arrow.left, - popover.background radiobutton arrow.left { + 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 { + modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } button.color { @@ -1375,46 +1403,85 @@ box-shadow: 0 1px rgba(255, 255, 255, 0.76923); } button.color colorswatch:only-child, button.color colorswatch:only-child overlay { border-radius: 0; } - button.color colorswatch:only-child:disabled, button.color colorswatch:only-child:backdrop { + .osd button.color colorswatch:only-child { box-shadow: none; } + .osd button.color:disabled colorswatch:only-child, .osd button.color:backdrop colorswatch:only-child, .osd button.color:active colorswatch:only-child, .osd button.color:checked colorswatch:only-child, button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child { + box-shadow: none; } /********* * Links * *********/ -*:link, button:link, +button:link > label, +button:visited > label, +*:link, +button:link, button:visited { color: #2a76c6; } + button:link > label:visited, + button:visited > label:visited, *:link:visited, button:visited { color: #215d9c; } - *:selected *:link:visited, *:selected button:visited:link, + *:selected button:link > label:visited, + *:selected button:visited > label:visited, *:selected + *:link:visited, *:selected + button:visited:link, *:selected button:visited { color: #b7d3f0; } - *:link:hover, button:hover:link, + button:link > label:hover, + button:visited > label:hover, + *:link:hover, + button:hover:link, button:hover:visited { color: #4a90d9; } - *:selected *:link:hover, *:selected button:hover:link, + *:selected button:link > label:hover, + *:selected button:visited > label:hover, *:selected + *:link:hover, *:selected + button:hover:link, *:selected button:hover:visited { color: #edf4fb; } - *:link:active, button:active:link, + button:link > label:active, + button:visited > label:active, + *:link:active, + button:active:link, button:active:visited { color: #2a76c6; } - *:selected *:link:active, *:selected button:active:link, + *:selected button:link > label:active, + *:selected button:visited > label:active, *:selected + *:link:active, *:selected + button:active:link, *:selected button:active:visited { color: #dbe9f7; } - *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link, - button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, - button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, - headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, + button:link > label:backdrop:backdrop:hover, + button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, + button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, + button:visited > label:backdrop, + *:link:backdrop:backdrop:hover, + button:backdrop:backdrop:hover:link, + button:backdrop:backdrop:hover:visited, + *:link:backdrop:backdrop:hover:selected, + button:backdrop:backdrop:hover:selected:link, + button:backdrop:backdrop:hover:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, + headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, + *:link:backdrop, + button:backdrop:link, button:backdrop:visited { color: #4a90d9; } infobar.info *:link, infobar.info button:link, infobar.info button:visited, infobar.question *:link, infobar.question button:link, infobar.question button:visited, infobar.warning *:link, infobar.warning button:link, infobar.warning button:visited, infobar.error *:link, infobar.error button:link, - infobar.error button:visited, *:link:selected, button:selected:link, - button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link, - headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, + infobar.error button:visited, button:link > label:selected, + button:visited > label:selected, *:selected button:link > label, + *:selected button:visited > label, + *:link:selected, + button:selected:link, + button:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:link, + headerbar.selection-mode .subtitle:link, *:selected + *:link, *:selected + button:link, *:selected button:visited { color: #dbe9f7; } @@ -1443,6 +1510,8 @@ border: none; border-radius: 0; box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } spinbutton:not(.vertical) button { min-height: 16px; margin: 0; @@ -1460,7 +1529,8 @@ color: #2e3436; background-color: rgba(46, 52, 54, 0.05); } spinbutton:not(.vertical) button:disabled { - color: rgba(139, 142, 143, 0.3); } + color: rgba(139, 142, 143, 0.3); + background-color: transparent; } spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } @@ -1471,10 +1541,14 @@ transition: 200ms ease-out; } spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(195, 195, 192, 0.3); - background-image: none; + background-color: transparent; border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 3px 3px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 3px 0 0 3px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; @@ -1524,7 +1598,7 @@ border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } - .osd spinbutton:not(.vertical) button:last-child { + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } @@ -1679,7 +1753,7 @@ min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: #b6b6b3; + border-color: #91918c; border-radius: 0; background: #f4f4f4 linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } @@ -1692,9 +1766,9 @@ transition: 200ms ease-out; } .titlebar:not(headerbar) .title, headerbar .title { - font-weight: bold; padding-left: 12px; - padding-right: 12px; } + padding-right: 12px; + font-weight: bold; } .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; @@ -1703,8 +1777,8 @@ .selection-mode.titlebar:not(headerbar), headerbar.selection-mode { color: #ffffff; + border-color: #184472; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); - border-color: #184472; background: #4a90d9 linear-gradient(to top, #276fba, #428bd7 2px, #4a90d9 3px); box-shadow: inset 0 1px rgba(146, 188, 232, 0.9); } .selection-mode.titlebar:backdrop:not(headerbar), @@ -1920,7 +1994,8 @@ headerbar.selection-mode .selection-menu:backdrop, headerbar.selection-mode .selection-menu { border-color: rgba(74, 144, 217, 0); - background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0)); + background-color: rgba(74, 144, 217, 0); + background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; } @@ -1942,14 +2017,24 @@ border-radius: 0; } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { - padding: 4px; - min-height: 28px; } + min-height: 28px; + padding: 4px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } + .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd + headerbar:backdrop:dir(rtl), .solid-csd + headerbar:backdrop:dir(ltr), .solid-csd + headerbar:dir(rtl), .solid-csd + headerbar:dir(ltr) { + margin-left: -1px; + margin-right: -1px; + margin-top: -1px; + border-radius: 0; + box-shadow: none; } headerbar entry, headerbar spinbutton, @@ -1961,13 +2046,16 @@ margin-top: 9px; margin-bottom: 9px; } -.background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar { +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { border-top-left-radius: 7px; border-top-right-radius: 7px; } -window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child { +window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child { border-top-left-radius: 7px; } -window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { +window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child { + border-top-right-radius: 7px; } +window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child { + border-top-left-radius: 7px; border-top-right-radius: 7px; } window.csd > .titlebar:not(headerbar) { @@ -2044,11 +2132,11 @@ border-bottom-style: none; } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #6d7172; } + color: #4d4d4d; } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { - color: #2e3436; } + color: black; } treeview.view.expander:selected { color: #c9def4; } treeview.view.expander:selected:hover { @@ -2109,31 +2197,31 @@ treeview.view header.button.dnd:hover, treeview.view header.button.dnd { padding: 0 6px; - transition: none; + color: #ffffff; background-image: none; background-color: #4a90d9; - color: #ffffff; + border-style: none; border-radius: 0; - border-style: none; box-shadow: inset 0 0 0 1px #ffffff; - text-shadow: none; } + text-shadow: none; + transition: none; } treeview.view acceleditor > label { background-color: #4a90d9; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; + background-image: none; + border-style: none solid solid none; + border-color: #e8e8e7; border-radius: 0; - background-image: none; - text-shadow: none; - border-style: none solid solid none; - border-color: #e8e8e7; } + text-shadow: none; } treeview.view header button:disabled { border-color: #e8e8e7; background-image: none; } treeview.view header button:backdrop { + color: #babbbb; border-color: #e8e8e7; border-style: none solid solid none; - color: #babbbb; background-image: none; background-color: #fcfcfc; } treeview.view header button:backdrop:disabled { @@ -2628,9 +2716,9 @@ scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } scrollbar.horizontal button.down { - -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } scrollbar.horizontal button.up { - -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } treeview ~ scrollbar.vertical { border-top: 1px solid #b6b6b3; @@ -2643,43 +2731,35 @@ font-weight: bold; font-size: smaller; outline-offset: -4px; - box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px transparent; border: 1px solid #b6b6b3; border-radius: 3px; color: #2e3436; - background-image: linear-gradient(to bottom, #d4d4d2); + background-color: #cfcfcd; text-shadow: 0 1px rgba(0, 0, 0, 0.1); } switch:checked { - color: white; + color: #ffffff; border-color: #184472; background-color: #4a90d9; - background-image: none; - box-shadow: 0 1px transparent; text-shadow: 0 1px rgba(24, 68, 114, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { color: #8b8e8f; border-color: #b6b6b3; - background-image: none; background-color: #f1f1f1; - box-shadow: 0 1px transparent; text-shadow: none; } switch:backdrop { color: #8b8e8f; border-color: #c0c0bd; - background-image: linear-gradient(to bottom, #dadad8); - box-shadow: none; + background-color: #dadad8; text-shadow: none; transition: 200ms ease-out; } switch:backdrop:checked { color: #e8e8e7; border-color: #4a90d9; - background-image: linear-gradient(to bottom, #4a90d9); - box-shadow: none; } - switch:disabled { - color: #c3c3c0; - border-color: #c0c0bd; - background-image: none; - background-color: #f1f1f1; } + background-color: #4a90d9; } + switch:backdrop:disabled { + color: #c3c3c0; + border-color: #c0c0bd; + background-color: #f1f1f1; } switch slider { margin: -1px; min-width: 44px; @@ -2744,45 +2824,101 @@ /************************* * Check and Radio items * *************************/ -.view.content-view.check:not(list), iconview.content-view.check:not(list) { +.view.content-view.check:not(list), iconview.content-view.check:not(list), +.content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) { +.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list), +.content-view .tile check:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list) { +.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list), +.content-view .tile check:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) { +.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list), +.content-view .tile check:backdrop:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) { +.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list), +.content-view .tile check:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) { +.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list), +.content-view .tile check:checked:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) { +.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list), +.content-view .tile check:checked:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) { +.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list), +.content-view .tile check:backdrop:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } checkbutton.text-button, radiobutton.text-button { padding: 2px 0; @@ -2929,8 +3065,7 @@ box-shadow: none; -gtk-icon-shadow: none; color: inherit; - border-color: currentColor; - animation: none; } + border-color: currentColor; } check { border-radius: 3px; } @@ -2949,35 +3084,25 @@ radio:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")), -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); } -@keyframes check_check { - from { - -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_radio { - from { - -gtk-icon-transform: scale(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_indeterminate { - from { - -gtk-icon-transform: scale(0, 1); } - to { - -gtk-icon-transform: unset; } } -check:not(:indeterminate):checked { - animation: check_check 400ms; } +radio:not(:indeterminate):not(:checked):active:not(:backdrop) { + -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); } -radio:not(:indeterminate):checked { - animation: check_radio 400ms; } - -check:indeterminate:checked, radio:indeterminate:checked { - animation: check_indeterminate 400ms; } +radio:active, +check:active { + -gtk-icon-transform: scale(0, 1); } +radio:checked:not(:backdrop), radio:indeterminate:not(:backdrop), +check:checked:not(:backdrop), +check:indeterminate:not(:backdrop) { + -gtk-icon-transform: unset; + transition: 400ms; } -menu menuitem check:not(:indeterminate):checked, -menu menuitem radio:not(:indeterminate):checked, -menu menuitem check:indeterminate:checked:active, -menu menuitem radio:indeterminate:checked { - animation: none; } +menu menuitem radio:checked:not(:backdrop), menu menuitem radio:indeterminate:not(:backdrop), +menu menuitem check:checked:not(:backdrop), +menu menuitem check:indeterminate:not(:backdrop) { + transition: none; } treeview.view check:selected:focus, treeview.view check:selected, treeview.view radio:selected:focus, @@ -3001,27 +3126,20 @@ scale trough, scale fill, progressbar trough { border: 1px solid #b6b6b3; border-radius: 3px; - background-color: #cfcfcd; - box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } + background-color: #cfcfcd; } scale trough:disabled, scale fill:disabled, progressbar trough:disabled { - background-color: #f1f1f1; - box-shadow: none; } + background-color: #f1f1f1; } scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { background-color: #dadad8; border-color: #c0c0bd; - box-shadow: none; transition: 200ms ease-out; } scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { background-color: #f1f1f1; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { - box-shadow: none; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled { - border-color: #184472; } + row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled, row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { + border-color: #184472; } .osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); - background-color: rgba(0, 0, 0, 0.5); - box-shadow: none; - outline-color: rgba(238, 238, 236, 0.2); } + background-color: rgba(0, 0, 0, 0.5); } .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(49, 52, 52, 0.5); } @@ -3073,15 +3191,14 @@ scale trough { outline-offset: 2px; -gtk-outline-radius: 5px; } - scale fill, scale fill:backdrop { - background-color: #b6b6b3; - box-shadow: none; } - scale fill:disabled, scale fill:disabled:backdrop { + scale fill:backdrop, scale fill { + background-color: #b6b6b3; } + scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; background-color: transparent; } .osd scale fill { background-color: rgba(91, 91, 90, 0.775); } - .osd scale fill:disabled, .osd scale fill:disabled:backdrop { + .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: transparent; } scale slider { @@ -3092,7 +3209,7 @@ -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); background-image: linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); box-shadow: inset 0 1px white, inset 0 -2px #ededec, inset 0 -1px #cacac8, 0 1px rgba(0, 0, 0, 0.1); - border: 1px solid #afafab; + border: 1px solid #898984; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; } @@ -3129,7 +3246,7 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop:disabled label, scale slider:backdrop:disabled { color: #c3c3c0; } - row:selected scale slider, row:selected scale slider:disabled { + row:selected scale slider:disabled, row:selected scale slider { border-color: #184472; } .osd scale slider { color: #eeeeec; @@ -3152,7 +3269,8 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); @@ -3162,7 +3280,8 @@ box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:disabled { color: #858786; border-color: rgba(0, 0, 0, 0.7); @@ -3171,7 +3290,8 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } .osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); @@ -3180,11 +3300,14 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } + .osd scale slider:backdrop:disabled { + background-color: #1c1f20; } scale value { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3223,6 +3346,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); min-height: 26px; min-width: 22px; @@ -3237,6 +3361,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); min-height: 26px; min-width: 22px; @@ -3251,6 +3376,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); min-height: 26px; min-width: 22px; @@ -3265,6 +3391,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3279,6 +3406,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); min-height: 26px; min-width: 22px; @@ -3293,6 +3421,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3307,6 +3436,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); min-height: 26px; min-width: 22px; @@ -3321,6 +3451,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); min-height: 26px; min-width: 22px; @@ -3335,6 +3466,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); min-height: 26px; min-width: 22px; @@ -3349,6 +3481,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3363,6 +3496,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); min-height: 26px; min-width: 22px; @@ -3377,6 +3511,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3391,6 +3526,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); min-height: 22px; min-width: 26px; @@ -3405,6 +3541,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); min-height: 22px; min-width: 26px; @@ -3419,6 +3556,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); min-height: 22px; min-width: 26px; @@ -3433,6 +3571,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3447,6 +3586,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); min-height: 22px; min-width: 26px; @@ -3461,6 +3601,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3475,6 +3616,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); min-height: 22px; min-width: 26px; @@ -3489,6 +3631,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); min-height: 22px; min-width: 26px; @@ -3503,6 +3646,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); min-height: 22px; min-width: 26px; @@ -3517,6 +3661,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3531,6 +3676,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); min-height: 22px; min-width: 26px; @@ -3545,6 +3691,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3559,7 +3706,7 @@ min-height: 0; min-width: 0; } scale.color trough { - background-image: linear-gradient(to top, #b6b6b3); + background-image: image(#b6b6b3); background-repeat: no-repeat; } scale.color.horizontal { padding: 0 0 15px 0; } @@ -3661,6 +3808,8 @@ progressbar.osd progress { border-style: none; border-radius: 0; } + progressbar trough.empty progress { + all: unset; } /************* * Level Bar * @@ -3692,10 +3841,7 @@ margin: 1px 0; } levelbar block { border: 1px solid; - border-radius: 1px; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); } - levelbar block:backdrop { - box-shadow: none; } + border-radius: 1px; } levelbar block.low { border-color: #8f4700; background-color: #f57900; } @@ -3713,8 +3859,7 @@ border-color: #73d216; } levelbar block.empty { background-color: transparent; - border-color: rgba(46, 52, 54, 0.2); - box-shadow: none; } + border-color: rgba(46, 52, 54, 0.2); } levelbar block.empty:backdrop { border-color: rgba(139, 142, 143, 0.15); } @@ -4250,7 +4395,7 @@ /***************** * Color Chooser * *****************/ -colorswatch, colorswatch:drop(active) { +colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { border-top-left-radius: 5.5px; @@ -4297,10 +4442,9 @@ border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; } colorswatch overlay { - box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7); border: 1px solid rgba(0, 0, 0, 0.3); } colorswatch overlay:hover { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); } colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { border-color: rgba(0, 0, 0, 0.3); box-shadow: none; } @@ -4393,11 +4537,14 @@ border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } .solid-csd decoration { + margin: 0; + padding: 4px; + background-color: #b6b6b3; + border: solid 1px #b6b6b3; border-radius: 0; - margin: 4px; - background-color: #e8e8e7; - border: solid 1px #c0c0bd; - box-shadow: none; } + box-shadow: inset 0 0 0 3px #f4f4f4, inset 0 1px rgba(255, 255, 255, 0.8); } + .solid-csd decoration:backdrop { + box-shadow: inset 0 0 0 3px #e8e8e7, inset 0 1px rgba(255, 255, 255, 0.8); } button.titlebutton { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); @@ -4422,8 +4569,7 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, -entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, -popover.background radiobutton:selected, +entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { background-color: #4a90d9; } row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, @@ -4435,11 +4581,9 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, - entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, - popover.background radiobutton:selected, + entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); } + color: #ffffff; } row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus, textview text:disabled:selected:focus, @@ -4447,8 +4591,7 @@ iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, - entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, - popover.background radiobutton:disabled:selected, + entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected { color: #a5c8ec; } row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, @@ -4458,8 +4601,7 @@ iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, - entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, - popover.background radiobutton:backdrop:selected, + entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected { color: #fcfcfc; } row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, @@ -4467,13 +4609,12 @@ iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, - entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, - popover.background radiobutton:backdrop:disabled:selected, + entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #7fb0e4; } .monospace { - font: Monospace; } + font-family: monospace; } /********************** * Touch Copy & Paste * @@ -4511,12 +4652,6 @@ .context-menu { font: initial; } -button.circular { - border-radius: 9999px; - -gtk-outline-radius: 9999px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; @@ -4539,7 +4674,8 @@ :not(decoration):not(window):drop(active):focus, :not(decoration):not(window):drop(active) { border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + box-shadow: inset 0 0 0 1px #4e9a06; + caret-color: #4e9a06; } stackswitcher button.text-button { min-width: 100px; }
--- a/gtk-3.20/gtk-dark.css Wed Mar 15 20:27:10 2017 +0000 +++ b/gtk-3.20/gtk-dark.css Sat Apr 01 11:21:01 2017 +0100 @@ -8,7 +8,7 @@ -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; - outline-color: rgba(238, 238, 236, 0.3); + outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; @@ -64,6 +64,17 @@ textview text:backdrop { color: #d3d4d5; background-color: #252a2c; } + .view:backdrop:disabled, iconview:backdrop:disabled, + .view text:backdrop:disabled, + iconview text:backdrop:disabled, + textview text:backdrop:disabled { + color: #566164; } + .view:disabled, iconview:disabled, + .view text:disabled, + iconview text:disabled, + textview text:disabled { + color: #919494; + background-color: #2d3234; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, @@ -80,16 +91,28 @@ rubberband, flowbox rubberband, treeview.view rubberband, -.content-view rubberband { +.content-view rubberband, +.content-view .rubberband { border: 1px solid #455d2d; background-color: rgba(69, 93, 45, 0.2); } flowbox flowboxchild { - padding: 3px; - border-radius: 3px; } + padding: 3px; } flowbox flowboxchild:selected { outline-offset: -2px; } +.content-view .tile { + margin: 2px; + background-color: black; + border-radius: 0; + padding: 0; } + .content-view .tile:backdrop { + background-color: #1a1d1e; } + .content-view .tile:active, .content-view .tile:selected { + background-color: #5E7F3E; } + .content-view .tile:disabled { + background-color: #2d3234; } + label { caret-color: currentColor; } label.separator { @@ -125,15 +148,16 @@ background-color: #585d5e; } .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, -.app-notification.frame, .osd .scale-popup, .osd { +.app-notification.frame, .osd .scale-popup, +.osd { color: #eeeeec; border: none; background-color: rgba(28, 31, 32, 0.7); background-clip: padding-box; - outline-color: rgba(238, 238, 236, 0.3); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } - popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { + popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, + .osd:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -170,12 +194,10 @@ box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0); } spinbutton:not(.vertical) image.left, entry image.left { - padding-left: 0; - padding-right: 6px; } + margin-right: 6px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 6px; - padding-right: 0; } + margin-left: 6px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; @@ -203,7 +225,7 @@ entry.flat { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), @@ -336,13 +358,11 @@ .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):not(.vertical) { - border-top-color: #212526; - background-image: linear-gradient(to bottom, #232729); } + border-top-color: #212526; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical) { - border-top-color: #24282a; - background-image: linear-gradient(to bottom, #252a2c); } + border-top-color: #24282a; } .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical), .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical), .linked.vertical > entry:disabled + entry:disabled { @@ -585,7 +605,6 @@ min-height: 32px; color: #eeeeec; border-radius: 5px; - outline-color: rgba(238, 238, 236, 0.3); color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; @@ -1144,6 +1163,11 @@ button.needs-attention:checked > image { animation: none; background-image: none; } +button.font separator, +button.file separator { + background-color: transparent; } +button.font > box > box > label { + font-weight: bold; } .inline-toolbar button, .inline-toolbar button:backdrop { @@ -1152,6 +1176,35 @@ .primary-toolbar button { -gtk-icon-shadow: none; } +button.circular { + border-radius: 9999px; + -gtk-outline-radius: 9999px; + background-origin: padding-box, border-box; + background-clip: padding-box, border-box; } + button.circular label { + padding: 0; } + button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); + border-color: #1b1f20; + border-bottom-color: #0b0c0c; + background-image: linear-gradient(to bottom, #2e3436, #2a2e30 60%, #25292b); + text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.82745); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #2e3436, #2a2e30 60%, #25292b), linear-gradient(to top, #0b0c0c 25%, #1b1f20 50%); + border-color: transparent; } + button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #eeeeec; + outline-color: rgba(238, 238, 236, 0.3); + border-color: #1b1f20; + border-bottom-color: #0b0c0c; + text-shadow: 0 -1px rgba(0, 0, 0, 0.77945); + -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.77945); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); + background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30), linear-gradient(to top, #0b0c0c 25%, #1b1f20 50%); + border-color: transparent; } .stack-switcher > button.needs-attention > label, @@ -1305,11 +1358,8 @@ border-radius: 3px; border-style: solid; } -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, +modelbutton.flat, +.menuitem.button.flat, 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:link:checked, @@ -1324,46 +1374,24 @@ -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, 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, + modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #3f4649; } - 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; } - 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; } -modelbutton.flat arrow, popover.background checkbutton arrow, -popover.background radiobutton arrow { +modelbutton.flat arrow { background: none; } - modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, - popover.background radiobutton arrow:hover { + modelbutton.flat arrow:hover { background: none; } - modelbutton.flat arrow.left, popover.background checkbutton arrow.left, - popover.background radiobutton arrow.left { + 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 { + modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } button.color { @@ -1374,40 +1402,77 @@ /********* * Links * *********/ -*:link, button:link, +button:link > label, +button:visited > label, +*:link, +button:link, button:visited { color: #455d2d; } + button:link > label:visited, + button:visited > label:visited, *:link:visited, button:visited { color: #2b3a1d; } - *:selected *:link:visited, *:selected button:visited:link, + *:selected button:link > label:visited, + *:selected button:visited > label:visited, *:selected + *:link:visited, *:selected + button:visited:link, *:selected button:visited { color: #bfccb2; } - *:link:hover, button:hover:link, + button:link > label:hover, + button:visited > label:hover, + *:link:hover, + button:hover:link, button:hover:visited { color: #5e7f3e; } - *:selected *:link:hover, *:selected button:hover:link, + *:selected button:link > label:hover, + *:selected button:visited > label:hover, *:selected + *:link:hover, *:selected + button:hover:link, *:selected button:hover:visited { color: #eff2ec; } - *:link:active, button:active:link, + button:link > label:active, + button:visited > label:active, + *:link:active, + button:active:link, button:active:visited { color: #455d2d; } - *:selected *:link:active, *:selected button:active:link, + *:selected button:link > label:active, + *:selected button:visited > label:active, *:selected + *:link:active, *:selected + button:active:link, *:selected button:active:visited { color: #dfe5d8; } - *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link, - button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, - button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, - headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, + button:link > label:backdrop:backdrop:hover, + button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, + button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, + button:visited > label:backdrop, + *:link:backdrop:backdrop:hover, + button:backdrop:backdrop:hover:link, + button:backdrop:backdrop:hover:visited, + *:link:backdrop:backdrop:hover:selected, + button:backdrop:backdrop:hover:selected:link, + button:backdrop:backdrop:hover:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, + headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, + *:link:backdrop, + button:backdrop:link, button:backdrop:visited { color: #5E7F3E; } infobar.info *:link, infobar.info button:link, infobar.info button:visited, infobar.question *:link, infobar.question button:link, infobar.question button:visited, infobar.warning *:link, infobar.warning button:link, infobar.warning button:visited, infobar.error *:link, infobar.error button:link, - infobar.error button:visited, *:link:selected, button:selected:link, - button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link, - headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, + infobar.error button:visited, button:link > label:selected, + button:visited > label:selected, *:selected button:link > label, + *:selected button:visited > label, + *:link:selected, + button:selected:link, + button:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:link, + headerbar.selection-mode .subtitle:link, *:selected + *:link, *:selected + button:link, *:selected button:visited { color: #dfe5d8; } @@ -1436,6 +1501,8 @@ border: none; border-radius: 0; box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } spinbutton:not(.vertical) button { min-height: 16px; margin: 0; @@ -1453,7 +1520,8 @@ color: #eeeeec; background-color: rgba(238, 238, 236, 0.05); } spinbutton:not(.vertical) button:disabled { - color: rgba(145, 148, 148, 0.3); } + color: rgba(145, 148, 148, 0.3); + background-color: transparent; } spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } @@ -1464,10 +1532,14 @@ transition: 200ms ease-out; } spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(86, 97, 100, 0.3); - background-image: none; + background-color: transparent; border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 3px 3px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 3px 0 0 3px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; @@ -1517,7 +1589,7 @@ border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } - .osd spinbutton:not(.vertical) button:last-child { + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } @@ -1672,7 +1744,7 @@ min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: #1b1f20; + border-color: #0b0c0c; border-radius: 0; background: #2c3133 linear-gradient(to top, #25292b, #2a2e30 2px, #2c3133 3px); box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); } @@ -1685,9 +1757,9 @@ transition: 200ms ease-out; } .titlebar:not(headerbar) .title, headerbar .title { - font-weight: bold; padding-left: 12px; - padding-right: 12px; } + padding-right: 12px; + font-weight: bold; } .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; @@ -1696,8 +1768,8 @@ .selection-mode.titlebar:not(headerbar), headerbar.selection-mode { color: #ffffff; + border-color: #12180c; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); - border-color: #12180c; background: #5E7F3E linear-gradient(to top, #567539, #5b7c3c 2px, #5E7F3E 3px); box-shadow: inset 0 1px rgba(99, 131, 68, 0.535); } .selection-mode.titlebar:backdrop:not(headerbar), @@ -1913,7 +1985,8 @@ headerbar.selection-mode .selection-menu:backdrop, headerbar.selection-mode .selection-menu { border-color: rgba(94, 127, 62, 0); - background-image: linear-gradient(to bottom, rgba(94, 127, 62, 0)); + background-color: rgba(94, 127, 62, 0); + background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; } @@ -1935,14 +2008,24 @@ border-radius: 0; } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { - padding: 4px; - min-height: 28px; } + min-height: 28px; + padding: 4px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } + .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd + headerbar:backdrop:dir(rtl), .solid-csd + headerbar:backdrop:dir(ltr), .solid-csd + headerbar:dir(rtl), .solid-csd + headerbar:dir(ltr) { + margin-left: -1px; + margin-right: -1px; + margin-top: -1px; + border-radius: 0; + box-shadow: none; } headerbar entry, headerbar spinbutton, @@ -1954,13 +2037,16 @@ margin-top: 9px; margin-bottom: 9px; } -.background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar { +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { border-top-left-radius: 7px; border-top-right-radius: 7px; } -window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child { +window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child { border-top-left-radius: 7px; } -window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { +window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child { + border-top-right-radius: 7px; } +window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child { + border-top-left-radius: 7px; border-top-right-radius: 7px; } window.csd > .titlebar:not(headerbar) { @@ -2037,11 +2123,11 @@ border-bottom-style: none; } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #b1b2b2; } + color: #bdbebf; } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { - color: #eeeeec; } + color: white; } treeview.view.expander:selected { color: #cfd9c5; } treeview.view.expander:selected:hover { @@ -2096,31 +2182,31 @@ treeview.view header.button.dnd:hover, treeview.view header.button.dnd { padding: 0 6px; - transition: none; + color: #232729; background-image: none; background-color: #5E7F3E; - color: #232729; + border-style: none; border-radius: 0; - border-style: none; box-shadow: inset 0 0 0 1px #232729; - text-shadow: none; } + text-shadow: none; + transition: none; } treeview.view acceleditor > label { background-color: #5E7F3E; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; + background-image: none; + border-style: none solid solid none; + border-color: #33393b; border-radius: 0; - background-image: none; - text-shadow: none; - border-style: none solid solid none; - border-color: #33393b; } + text-shadow: none; } treeview.view header button:disabled { border-color: #33393b; background-image: none; } treeview.view header button:backdrop { + color: #626768; border-color: #33393b; border-style: none solid solid none; - color: #626768; background-image: none; background-color: #252a2c; } treeview.view header button:backdrop:disabled { @@ -2615,9 +2701,9 @@ scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } scrollbar.horizontal button.down { - -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } scrollbar.horizontal button.up { - -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } treeview ~ scrollbar.vertical { border-top: 1px solid #1b1f20; @@ -2630,42 +2716,34 @@ font-weight: bold; font-size: smaller; outline-offset: -4px; - box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px transparent; border: 1px solid #1b1f20; border-radius: 3px; color: #eeeeec; - background-image: linear-gradient(to bottom, #292f30); + background-color: #272c2e; text-shadow: 0 1px rgba(0, 0, 0, 0.1); } switch:checked { - color: white; + color: #ffffff; border-color: #12180c; background-color: #5E7F3E; - background-image: none; - box-shadow: 0 1px transparent; text-shadow: 0 1px rgba(18, 24, 12, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { color: #919494; border-color: #1b1f20; - background-image: none; background-color: #2d3234; - box-shadow: 0 1px transparent; text-shadow: none; } switch:backdrop { color: #919494; border-color: #202425; - background-image: linear-gradient(to bottom, #2c3233); - box-shadow: none; + background-color: #2c3233; text-shadow: none; transition: 200ms ease-out; } switch:backdrop:checked { border-color: #12180c; - background-image: linear-gradient(to bottom, #5E7F3E); - box-shadow: none; } - switch:disabled { - color: #566164; - border-color: #202425; - background-image: none; - background-color: #2d3234; } + background-color: #5E7F3E; } + switch:backdrop:disabled { + color: #566164; + border-color: #202425; + background-color: #2d3234; } switch slider { margin: -1px; min-width: 44px; @@ -2719,45 +2797,101 @@ /************************* * Check and Radio items * *************************/ -.view.content-view.check:not(list), iconview.content-view.check:not(list) { +.view.content-view.check:not(list), iconview.content-view.check:not(list), +.content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) { +.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list), +.content-view .tile check:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list) { +.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list), +.content-view .tile check:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) { +.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list), +.content-view .tile check:backdrop:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) { +.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list), +.content-view .tile check:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) { +.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list), +.content-view .tile check:checked:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) { +.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list), +.content-view .tile check:checked:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) { +.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list), +.content-view .tile check:backdrop:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } checkbutton.text-button, radiobutton.text-button { padding: 2px 0; @@ -2901,8 +3035,7 @@ box-shadow: none; -gtk-icon-shadow: none; color: inherit; - border-color: currentColor; - animation: none; } + border-color: currentColor; } check { border-radius: 3px; } @@ -2921,35 +3054,25 @@ radio:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")), -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); } -@keyframes check_check { - from { - -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_radio { - from { - -gtk-icon-transform: scale(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_indeterminate { - from { - -gtk-icon-transform: scale(0, 1); } - to { - -gtk-icon-transform: unset; } } -check:not(:indeterminate):checked { - animation: check_check 400ms; } +radio:not(:indeterminate):not(:checked):active:not(:backdrop) { + -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); } -radio:not(:indeterminate):checked { - animation: check_radio 400ms; } - -check:indeterminate:checked, radio:indeterminate:checked { - animation: check_indeterminate 400ms; } +radio:active, +check:active { + -gtk-icon-transform: scale(0, 1); } +radio:checked:not(:backdrop), radio:indeterminate:not(:backdrop), +check:checked:not(:backdrop), +check:indeterminate:not(:backdrop) { + -gtk-icon-transform: unset; + transition: 400ms; } -menu menuitem check:not(:indeterminate):checked, -menu menuitem radio:not(:indeterminate):checked, -menu menuitem check:indeterminate:checked:active, -menu menuitem radio:indeterminate:checked { - animation: none; } +menu menuitem radio:checked:not(:backdrop), menu menuitem radio:indeterminate:not(:backdrop), +menu menuitem check:checked:not(:backdrop), +menu menuitem check:indeterminate:not(:backdrop) { + transition: none; } treeview.view check:selected:focus, treeview.view check:selected, treeview.view radio:selected:focus, @@ -2972,27 +3095,20 @@ scale trough, scale fill, progressbar trough { border: 1px solid #1b1f20; border-radius: 3px; - background-color: #272c2e; - box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } + background-color: #272c2e; } scale trough:disabled, scale fill:disabled, progressbar trough:disabled { - background-color: #2d3234; - box-shadow: none; } + background-color: #2d3234; } scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { background-color: #2c3233; border-color: #202425; - box-shadow: none; transition: 200ms ease-out; } scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { background-color: #2d3234; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { - box-shadow: none; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled { - border-color: #12180c; } + row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled, row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { + border-color: #12180c; } .osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); - background-color: rgba(0, 0, 0, 0.5); - box-shadow: none; - outline-color: rgba(238, 238, 236, 0.2); } + background-color: rgba(0, 0, 0, 0.5); } .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(49, 52, 52, 0.5); } @@ -3044,15 +3160,14 @@ scale trough { outline-offset: 2px; -gtk-outline-radius: 5px; } - scale fill, scale fill:backdrop { - background-color: #1b1f20; - box-shadow: none; } - scale fill:disabled, scale fill:disabled:backdrop { + scale fill:backdrop, scale fill { + background-color: #1b1f20; } + scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; background-color: transparent; } .osd scale fill { background-color: rgba(91, 91, 90, 0.775); } - .osd scale fill:disabled, .osd scale fill:disabled:backdrop { + .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: transparent; } scale slider { @@ -3063,7 +3178,7 @@ -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.82745); background-image: linear-gradient(to bottom, #2c3133 20%, #25292b 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2a2e30, inset 0 -1px #1e2122, 0 1px rgba(0, 0, 0, 0.1); - border: 1px solid #141717; + border: 1px solid #040404; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; } @@ -3100,7 +3215,7 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop:disabled label, scale slider:backdrop:disabled { color: #566164; } - row:selected scale slider, row:selected scale slider:disabled { + row:selected scale slider:disabled, row:selected scale slider { border-color: #12180c; } .osd scale slider { color: #eeeeec; @@ -3123,7 +3238,8 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); @@ -3133,7 +3249,8 @@ box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:disabled { color: #858786; border-color: rgba(0, 0, 0, 0.7); @@ -3142,7 +3259,8 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } .osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); @@ -3151,11 +3269,14 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } + .osd scale slider:backdrop:disabled { + background-color: #1c1f20; } scale value { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3194,6 +3315,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3208,6 +3330,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3222,6 +3345,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3236,6 +3360,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3250,6 +3375,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3264,6 +3390,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3278,6 +3405,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3292,6 +3420,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3306,6 +3435,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3320,6 +3450,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3334,6 +3465,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3348,6 +3480,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 26px; min-width: 22px; @@ -3362,6 +3495,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3376,6 +3510,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3390,6 +3525,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3404,6 +3540,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3418,6 +3555,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3432,6 +3570,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3446,6 +3585,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3460,6 +3600,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3474,6 +3615,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3488,6 +3630,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3502,6 +3645,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3516,6 +3660,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png")); min-height: 22px; min-width: 26px; @@ -3530,7 +3675,7 @@ min-height: 0; min-width: 0; } scale.color trough { - background-image: linear-gradient(to top, #1b1f20); + background-image: image(#1b1f20); background-repeat: no-repeat; } scale.color.horizontal { padding: 0 0 15px 0; } @@ -3632,6 +3777,8 @@ progressbar.osd progress { border-style: none; border-radius: 0; } + progressbar trough.empty progress { + all: unset; } /************* * Level Bar * @@ -3663,10 +3810,7 @@ margin: 1px 0; } levelbar block { border: 1px solid; - border-radius: 1px; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); } - levelbar block:backdrop { - box-shadow: none; } + border-radius: 1px; } levelbar block.low { border-color: #f57900; background-color: #f57900; } @@ -3684,8 +3828,7 @@ border-color: #5aa411; } levelbar block.empty { background-color: transparent; - border-color: rgba(238, 238, 236, 0.1); - box-shadow: none; } + border-color: rgba(238, 238, 236, 0.1); } levelbar block.empty:backdrop { border-color: rgba(145, 148, 148, 0.15); } @@ -4221,7 +4364,7 @@ /***************** * Color Chooser * *****************/ -colorswatch, colorswatch:drop(active) { +colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { border-top-left-radius: 5.5px; @@ -4268,10 +4411,9 @@ border-color: #4e9a06; box-shadow: inset 0 0 0 2px #1b1f20, inset 0 0 0 1px #4e9a06; } colorswatch overlay { - box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5); border: 1px solid #1b1f20; } colorswatch overlay:hover { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); } colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { border-color: #1b1f20; box-shadow: none; } @@ -4364,11 +4506,14 @@ border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 31, 32, 0.8); } .solid-csd decoration { + margin: 0; + padding: 4px; + background-color: #1b1f20; + border: solid 1px #1b1f20; border-radius: 0; - margin: 4px; - background-color: #33393b; - border: solid 1px #202425; - box-shadow: none; } + box-shadow: inset 0 0 0 3px #2c3133, inset 0 1px rgba(238, 238, 236, 0.07); } + .solid-csd decoration:backdrop { + box-shadow: inset 0 0 0 3px #33393b, inset 0 1px rgba(238, 238, 236, 0.07); } button.titlebutton { text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); @@ -4393,8 +4538,7 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, -entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, -popover.background radiobutton:selected, +entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { background-color: #5E7F3E; } row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, @@ -4406,8 +4550,7 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, - entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, - popover.background radiobutton:selected, + entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { color: #ffffff; } row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, @@ -4417,8 +4560,7 @@ iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, - entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, - popover.background radiobutton:disabled:selected, + entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected { color: #afbf9f; } row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, @@ -4428,8 +4570,7 @@ iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, - entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, - popover.background radiobutton:backdrop:selected, + entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected { color: #ffffff; } row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, @@ -4437,13 +4578,12 @@ iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, - entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, - popover.background radiobutton:backdrop:disabled:selected, + entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #8ea578; } .monospace { - font: Monospace; } + font-family: monospace; } /********************** * Touch Copy & Paste * @@ -4481,12 +4621,6 @@ .context-menu { font: initial; } -button.circular { - border-radius: 9999px; - -gtk-outline-radius: 9999px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; @@ -4509,7 +4643,8 @@ :not(decoration):not(window):drop(active):focus, :not(decoration):not(window):drop(active) { border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + box-shadow: inset 0 0 0 1px #4e9a06; + caret-color: #4e9a06; } stackswitcher button.text-button { min-width: 100px; }
--- a/gtk-3.20/gtk.css Wed Mar 15 20:27:10 2017 +0000 +++ b/gtk-3.20/gtk.css Sat Apr 01 11:21:01 2017 +0100 @@ -8,7 +8,7 @@ -GtkWidget-text-handle-height: 24; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 0; - outline-color: rgba(22, 22, 22, 0.3); + outline-color: alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; @@ -64,6 +64,17 @@ textview text:backdrop { color: #272727; background-color: #c3c3c3; } + .view:backdrop:disabled, iconview:backdrop:disabled, + .view text:backdrop:disabled, + iconview text:backdrop:disabled, + textview text:backdrop:disabled { + color: #a0a0a0; } + .view:disabled, iconview:disabled, + .view text:disabled, + iconview text:disabled, + textview text:disabled { + color: #6e6e6e; + background-color: #c6c6c6; } .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, .view text:selected:focus, iconview text:selected:focus, @@ -80,16 +91,28 @@ rubberband, flowbox rubberband, treeview.view rubberband, -.content-view rubberband { +.content-view rubberband, +.content-view .rubberband { border: 1px solid #455d2d; background-color: rgba(69, 93, 45, 0.2); } flowbox flowboxchild { - padding: 3px; - border-radius: 3px; } + padding: 3px; } flowbox flowboxchild:selected { outline-offset: -2px; } +.content-view .tile { + margin: 2px; + background-color: transparent; + border-radius: 0; + padding: 0; } + .content-view .tile:backdrop { + background-color: transparent; } + .content-view .tile:active, .content-view .tile:selected { + background-color: transparent; } + .content-view .tile:disabled { + background-color: transparent; } + label { caret-color: currentColor; } label.separator { @@ -125,15 +148,16 @@ background-color: #a3a3a3; } .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, -.app-notification.frame, .osd .scale-popup, .osd { +.app-notification.frame, .osd .scale-popup, +.osd { color: #eeeeec; border: none; background-color: rgba(28, 31, 32, 0.7); background-clip: padding-box; - outline-color: rgba(238, 238, 236, 0.3); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } - popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { + popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, + .osd:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -170,12 +194,10 @@ box-shadow: inset 0 0 0 1px rgba(94, 127, 62, 0); } spinbutton:not(.vertical) image.left, entry image.left { - padding-left: 0; - padding-right: 6px; } + margin-right: 6px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 6px; - padding-right: 0; } + margin-left: 6px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; @@ -203,7 +225,7 @@ entry.flat { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), @@ -336,13 +358,11 @@ .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):not(.vertical) { - border-top-color: #afafaf; - background-image: linear-gradient(to bottom, #C6C6C6); } + border-top-color: #afafaf; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled):backdrop, .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):backdrop:not(.vertical), .linked.vertical > entry:not(:disabled) + entry:not(:disabled):backdrop, .linked.vertical > entry:not(:disabled) + spinbutton:not(:disabled):backdrop:not(.vertical) { - border-top-color: #b0b0b0; - background-image: linear-gradient(to bottom, #c3c3c3); } + border-top-color: #b0b0b0; } .linked.vertical > spinbutton:disabled:not(.vertical) + spinbutton:disabled:not(.vertical), .linked.vertical > spinbutton:disabled:not(.vertical) + entry:disabled, .linked.vertical > entry:disabled + spinbutton:disabled:not(.vertical), .linked.vertical > entry:disabled + entry:disabled { @@ -588,7 +608,6 @@ min-height: 32px; color: #eeeeec; border-radius: 5px; - outline-color: rgba(238, 238, 236, 0.3); color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; @@ -1147,6 +1166,11 @@ button.needs-attention:checked > image { animation: none; background-image: none; } +button.font separator, +button.file separator { + background-color: transparent; } +button.font > box > box > label { + font-weight: bold; } .inline-toolbar button, .inline-toolbar button:backdrop { @@ -1155,6 +1179,35 @@ .primary-toolbar button { -gtk-icon-shadow: none; } +button.circular { + border-radius: 9999px; + -gtk-outline-radius: 9999px; + background-origin: padding-box, border-box; + background-clip: padding-box, border-box; } + button.circular label { + padding: 0; } + button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #161616; + outline-color: rgba(22, 22, 22, 0.3); + border-color: #7a7a7a; + border-bottom-color: #6d6d6d; + background-image: linear-gradient(to bottom, #C6C6C6, #bcbcbc 60%, #adadad); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); + background-image: linear-gradient(to bottom, #C6C6C6, #bcbcbc 60%, #adadad), linear-gradient(to top, #6d6d6d 25%, #7a7a7a 50%); + border-color: transparent; } + button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { + color: #161616; + outline-color: rgba(22, 22, 22, 0.3); + border-color: #7a7a7a; + border-bottom-color: #6d6d6d; + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.6); + background-image: linear-gradient(to bottom, #d5d5d5, #C6C6C6 60%, #bcbcbc); + background-image: linear-gradient(to bottom, #d5d5d5, #C6C6C6 60%, #bcbcbc), linear-gradient(to top, #6d6d6d 25%, #7a7a7a 50%); + border-color: transparent; } .stack-switcher > button.needs-attention > label, @@ -1308,11 +1361,8 @@ border-radius: 3px; border-style: solid; } -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, +modelbutton.flat, +.menuitem.button.flat, 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:link:checked, @@ -1327,46 +1377,24 @@ -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, 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, + modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: lightgray; } - 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; } - 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; } -modelbutton.flat arrow, popover.background checkbutton arrow, -popover.background radiobutton arrow { +modelbutton.flat arrow { background: none; } - modelbutton.flat arrow:hover, popover.background checkbutton arrow:hover, - popover.background radiobutton arrow:hover { + modelbutton.flat arrow:hover { background: none; } - modelbutton.flat arrow.left, popover.background checkbutton arrow.left, - popover.background radiobutton arrow.left { + 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 { + modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } button.color { @@ -1375,46 +1403,85 @@ box-shadow: 0 1px rgba(255, 255, 255, 0.76923); } button.color colorswatch:only-child, button.color colorswatch:only-child overlay { border-radius: 0; } - button.color colorswatch:only-child:disabled, button.color colorswatch:only-child:backdrop { + .osd button.color colorswatch:only-child { box-shadow: none; } + .osd button.color:disabled colorswatch:only-child, .osd button.color:backdrop colorswatch:only-child, .osd button.color:active colorswatch:only-child, .osd button.color:checked colorswatch:only-child, button.color:disabled colorswatch:only-child, button.color:backdrop colorswatch:only-child, button.color:active colorswatch:only-child, button.color:checked colorswatch:only-child { + box-shadow: none; } /********* * Links * *********/ -*:link, button:link, +button:link > label, +button:visited > label, +*:link, +button:link, button:visited { color: #455d2d; } + button:link > label:visited, + button:visited > label:visited, *:link:visited, button:visited { color: #2b3a1d; } - *:selected *:link:visited, *:selected button:visited:link, + *:selected button:link > label:visited, + *:selected button:visited > label:visited, *:selected + *:link:visited, *:selected + button:visited:link, *:selected button:visited { color: #bfccb2; } - *:link:hover, button:hover:link, + button:link > label:hover, + button:visited > label:hover, + *:link:hover, + button:hover:link, button:hover:visited { color: #5e7f3e; } - *:selected *:link:hover, *:selected button:hover:link, + *:selected button:link > label:hover, + *:selected button:visited > label:hover, *:selected + *:link:hover, *:selected + button:hover:link, *:selected button:hover:visited { color: #eff2ec; } - *:link:active, button:active:link, + button:link > label:active, + button:visited > label:active, + *:link:active, + button:active:link, button:active:visited { color: #455d2d; } - *:selected *:link:active, *:selected button:active:link, + *:selected button:link > label:active, + *:selected button:visited > label:active, *:selected + *:link:active, *:selected + button:active:link, *:selected button:active:visited { color: #dfe5d8; } - *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link, - button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, - button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, - headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, + button:link > label:backdrop:backdrop:hover, + button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, + button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, + button:visited > label:backdrop, + *:link:backdrop:backdrop:hover, + button:backdrop:backdrop:hover:link, + button:backdrop:backdrop:hover:visited, + *:link:backdrop:backdrop:hover:selected, + button:backdrop:backdrop:hover:selected:link, + button:backdrop:backdrop:hover:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, + headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, + *:link:backdrop, + button:backdrop:link, button:backdrop:visited { color: #5E7F3E; } infobar.info *:link, infobar.info button:link, infobar.info button:visited, infobar.question *:link, infobar.question button:link, infobar.question button:visited, infobar.warning *:link, infobar.warning button:link, infobar.warning button:visited, infobar.error *:link, infobar.error button:link, - infobar.error button:visited, *:link:selected, button:selected:link, - button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link, - headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, + infobar.error button:visited, button:link > label:selected, + button:visited > label:selected, *:selected button:link > label, + *:selected button:visited > label, + *:link:selected, + button:selected:link, + button:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:link, + headerbar.selection-mode .subtitle:link, *:selected + *:link, *:selected + button:link, *:selected button:visited { color: #dfe5d8; } @@ -1443,6 +1510,8 @@ border: none; border-radius: 0; box-shadow: none; } + spinbutton:not(.vertical) entry:backdrop:disabled { + background-color: transparent; } spinbutton:not(.vertical) button { min-height: 16px; margin: 0; @@ -1460,7 +1529,8 @@ color: #161616; background-color: rgba(46, 52, 54, 0.05); } spinbutton:not(.vertical) button:disabled { - color: rgba(110, 110, 110, 0.3); } + color: rgba(110, 110, 110, 0.3); + background-color: transparent; } spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); } @@ -1471,10 +1541,14 @@ transition: 200ms ease-out; } spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(160, 160, 160, 0.3); - background-image: none; + background-color: transparent; border-style: none none none solid; } spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; } + spinbutton:not(.vertical) button:dir(ltr):last-child { + border-radius: 0 3px 3px 0; } + spinbutton:not(.vertical) button:dir(rtl):first-child { + border-radius: 3px 0 0 3px; } .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; @@ -1524,7 +1598,7 @@ border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } - .osd spinbutton:not(.vertical) button:last-child { + .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 3px 3px 0; } .osd spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 3px 0 0 3px; } @@ -1679,7 +1753,7 @@ min-height: 46px; border-width: 0 0 1px; border-style: solid; - border-color: #7a7a7a; + border-color: #6d6d6d; border-radius: 0; background: #f4f4f4 linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } @@ -1692,9 +1766,9 @@ transition: 200ms ease-out; } .titlebar:not(headerbar) .title, headerbar .title { - font-weight: bold; padding-left: 12px; - padding-right: 12px; } + padding-right: 12px; + font-weight: bold; } .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; @@ -1703,8 +1777,8 @@ .selection-mode.titlebar:not(headerbar), headerbar.selection-mode { color: #ffffff; + border-color: #12180c; text-shadow: 0 -1px rgba(0, 0, 0, 0.5); - border-color: #12180c; background: #5E7F3E linear-gradient(to top, #3d5228, #59783b 2px, #5E7F3E 3px); box-shadow: inset 0 1px rgba(102, 133, 72, 0.55); } .selection-mode.titlebar:backdrop:not(headerbar), @@ -1920,7 +1994,8 @@ headerbar.selection-mode .selection-menu:backdrop, headerbar.selection-mode .selection-menu { border-color: rgba(94, 127, 62, 0); - background-image: linear-gradient(to bottom, rgba(94, 127, 62, 0)); + background-color: rgba(94, 127, 62, 0); + background-image: none; box-shadow: none; padding-left: 10px; padding-right: 10px; } @@ -1942,14 +2017,24 @@ border-radius: 0; } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { - padding: 4px; - min-height: 28px; } + min-height: 28px; + padding: 4px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 26px; min-width: 26px; margin: 0; padding: 0; } + .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd .titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd .titlebar:dir(ltr):not(headerbar), .solid-csd + headerbar:backdrop:dir(rtl), .solid-csd + headerbar:backdrop:dir(ltr), .solid-csd + headerbar:dir(rtl), .solid-csd + headerbar:dir(ltr) { + margin-left: -1px; + margin-right: -1px; + margin-top: -1px; + border-radius: 0; + box-shadow: none; } headerbar entry, headerbar spinbutton, @@ -1961,13 +2046,16 @@ margin-top: 9px; margin-bottom: 9px; } -.background:not(.tiled):not(.maximized) .titlebar:backdrop, .background:not(.tiled):not(.maximized) .titlebar { +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar:backdrop, .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { border-top-left-radius: 7px; border-top-right-radius: 7px; } -window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child { +window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + headerbar, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:first-child { border-top-left-radius: 7px; } -window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { +window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child { + border-top-right-radius: 7px; } +window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child { + border-top-left-radius: 7px; border-top-right-radius: 7px; } window.csd > .titlebar:not(headerbar) { @@ -2044,11 +2132,11 @@ border-bottom-style: none; } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: #4b4b4b; } + color: #3b3b3b; } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { - color: #161616; } + color: black; } treeview.view.expander:selected { color: #cfd9c5; } treeview.view.expander:selected:hover { @@ -2109,31 +2197,31 @@ treeview.view header.button.dnd:hover, treeview.view header.button.dnd { padding: 0 6px; - transition: none; + color: #C6C6C6; background-image: none; background-color: #5E7F3E; - color: #C6C6C6; + border-style: none; border-radius: 0; - border-style: none; box-shadow: inset 0 0 0 1px #C6C6C6; - text-shadow: none; } + text-shadow: none; + transition: none; } treeview.view acceleditor > label { background-color: #5E7F3E; } treeview.view header button, treeview.view header button:hover, treeview.view header button:active { padding: 0 6px; + background-image: none; + border-style: none solid solid none; + border-color: #C6C6C6; border-radius: 0; - background-image: none; - text-shadow: none; - border-style: none solid solid none; - border-color: #C6C6C6; } + text-shadow: none; } treeview.view header button:disabled { border-color: #C6C6C6; background-image: none; } treeview.view header button:backdrop { + color: #9a9a9a; border-color: #C6C6C6; border-style: none solid solid none; - color: #9a9a9a; background-image: none; background-color: #c3c3c3; } treeview.view header button:backdrop:disabled { @@ -2628,9 +2716,9 @@ scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } scrollbar.horizontal button.down { - -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } scrollbar.horizontal button.up { - -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } treeview ~ scrollbar.vertical { border-top: 1px solid #7a7a7a; @@ -2643,43 +2731,35 @@ font-weight: bold; font-size: smaller; outline-offset: -4px; - box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px transparent; border: 1px solid #7a7a7a; border-radius: 3px; color: #161616; - background-image: linear-gradient(to bottom, #a8a8a8); + background-color: #ababab; text-shadow: 0 1px rgba(0, 0, 0, 0.1); } switch:checked { - color: white; + color: #ffffff; border-color: #12180c; background-color: #5E7F3E; - background-image: none; - box-shadow: 0 1px transparent; text-shadow: 0 1px rgba(18, 24, 12, 0.5), 0 0 2px rgba(255, 255, 255, 0.6); } switch:disabled { color: #6e6e6e; border-color: #7a7a7a; - background-image: none; background-color: #c6c6c6; - box-shadow: 0 1px transparent; text-shadow: none; } switch:backdrop { color: #6e6e6e; border-color: #828282; - background-image: linear-gradient(to bottom, #aeaeae); - box-shadow: none; + background-color: #aeaeae; text-shadow: none; transition: 200ms ease-out; } switch:backdrop:checked { color: #C6C6C6; border-color: #5E7F3E; - background-image: linear-gradient(to bottom, #5E7F3E); - box-shadow: none; } - switch:disabled { - color: #a0a0a0; - border-color: #828282; - background-image: none; - background-color: #c6c6c6; } + background-color: #5E7F3E; } + switch:backdrop:disabled { + color: #a0a0a0; + border-color: #828282; + background-color: #c6c6c6; } switch slider { margin: -1px; min-width: 44px; @@ -2744,45 +2824,101 @@ /************************* * Check and Radio items * *************************/ -.view.content-view.check:not(list), iconview.content-view.check:not(list) { +.view.content-view.check:not(list), iconview.content-view.check:not(list), +.content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) { +.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list), +.content-view .tile check:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list) { +.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list), +.content-view .tile check:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) { +.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list), +.content-view .tile check:backdrop:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) { +.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list), +.content-view .tile check:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) { +.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list), +.content-view .tile check:checked:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) { +.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list), +.content-view .tile check:checked:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } -.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) { +.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list), +.content-view .tile check:backdrop:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; + border-width: 0; } checkbutton.text-button, radiobutton.text-button { padding: 2px 0; @@ -2929,8 +3065,7 @@ box-shadow: none; -gtk-icon-shadow: none; color: inherit; - border-color: currentColor; - animation: none; } + border-color: currentColor; } check { border-radius: 3px; } @@ -2949,35 +3084,25 @@ radio:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")), -gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); } -@keyframes check_check { - from { - -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_radio { - from { - -gtk-icon-transform: scale(0); } - to { - -gtk-icon-transform: unset; } } -@keyframes check_indeterminate { - from { - -gtk-icon-transform: scale(0, 1); } - to { - -gtk-icon-transform: unset; } } -check:not(:indeterminate):checked { - animation: check_check 400ms; } +radio:not(:indeterminate):not(:checked):active:not(:backdrop) { + -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); } -radio:not(:indeterminate):checked { - animation: check_radio 400ms; } - -check:indeterminate:checked, radio:indeterminate:checked { - animation: check_indeterminate 400ms; } +radio:active, +check:active { + -gtk-icon-transform: scale(0, 1); } +radio:checked:not(:backdrop), radio:indeterminate:not(:backdrop), +check:checked:not(:backdrop), +check:indeterminate:not(:backdrop) { + -gtk-icon-transform: unset; + transition: 400ms; } -menu menuitem check:not(:indeterminate):checked, -menu menuitem radio:not(:indeterminate):checked, -menu menuitem check:indeterminate:checked:active, -menu menuitem radio:indeterminate:checked { - animation: none; } +menu menuitem radio:checked:not(:backdrop), menu menuitem radio:indeterminate:not(:backdrop), +menu menuitem check:checked:not(:backdrop), +menu menuitem check:indeterminate:not(:backdrop) { + transition: none; } treeview.view check:selected:focus, treeview.view check:selected, treeview.view radio:selected:focus, @@ -3001,27 +3126,20 @@ scale trough, scale fill, progressbar trough { border: 1px solid #7a7a7a; border-radius: 3px; - background-color: #ababab; - box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } + background-color: #ababab; } scale trough:disabled, scale fill:disabled, progressbar trough:disabled { - background-color: #c6c6c6; - box-shadow: none; } + background-color: #c6c6c6; } scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { background-color: #aeaeae; border-color: #828282; - box-shadow: none; transition: 200ms ease-out; } scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { background-color: #c6c6c6; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { - box-shadow: none; } - row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled { - border-color: #12180c; } + row:selected scale trough:disabled, scale row:selected trough:disabled, row:selected scale fill:disabled, scale row:selected fill:disabled, row:selected progressbar trough:disabled, progressbar row:selected trough:disabled, row:selected scale trough, scale row:selected trough, row:selected scale fill, scale row:selected fill, row:selected progressbar trough, progressbar row:selected trough { + border-color: #12180c; } .osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); - background-color: rgba(0, 0, 0, 0.5); - box-shadow: none; - outline-color: rgba(238, 238, 236, 0.2); } + background-color: rgba(0, 0, 0, 0.5); } .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(49, 52, 52, 0.5); } @@ -3073,15 +3191,14 @@ scale trough { outline-offset: 2px; -gtk-outline-radius: 5px; } - scale fill, scale fill:backdrop { - background-color: #7a7a7a; - box-shadow: none; } - scale fill:disabled, scale fill:disabled:backdrop { + scale fill:backdrop, scale fill { + background-color: #7a7a7a; } + scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; background-color: transparent; } .osd scale fill { background-color: rgba(91, 91, 90, 0.775); } - .osd scale fill:disabled, .osd scale fill:disabled:backdrop { + .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: transparent; } scale slider { @@ -3092,7 +3209,7 @@ -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); background-image: linear-gradient(to bottom, lightgray 20%, #C6C6C6 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.6), inset 0 -2px #cbcbcb, inset 0 -1px #a7a7a7, 0 1px rgba(0, 0, 0, 0.1); - border: 1px solid #727272; + border: 1px solid #656565; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; } @@ -3129,7 +3246,7 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop:disabled label, scale slider:backdrop:disabled { color: #a0a0a0; } - row:selected scale slider, row:selected scale slider:disabled { + row:selected scale slider:disabled, row:selected scale slider { border-color: #12180c; } .osd scale slider { color: #eeeeec; @@ -3152,7 +3269,8 @@ box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); @@ -3162,7 +3280,8 @@ box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; - outline-color: rgba(238, 238, 236, 0.3); } + outline-color: rgba(238, 238, 236, 0.3); + background-color: #1c1f20; } .osd scale slider:disabled { color: #858786; border-color: rgba(0, 0, 0, 0.7); @@ -3171,7 +3290,8 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } .osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); @@ -3180,11 +3300,14 @@ background-clip: padding-box; box-shadow: none; text-shadow: none; - -gtk-icon-shadow: none; } + -gtk-icon-shadow: none; + background-color: #1c1f20; } + .osd scale slider:backdrop:disabled { + background-color: #1c1f20; } scale value { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks { - color: alpha(currentColor,0.4); } + color: alpha(currentColor,0.55); } scale marks.top { margin-bottom: 6px; margin-top: -12px; } @@ -3223,6 +3346,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); min-height: 26px; min-width: 22px; @@ -3237,6 +3361,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); min-height: 26px; min-width: 22px; @@ -3251,6 +3376,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); min-height: 26px; min-width: 22px; @@ -3265,6 +3391,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3279,6 +3406,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png")); min-height: 26px; min-width: 22px; @@ -3293,6 +3421,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3307,6 +3436,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png")); min-height: 26px; min-width: 22px; @@ -3321,6 +3451,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png")); min-height: 26px; min-width: 22px; @@ -3335,6 +3466,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png")); min-height: 26px; min-width: 22px; @@ -3349,6 +3481,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3363,6 +3496,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png")); min-height: 26px; min-width: 22px; @@ -3377,6 +3511,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 26px; min-width: 22px; @@ -3391,6 +3526,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png")); min-height: 22px; min-width: 26px; @@ -3405,6 +3541,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png")); min-height: 22px; min-width: 26px; @@ -3419,6 +3556,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png")); min-height: 22px; min-width: 26px; @@ -3433,6 +3571,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3447,6 +3586,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png")); min-height: 22px; min-width: 26px; @@ -3461,6 +3601,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3475,6 +3616,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png")); min-height: 22px; min-width: 26px; @@ -3489,6 +3631,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png")); min-height: 22px; min-width: 26px; @@ -3503,6 +3646,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png")); min-height: 22px; min-width: 26px; @@ -3517,6 +3661,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3531,6 +3676,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png")); min-height: 22px; min-width: 26px; @@ -3545,6 +3691,7 @@ margin: -10px; border-style: none; border-radius: 0; + background-color: transparent; background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png")); min-height: 22px; min-width: 26px; @@ -3559,7 +3706,7 @@ min-height: 0; min-width: 0; } scale.color trough { - background-image: linear-gradient(to top, #7a7a7a); + background-image: image(#7a7a7a); background-repeat: no-repeat; } scale.color.horizontal { padding: 0 0 15px 0; } @@ -3661,6 +3808,8 @@ progressbar.osd progress { border-style: none; border-radius: 0; } + progressbar trough.empty progress { + all: unset; } /************* * Level Bar * @@ -3692,10 +3841,7 @@ margin: 1px 0; } levelbar block { border: 1px solid; - border-radius: 1px; - box-shadow: 0 1px rgba(0, 0, 0, 0.2); } - levelbar block:backdrop { - box-shadow: none; } + border-radius: 1px; } levelbar block.low { border-color: #8f4700; background-color: #f57900; } @@ -3713,8 +3859,7 @@ border-color: #73d216; } levelbar block.empty { background-color: transparent; - border-color: rgba(22, 22, 22, 0.2); - box-shadow: none; } + border-color: rgba(22, 22, 22, 0.2); } levelbar block.empty:backdrop { border-color: rgba(110, 110, 110, 0.15); } @@ -4250,7 +4395,7 @@ /***************** * Color Chooser * *****************/ -colorswatch, colorswatch:drop(active) { +colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { border-top-left-radius: 5.5px; @@ -4297,10 +4442,9 @@ border-color: #4e9a06; box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; } colorswatch overlay { - box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7); border: 1px solid rgba(0, 0, 0, 0.3); } colorswatch overlay:hover { - box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); } colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { border-color: rgba(0, 0, 0, 0.3); box-shadow: none; } @@ -4393,11 +4537,14 @@ border-radius: 7px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); } .solid-csd decoration { + margin: 0; + padding: 4px; + background-color: #7a7a7a; + border: solid 1px #7a7a7a; border-radius: 0; - margin: 4px; - background-color: #C6C6C6; - border: solid 1px #828282; - box-shadow: none; } + box-shadow: inset 0 0 0 3px #f4f4f4, inset 0 1px rgba(255, 255, 255, 0.1); } + .solid-csd decoration:backdrop { + box-shadow: inset 0 0 0 3px #C6C6C6, inset 0 1px rgba(255, 255, 255, 0.1); } button.titlebutton { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); @@ -4422,8 +4569,7 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, -entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, -popover.background radiobutton:selected, +entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { background-color: #5E7F3E; } row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected, @@ -4435,11 +4581,9 @@ textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection, - entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, - popover.background radiobutton:selected, + entry selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); } + color: #ffffff; } row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus, textview text:disabled:selected:focus, @@ -4447,8 +4591,7 @@ iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, - entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, - popover.background radiobutton:disabled:selected, + entry selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected { color: #afbf9f; } row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, @@ -4458,8 +4601,7 @@ iconview text:backdrop:selected, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, - entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, - popover.background radiobutton:backdrop:selected, + entry selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected { color: #ffffff; } row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, @@ -4467,13 +4609,12 @@ iconview text:backdrop:disabled:selected, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, - entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, - popover.background radiobutton:backdrop:disabled:selected, + entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected { color: #8ea578; } .monospace { - font: Monospace; } + font-family: monospace; } /********************** * Touch Copy & Paste * @@ -4511,12 +4652,6 @@ .context-menu { font: initial; } -button.circular { - border-radius: 9999px; - -gtk-outline-radius: 9999px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; @@ -4539,7 +4674,8 @@ :not(decoration):not(window):drop(active):focus, :not(decoration):not(window):drop(active) { border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + box-shadow: inset 0 0 0 1px #4e9a06; + caret-color: #4e9a06; } stackswitcher button.text-button { min-width: 100px; }