diff --git a/README.md b/README.md index 95f09e8..5c714d7 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Reduce ugly padding from gnome default theme, Adwaita, to make it more compact a ![alt text](preview-3.png "Preview 3") ## Download + * [3.22.0](https://github.com/polter-rnd/adwaita-compact/archive/v3.22.0.tar.gz) * [3.20.9.1](https://github.com/abihf/adwaita-compact/archive/v3.20.9.1.tar.gz) * [3.20.0.1](https://github.com/abihf/adwaita-compact/archive/v3.20.0.1.tar.gz) * [3.16.2.1](https://github.com/abihf/adwaita-compact/archive/3.16.2.1.tar.gz) diff --git a/gnome-shell/_common.scss b/gnome-shell/_common.scss index fb95cc3..1b70c55 100644 --- a/gnome-shell/_common.scss +++ b/gnome-shell/_common.scss @@ -27,7 +27,7 @@ $panel-corner-radius: 0; /* GLOBALS */ -$font-size: 9; +$font-size: 11; $font-family: Cantarell, Sans-Serif; $_bubble_bg_color: opacify($osd_bg_color,0.25); $_bubble_fg_color: $osd_fg_color; diff --git a/gnome-shell/gnome-shell.css b/gnome-shell/gnome-shell.css index 43d80da..6008396 100644 --- a/gnome-shell/gnome-shell.css +++ b/gnome-shell/gnome-shell.css @@ -20,7 +20,7 @@ /* GLOBALS */ stage { font-family: Cantarell, Sans-Serif; - font-size: 9pt; + font-size: 11pt; color: #eeeeec; } /* WIDGETS */ diff --git a/gtk-2.0/main.rc b/gtk-2.0/main.rc index 58c45f6..9f67385 100644 --- a/gtk-2.0/main.rc +++ b/gtk-2.0/main.rc @@ -1045,9 +1045,8 @@ style "default" { # Scales # ########## - # Troughs - # They are overrided later on - # We set them here too because some widgets don't specify their orientation + # Troughs, overrided later on. We set them here too because some widgets + # don't specify their orientation. image { function = BOX @@ -2028,9 +2027,10 @@ style "combobox_entry" { style "combo_button_padding" { - # Since one side of the button is missing, we need to shift the arrow a little to the right + # Since one side of the button is missing, we need to shift the arrow a + # little to the right. # This is the same thing we've done above but the combo, unlike the combobox, - # uses padding the same way as a button + # uses padding the same way as a button. GtkButton::inner-border = {6, 8, 4, 4} } @@ -2470,71 +2470,81 @@ style "disable_separator" { } -# Default style, containing most of the stuff -class "GtkWidget" style "default" - -# Override padding, style and colour -class "GtkButton" style "button" -class "GtkLinkButton" style "link_button" -class "GtkEntry" style "entry" -class "GtkOldEditable" style "entry" -class "GtkNotebook" style "notebook" -class "GtkHScale" style "scale_horz" -class "GtkVScale" style "scale_vert" -class "GtkProgressBar" style "progressbar" -class "GtkScrolledWindow" style "scrolled_window" -class "GtkFrame" style "frame" -class "GtkSeparatorToolItem" style "toolbar_separator" -class "GtkMenuBar" style "menubar" -class "GtkMenu" style "menu" -class "GtkTextView" style "textview" +# Default style, containing theme properties and trying to match every widget as +# much as possible, which is not only faster than trying to match every widget +# by its own but also less bug-prune and more consistent. However there is some +# widget specific stuff that needs to be taken care of, which is the point of +# every other style below. +class "GtkWidget" style "default" + + ###################################### + # Override padding, style and colour # + ###################################### + +class "GtkButton" style "button" +class "GtkLinkButton" style "link_button" +class "GtkEntry" style "entry" +class "GtkOldEditable" style "entry" +class "GtkNotebook" style "notebook" +class "GtkHScale" style "scale_horz" +class "GtkVScale" style "scale_vert" +class "GtkProgressBar" style "progressbar" +class "GtkScrolledWindow" style "scrolled_window" +class "GtkFrame" style "frame" +class "GtkSeparatorToolItem" style "toolbar_separator" +class "GtkMenuBar" style "menubar" +class "GtkMenu" style "menu" +class "GtkTextView" style "textview" # Menu and menubar items -widget_class "**" style "menu_item" -widget_class "*.*" style "menubar_item" -widget_class "**" style "separator_menu_item" +widget_class "**" style "menu_item" +widget_class "*.*" style "menubar_item" +widget_class "**" style "separator_menu_item" # Frames in statusbars look ugly, let's disable them -widget_class "**" style "disable_shadow" +widget_class "**" style "disable_shadow" # Disable the frame around poor Wilbert too -widget_class "**" style "disable_shadow" +widget_class "**" style "disable_shadow" # Treeview buttons -widget_class "***" style "treeview_header" +widget_class "***" style "treeview_header" # Give the file chooser toolbar a border -widget_class "**" style "inline_toolbar" +widget_class "**" style "inline_toolbar" # Fix padding on regular comboboxes -widget_class "*." style "combobox" +widget_class "*." style "combobox" # And disable separators on them -widget_class "*.*" style "disable_separator" +widget_class "*.*" style "disable_separator" # Join together the ComboBoxEntry entry and button -widget_class "**" style "combobox_entry" +widget_class "**" style "combobox_entry" # Join the Combo entry and button -widget_class "**" style "combobox_entry" -# Tweak the padding on the button a little bit because it uses it a bit differently -widget_class "*." style "combo_button_padding" +widget_class "**" style "combobox_entry" +# Tweak the padding on the button a little bit because it +# uses it a bit differently +widget_class "*." style "combo_button_padding" -# Alas we cannot do the same for ComboBoxText because there isn't a way to apply the style to only -# the comboboxes that have an entry inside +# Alas we cannot do the same for ComboBoxText because there +# isn't a way to apply the style to only the comboboxes that +# have an entry inside # Toolbar buttons have different paddings -widget_class "**" style "toolbar_button" +widget_class "**" style "toolbar_button" # Notebooks are white, act accordingly -widget_class "**" style "notebook_entry" -widget_class "**" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "***" style "notebook_bg" -widget_class "**" style "notebook_bg" -widget_class "*.*" style "notebook_bg" -widget_class "***" style "notebook_combo" -widget_class "***" style "notebook_combo" - -# However, stuff inside eventboxes inside notebooks is grey again, react +widget_class "**" style "notebook_entry" +widget_class "**" style "notebook_bg" +widget_class "**" style "notebook_bg" +widget_class "***" style "notebook_bg" +widget_class "**" style "notebook_bg" +widget_class "*.*" style "notebook_bg" +widget_class "***" style "notebook_combo" +widget_class "***" style "notebook_combo" + +# However, stuff inside eventboxes inside notebooks is grey +# again, react widget_class "***" style "normal_entry" widget_class "***" style "normal_bg" widget_class "***" style "normal_bg" @@ -2542,8 +2552,9 @@ widget_class "****" style "combob widget_class "****" style "combobox_entry" widget_class "***." style "combo_button_padding" -# ComboBoxes tend to draw the button label with text[] instead of fg[], we need to fix that -widget_class "**" style "combobox_cellview" +# ComboBoxes tend to draw the button label with text[] +# instead of fg[], we need to fix that +widget_class "**" style "combobox_cellview" # GTK tooltips -widget "gtk-tooltip*" style "tooltip" +widget "gtk-tooltip*" style "tooltip" diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_colors-public.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_colors-public.scssc new file mode 100644 index 0000000..c9cec60 Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_colors-public.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_colors.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_colors.scssc new file mode 100644 index 0000000..010fe34 Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_colors.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_common.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_common.scssc new file mode 100644 index 0000000..2f40bd0 Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_common.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_drawing.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_drawing.scssc new file mode 100644 index 0000000..3563b40 Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/_drawing.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-contained-dark.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-contained-dark.scssc new file mode 100644 index 0000000..f06f7d5 Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-contained-dark.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-contained.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-contained.scssc new file mode 100644 index 0000000..2cb1edd Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-contained.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-dark.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-dark.scssc new file mode 100644 index 0000000..819311b Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk-dark.scssc differ diff --git a/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk.scssc b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk.scssc new file mode 100644 index 0000000..5331515 Binary files /dev/null and b/gtk-3.0/.sass-cache/0df810df876ad2ac5e1e8cb4c3b468a0934ad222/gtk.scssc differ diff --git a/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_colors-public.scssc b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_colors-public.scssc new file mode 100644 index 0000000..ec94f1c Binary files /dev/null and b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_colors-public.scssc differ diff --git a/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_colors.scssc b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_colors.scssc new file mode 100644 index 0000000..dc988be Binary files /dev/null and b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_colors.scssc differ diff --git a/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_common.scssc b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_common.scssc new file mode 100644 index 0000000..1996e8c Binary files /dev/null and b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_common.scssc differ diff --git a/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_drawing.scssc b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_drawing.scssc new file mode 100644 index 0000000..25725f0 Binary files /dev/null and b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/_drawing.scssc differ diff --git a/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/gtk-contained-dark.scssc b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/gtk-contained-dark.scssc new file mode 100644 index 0000000..92fe734 Binary files /dev/null and b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/gtk-contained-dark.scssc differ diff --git a/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/gtk-contained.scssc b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/gtk-contained.scssc new file mode 100644 index 0000000..d0e7b5c Binary files /dev/null and b/gtk-3.0/.sass-cache/8969c0aaa2833c07a1283264bb3df7e8fa9bd220/gtk-contained.scssc differ diff --git a/gtk-3.0/_colors-public.scss b/gtk-3.0/_colors-public.scss index ebc64f7..8ccc341 100644 --- a/gtk-3.0/_colors-public.scss +++ b/gtk-3.0/_colors-public.scss @@ -65,6 +65,10 @@ base background color of selections on backdrop windows */ text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color}; +/* +insensitive color on backdrop windows*/ +@define-color unfocused_insensitive_color #{"" + $backdrop_insensitive_color}; + /* widgets main borders color */ @define-color borders #{"" +$borders_color}; diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss index 755c779..597f94f 100644 --- a/gtk-3.0/_colors.scss +++ b/gtk-3.0/_colors.scss @@ -4,18 +4,19 @@ $base_color: if($variant == 'light', #ffffff, #232729); $text_color: if($variant == 'light', black, white); -$bg_color: if($variant == 'light', #f5f5f4, #33393b); +$bg_color: if($variant == 'light', #e8e8e7, #33393b); $fg_color: if($variant == 'light', #2e3436, #eeeeec); $selected_fg_color: #ffffff; -$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%)); +$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9, 20%)); $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%)); -$borders_color: if($variant == 'light', darken($bg_color,30%), darken($bg_color,12%)); +$borders_color: if($variant == 'light', darken($bg_color, 20%), darken($bg_color, 10%)); +$alt_borders_color: if($variant == 'light', darken($bg_color, 35%), darken($bg_color, 17%)); $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93)); -$link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%)); -$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%)); +$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%)); +$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%)); $top_hilight: $borders_edge; -$dark_fill: mix($borders_color, $bg_color, 35%); +$dark_fill: mix($borders_color, $bg_color, 50%); $headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%)); $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%)); $popover_bg_color: $bg_color; @@ -28,12 +29,12 @@ $scrollbar_slider_active_color: if($variant=='light', darken($selected_bg_color, $warning_color: #f57900; $error_color: #cc0000; -$success_color: if($variant == 'light', #73d216, darken(#73d216,10%)); -$destructive_color: if($variant == 'light', #ef2929, darken(#ef2929,10%)); +$success_color: if($variant == 'light', #73d216, darken(#73d216, 10%)); +$destructive_color: if($variant == 'light', #ef2929, darken(#ef2929, 10%)); $osd_fg_color: #eeeeec; $osd_text_color: white; -$osd_bg_color: transparentize(#202526, 0.2); +$osd_bg_color: transparentize(#1c1f20, 0.3); $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%); $osd_borders_color: transparentize(black, 0.3); @@ -58,7 +59,7 @@ $backdrop_bg_color: $bg_color; $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%); $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%)); $backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color); -$backdrop_borders_color: mix($borders_color, $bg_color, 90%); +$backdrop_borders_color: mix($borders_color, $bg_color, 80%); $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%); $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%); diff --git a/gtk-3.0/_common.scss b/gtk-3.0/_common.scss index 5a42b55..575a994 100644 --- a/gtk-3.0/_common.scss +++ b/gtk-3.0/_common.scss @@ -31,7 +31,7 @@ $button_transition: all 200ms $ease-out-quad; // 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; @@ -200,12 +200,12 @@ assistant { .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 +254,8 @@ entry { @include entry(normal); image { // icons inside the entry - &.left { padding-left: 0; padding-right: 4px; } - &.right { padding-left: 4px; padding-right: 0; } + &.left { margin-right: 4px; } + &.right { margin-left: 4px; } } undershoot { @@ -267,7 +267,7 @@ entry { &:focus, & { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } @@ -300,7 +300,7 @@ entry { } } - & image { // entry icons colors + image { // entry icons colors color: mix($fg_color, $base_color, 80%); &:hover { color: $fg_color; } @@ -360,19 +360,15 @@ entry { &: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(); } @@ -445,7 +441,7 @@ button { @at-root %button_basic, & { min-height: 18px; - min-width: 18px; + min-width: 16px; padding: 2px; border: 1px solid; border-radius: 3px; @@ -511,9 +507,8 @@ button { &.image-button { min-width: 18px; - min-height: 18px; - //padding-left: 2px; - //padding-right: 2px; + padding-left: 2px; + padding-right: 2px; } &.text-button { @@ -522,8 +517,8 @@ button { } &.text-button.image-button { - //padding-left: 2px; - //padding-right: 2px; + padding-left: 2px; + padding-right: 2px; label { padding-left: 4px; @@ -561,7 +556,6 @@ button { color: $osd_fg_color; border-radius: 3px; - outline-color: transparentize($osd_fg_color, 0.7); //FIXME: define a color var? @include button(osd); @@ -744,7 +738,13 @@ button { } } - //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; @@ -764,6 +764,35 @@ button { .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 { @@ -896,7 +925,7 @@ toolbar.inline-toolbar toolbutton:backdrop { 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; @@ -919,13 +948,6 @@ modelbutton.flat, &: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 { @@ -947,8 +969,16 @@ button.color { @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; }} } } } @@ -957,6 +987,8 @@ button.color { /********* * Links * *********/ + +%link, *:link { color: $link_color; @@ -1001,7 +1033,11 @@ button:visited { text-shadow: none; } - > label { text-decoration-line: underline; } + > label { + @extend %link; + + text-decoration-line: underline; + } } @@ -1026,6 +1062,8 @@ spinbutton { border: none; border-radius: 0; box-shadow: none; + + &:backdrop:disabled { background-color: transparent; } } button { @@ -1047,7 +1085,10 @@ spinbutton { 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); @@ -1063,11 +1104,15 @@ spinbutton { &: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; } } } @@ -1113,7 +1158,7 @@ spinbutton { 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; } } @@ -1128,6 +1173,7 @@ spinbutton { // 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) { @@ -1324,7 +1370,7 @@ headerbar { min-height: 32px; border-width: 0 0 1px; border-style: solid; - border-color: $borders_color; + border-color: $alt_borders_color; border-radius: 0; @include headerbar_fill; @@ -1339,9 +1385,9 @@ headerbar { } .title { - font-weight: bold; padding-left: 8px; padding-right: 8px; + font-weight: bold; } .subtitle { @@ -1356,8 +1402,8 @@ headerbar { $_hc: mix($top_hilight,$selected_bg_color, 50%); // hilight color color: $selected_fg_color; - text-shadow: 0 -1px transparentize(black, 0.5); border-color: $selected_borders_color; + text-shadow: 0 -1px transparentize(black, 0.5); @include headerbar_fill($selected_bg_color, $_hc); @@ -1456,7 +1502,8 @@ headerbar { .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; @@ -1476,8 +1523,8 @@ headerbar { .maximized & { &:backdrop, & { border-radius: 0; }} // squared corners when the window is maximized or tiled &.default-decoration { - padding: 2px; min-height: 24px; + padding: 2px; button.titlebutton { min-height: 22px; @@ -1486,6 +1533,18 @@ headerbar { 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 { @@ -1503,18 +1562,25 @@ headerbar { } } -.background:not(.tiled):not(.maximized) .titlebar { +.background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar { &:backdrop, & { border-top-left-radius: 4px; border-top-right-radius: 4px; } } -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: 4px; }} - - window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: 4px; }} +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) { @@ -1528,7 +1594,7 @@ headerbar { box-shadow: none; } - > separator { background-color: $borders_color; } + > separator { background-color: $borders_color; } // FIXME: use darker border? @extend %titlebar; } @@ -1575,7 +1641,7 @@ treeview.view { -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 @@ -1632,9 +1698,9 @@ treeview.view { &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - color: mix($fg_color, $base_color, 70%); + color: mix($text_color, $base_color, 70%); - &:hover { color: $fg_color; } + &:hover { color: $text_color; } &:selected { color: mix($selected_fg_color, $selected_bg_color, 70%); @@ -1657,11 +1723,9 @@ treeview.view { 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, & { @@ -1674,9 +1738,7 @@ treeview.view { @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' { @@ -1756,14 +1818,14 @@ treeview.view { 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-radius: 0; border-style: none; + border-radius: 0; box-shadow: inset 0 0 0 1px $base_color; text-shadow: none; + transition: none; } } @@ -1772,11 +1834,11 @@ treeview.view { %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; @@ -1784,9 +1846,9 @@ treeview.view { } &: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; @@ -1968,9 +2030,6 @@ popover.background { separator { margin: 3px; } list separator { margin: 0px; } - - checkbutton, - radiobutton { @extend modelbutton.flat; } } /************* @@ -2410,9 +2469,9 @@ scrollbar { &.horizontal { button { - &.down { -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); } + &.down { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } - &.up { -gtk-icon-source: -gtk-icontheme('pan-left-symbolic'); } + &.up { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); } } } } @@ -2429,22 +2488,18 @@ switch { 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: 2px; 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); } @@ -2452,17 +2507,14 @@ switch { &: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; @@ -2470,16 +2522,14 @@ switch { @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 { @@ -2545,8 +2595,7 @@ switch { (':backdrop:checked', '-checked-backdrop-selectionmode') { .view.content-view.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; } } @@ -2613,7 +2662,6 @@ radio { -gtk-icon-shadow: none; color: inherit; border-color: currentColor; - animation: none; } } } @@ -2640,34 +2688,28 @@ radio { -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; } -} +// 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); } -@keyframes check_radio { - from { -gtk-icon-transform: scale(0); } - to { -gtk-icon-transform: unset; } -} +check:not(:indeterminate):not(:checked):active:not(:backdrop) { -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } -@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; } +radio, +check { + &:active { -gtk-icon-transform: scale(0, 1); } // should tackle the indeterminate state, untested -check:indeterminate:checked, radio:indeterminate:checked { animation: check_indeterminate 400ms; } + &:checked:not(:backdrop), &:indeterminate:not(:backdrop) { + -gtk-icon-transform: unset; + transition: 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, @@ -2699,35 +2741,24 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work 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; } } @@ -2753,7 +2784,7 @@ treeview.view radio:selected { &:focus, & { @extend %radio; }} // This is a work } // ...on selected list rows - row:selected & { &:disabled, & { border-color: $selected_borders_color; } } + row:selected & { &:disabled, & { border-color: $selected_borders_color; }} // OSD .osd & { @@ -2825,13 +2856,10 @@ scale { 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; } @@ -2842,7 +2870,7 @@ scale { background-color: mix($osd_fg_color, $osd_borders_color, 25%); &:disabled { - &, &:backdrop { + &:backdrop, & { border-color: transparent; background-color: transparent; } @@ -2853,7 +2881,7 @@ scale { 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; @@ -2862,7 +2890,7 @@ scale { &:active { border-color: $selected_borders_color; } - &:disabled { @include button (insensitive); } + &:disabled { @include button(insensitive); } &:backdrop { transition: $backdrop_transition; @@ -2873,7 +2901,7 @@ scale { } // ...on selected list rows - row:selected & { &, &:disabled { border-color: $selected_borders_color; } } + row:selected & { &:disabled, & { border-color: $selected_borders_color; } } // OSD .osd & { @@ -2881,24 +2909,37 @@ scale { border-color: darken($osd_borders_color, 3%); background-color: opacify($osd_bg_color, 1); // solid background needed here - &:hover { @include button(osd-hover); } + &:hover { + @include button(osd-hover); + background-color: opacify($osd_bg_color, 1); // solid background needed here + } - &:active { @include button(osd-active); } + &:active { + @include button(osd-active); + background-color: opacify($osd_bg_color, 1); // solid background needed here + } - &:disabled { @include button(osd-insensitive); } + &:disabled { + @include button(osd-insensitive); + background-color: opacify($osd_bg_color, 1); // solid background needed here + } &:backdrop { @include button(osd-backdrop); + background-color: opacify($osd_bg_color, 1); // solid background needed here - &:disabled { @include button(osd-backdrop-insensitive); } + &: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), @@ -2922,6 +2963,7 @@ scale { } } } + &.horizontal { indicator { min-height: $_marks_lenght; @@ -2930,6 +2972,7 @@ scale { &.fine-tune indicator { min-height: ($_marks_lenght - 3px); } } + &.vertical { indicator { min-height: 1px; @@ -2938,6 +2981,7 @@ scale { &.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... @@ -2964,6 +3008,7 @@ scale { 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; @@ -3030,7 +3075,7 @@ scale { min-width: 0; trough { - background-image: linear-gradient(to top, $borders_color); + background-image: image($borders_color); background-repeat: no-repeat; } @@ -3220,6 +3265,8 @@ progressbar { border-radius: 0; } } + + trough.empty progress { all: unset; } // makes the progress indicator disappear, when the fraction is 0 } @@ -3255,9 +3302,6 @@ levelbar { 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); @@ -3284,7 +3328,6 @@ levelbar { &.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); } } @@ -3918,11 +3961,9 @@ colorswatch { // 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 @@ -4004,10 +4045,12 @@ colorswatch { } 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); @@ -4061,7 +4104,7 @@ colorchooser .popover.osd { border-radius: 5px; } &:backdrop { background-color: darken($bg_color,7%); } - rubberband { @extend rubberband; } + rubberband, .rubberband { @extend rubberband; } } .scale-popup { @@ -4128,7 +4171,7 @@ decoration { .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 & { @@ -4139,15 +4182,18 @@ decoration { messagedialog.csd & { border-radius: 4px; 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: 2px; + background-color: $borders_color; + border: solid 1px $borders_color; border-radius: 0; - margin: 2px; - 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; } } } @@ -4184,8 +4230,6 @@ headerbar.selection-mode button.titlebutton, @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 { @@ -4196,7 +4240,7 @@ headerbar.selection-mode button.titlebutton, } } -.monospace { font: Monospace; } +.monospace { font-family: monospace; } /********************** @@ -4236,13 +4280,6 @@ cursor-handle { .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview -button.circular { // FIXME: aggregate to buttons - border-radius: 20px; - -gtk-outline-radius: 20px; - - label { padding: 0; } -} - // shortcut window keys .keycap { min-width: 20px; @@ -4267,16 +4304,14 @@ button.circular { // FIXME: aggregate to buttons } } -*:drop(active):focus, -*:drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die +:not(decoration):not(window):drop(active):focus, +: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: 60px; - min-height: 16px; -} // FIXME aggregate with buttons +stackswitcher button.text-button { min-width: 60px; } // FIXME aggregate with buttons stackswitcher button.circular, stackswitcher button.text-button.circular { // FIXME aggregate with buttons diff --git a/gtk-3.0/_drawing.scss b/gtk-3.0/_drawing.scss index 7ccedfe..6e808b3 100644 --- a/gtk-3.0/_drawing.scss +++ b/gtk-3.0/_drawing.scss @@ -8,35 +8,26 @@ @else { @return 0 1px $c; } } -@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) { +@mixin _shadows($list...) { // -// Helper function to stack up to 4 box-shadows; +// Helper mixin to stack up to box-shadows; // - @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; } - @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; } - @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; } - @else { box-shadow: $shadow1; } + $shadows: null; + + @each $shadow in $list { + @if $shadow!=none { $shadows: $shadows, $shadow; } + } + + box-shadow: $shadows; } // entries - @function entry_focus_border($fc:$selected_bg_color) { @if $variant == 'light' { @return $fc; } @else { @return if($fc==$selected_bg_color, $selected_borders_color, darken($fc, 35%)); } } -@function entry_focus_shadow($fc:$selected_bg_color) { - @return inset 0 0 0 1px $fc; -} - -@function entry_gradient($c) { - @if $variant=='light' { @return linear-gradient(to bottom, mix($borders_color, $c, 45%), - mix($borders_color, $c, 3%) 2px, - $c 90%); } - @else { @return linear-gradient(to bottom, mix($borders_color, $c, 95%), - mix($borders_color, $c, 40%) 3px, - $c 90%); } -} +@function entry_focus_shadow($fc:$selected_bg_color) { @return inset 0 0 0 1px $fc; } @mixin entry($t, $fc:$selected_bg_color, $edge: none) { // @@ -57,7 +48,7 @@ @if $t==normal { color: $text_color; border-color: $borders_color; - background-image: entry_gradient($base_color); + background-color: $base_color; @include _shadows(entry_focus_shadow(transparentize($fc, 1)), $_entry_edge); // for the transition to work the number of shadows in different states needs to match, hence the transparent shadow here. } @@ -68,25 +59,25 @@ @if $t==insensitive { color: $insensitive_fg_color; border-color: $borders_color; - background-image: linear-gradient(to bottom, $insensitive_bg_color); + background-color: $insensitive_bg_color; box-shadow: $_entry_edge; } @if $t==backdrop { color: $backdrop_text_color; border-color: $backdrop_borders_color; - background-image: linear-gradient(to bottom, $backdrop_base_color); + background-color: $backdrop_base_color; box-shadow: $_blank_edge; } @if $t==backdrop-insensitive { color: $backdrop_insensitive_color; border-color: $backdrop_borders_color; - background-image: linear-gradient(to bottom, $insensitive_bg_color); + background-color: $insensitive_bg_color; box-shadow: $_blank_edge; } @if $t==osd { color: $osd_text_color; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5)); + background-color: transparentize(opacify($osd_borders_color, 1), 0.5); background-clip: padding-box; box-shadow: none; text-shadow: 0 1px black; @@ -95,7 +86,7 @@ @if $t==osd-focus { color: $osd_text_color; border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5)); + background-color: transparentize(opacify($osd_borders_color, 1), 0.5); background-clip: padding-box; box-shadow: entry_focus_shadow($fc); text-shadow: 0 1px black; @@ -104,7 +95,7 @@ @if $t==osd-insensitive { color: $osd_insensitive_fg_color; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + background-color: $osd_insensitive_bg_color; background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -113,7 +104,7 @@ @if $t==osd-backdrop { color: $osd_text_color; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5)); + background-color: transparentize(opacify($osd_borders_color, 1), 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -123,9 +114,10 @@ // buttons -@function _border_color ($c) { @return darken($c, 25%); } // colored buttons want - // the border form the - // base color +@function _border_color($c, $darker: false) { + @if $darker == true { @return darken($c, 30%); } + @else { @return darken($c, 20%); } +} @function _text_shadow_color ($tc: $fg_color, $bg: $bg_color) { // @@ -189,7 +181,8 @@ // backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active, // osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated // - +// This mixin sets the $button_fill global variable which containts the button background-image +// $_hilight_color: _button_hilight_color($c); $_button_edge: if($edge == none, none, _widget_edge($edge)); $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1))); @@ -200,9 +193,11 @@ // color: $tc; outline-color: transparentize($tc, 0.7); - border-color: if($c!=$bg_color, _border_color($c), $borders_color); - @if $variant == 'light' { background-image: linear-gradient(to bottom, $c, darken($c, 4%) 60%, darken($c, 10%)); } - @else { background-image: linear-gradient(to bottom, darken($c, 2%), darken($c, 4%) 60%, darken($c, 6%)); } + border-color: if($c != $bg_color, _border_color($c), $borders_color); + border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color); + $button_fill: if($variant == 'light', linear-gradient(to bottom, $c, darken($c, 4%) 60%, darken($c, 10%)), + linear-gradient(to bottom, darken($c, 2%), darken($c, 4%) 60%, darken($c, 6%))) !global; + background-image: $button_fill; @include _button_text_shadow($tc, $c); @include _shadows(inset 0 1px $_hilight_color, $_button_edge); } @@ -213,17 +208,19 @@ // color: $tc; outline-color: transparentize($tc, 0.7); - border-color: if($c!=$bg_color, _border_color($c), $borders_color); + border-color: if($c != $bg_color, _border_color($c), $borders_color); + border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color); @if $variant == 'light' { - background-image: linear-gradient(to bottom, lighten($c, 6%), $c 60%, darken($c, 4%)); - @include _button_text_shadow($tc,lighten($c, 6%)); + $button_fill: linear-gradient(to bottom, lighten($c, 6%), $c 60%, darken($c, 4%)) !global; + @include _button_text_shadow($tc, lighten($c, 6%)); @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge); } @else { - background-image: linear-gradient(to bottom, lighten($c, 1%), darken($c, 2%) 60%, darken($c, 4%)); + $button_fill: linear-gradient(to bottom, lighten($c, 1%), darken($c, 2%) 60%, darken($c, 4%)) !global; @include _button_text_shadow($tc,lighten($c, 6%)); @include _shadows(inset 0 1px _button_hilight_color(darken($c, 2%)), $_button_edge); } + background-image: $button_fill; } @if $t==normal-alt { @@ -232,7 +229,7 @@ // color: $tc; outline-color: transparentize($tc, 0.7); - border-color: if($c!=$bg_color, _border_color($c), $borders_color); + border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color); @include _button_text_shadow($tc, $c); @if $variant == 'light' { background-image: linear-gradient(to bottom, lighten($c, 5%) 20%, $c 90%); @@ -256,66 +253,69 @@ // color: $tc; outline-color: transparentize($tc, 0.7); - border-color: if($c!=$bg_color, _border_color($c), $borders_color); + border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color); @if $variant == 'light' { - background-image: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%); - box-shadow: inset 0 1px _button_hilight_color(lighten($c, 6%)), - inset 0 -2px lighten($c, 5%), - inset 0 -1px darken($c, 10%), - $_button_edge; + $button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%) !global; + @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), + inset 0 -2px lighten($c, 5%), + inset 0 -1px darken($c, 10%), + $_button_edge); } @else { - background-image: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%); + $button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%) !global; @include _shadows(inset 0 1px $_hilight_color, inset 0 -2px darken($c, 3%), inset 0 -1px darken($c, 6%), $_button_edge); } + background-image: $button_fill; } - @else if $t==active { // // pushed button // color: $tc; outline-color: transparentize($tc, 0.7); - border-color: if($c!=$bg_color, _border_color($c), $borders_color); - @if $variant == 'light' { background-image: linear-gradient(to bottom, darken($c, 13%), darken($c, 5%)); } - @else { background-image: linear-gradient(to bottom, darken($c, 9%), darken($c, 5%)); } - @include _button_text_shadow($tc, darken($c,10%)); - @include _shadows(inset 0 2px 1px -2px transparentize(black,0.4), - $_button_edge); + border-color: if($c != $bg_color, _border_color($c), $borders_color); + $button_fill: image(darken($c, 6%)) !global; + background-image: $button_fill; + @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge); + + text-shadow: none; + -gtk-icon-shadow: none; } + @else if $t==insensitive { // // insensitive button // - $_bg: if($c!=$bg_color, mix($c, $base_color, 85%), $insensitive_bg_color); + $_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color); - label, & { color: if($tc!=$fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); } + label, & { color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); } - border-color: if($c!=$bg_color, _border_color($c), - $insensitive_borders_color); - background-image: linear-gradient(to bottom, $_bg); + border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color); + $button_fill: image($_bg) !global; + background-image: $button_fill; text-shadow: none; -gtk-icon-shadow: none; // white with 0 alpha to avoid an ugly transition, since no color means // black with 0 alpha @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge); } + @else if $t==insensitive-active { // // insensitive pushed button // - $_bg: if($c!=$bg_color, darken(mix($c,$base_color, 85%), 5%), - $insensitive_bg_color); - $_bc: if($c!=$bg_color, _border_color($c), $insensitive_borders_color); + $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%)); + $_bc: if($c != $bg_color, _border_color($c), $insensitive_borders_color); - label, & { color: if($c!=$bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); } + label, & { color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); } border-color: $_bc; - background-image: linear-gradient(to bottom, mix($_bc, $_bg, 10%), $_bg); + $button_fill: image($_bg) !global; + background-image: $button_fill; // white with 0 alpha to avoid an ugly transition, since no color means // black with 0 alpha @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge); @@ -325,32 +325,32 @@ // // backdrop button // - $_bg: if($c!=$bg_color,$c,$backdrop_bg_color); - $_bc: if($variant=='light',$c,_border_color($c)); + $_bg: if($c != $bg_color, $c, $backdrop_bg_color); + $_bc: if($variant == 'light', $c, _border_color($c)); - label, & { color: if($tc!=$fg_color,mix($tc, $_bg, 80%), $backdrop_fg_color); } + label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); } - border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color); - background-image: linear-gradient(to bottom, $_bg); + border-color: if($c != $bg_color, $_bc, $backdrop_borders_color); + $button_fill: image($_bg) !global; + background-image: $button_fill; text-shadow: none; -gtk-icon-shadow: none; - @include _shadows(inset 0 1px transparentize(white, 1), - $_blank_edge); + @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge); } @else if $t==backdrop-active { // - // backdrop pushed button FIXME no colors here! + // backdrop pushed button // - $_bg: if($c!=$bg_color, darken($c, 10%), $backdrop_dark_fill); - $_bc: if($variant=='light',$_bg,_border_color($c)); + $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%)); + $_bc: if($variant == 'light', $_bg ,_border_color($c)); - label, & { color: if($tc!=$fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); } + label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); } - border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color); - background-image: linear-gradient(to bottom, $_bg); - @include _shadows(inset 0 1px transparentize(white, 1), - $_blank_edge); + border-color: if($c != $bg_color, $_bc, $backdrop_borders_color); + $button_fill: image($_bg) !global; + background-image: $button_fill; + @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge); } @else if $t==backdrop-insensitive { @@ -358,19 +358,19 @@ // backdrop insensitive button // - $_bg: if($c!=$bg_color, mix($c, $base_color, 85%), $insensitive_bg_color); - $_bc: if($variant=='light', $_bg,_border_color($c)); + $_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color); + $_bc: if($variant == 'light', $_bg,_border_color($c)); - label, & { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); } + label, & { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); } - border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color); - background-image: linear-gradient(to bottom, $_bg); + border-color: if($c != $bg_color, $_bc, $backdrop_borders_color); + $button_fill: image($_bg) !global; + background-image: $button_fill; text-shadow: none; -gtk-icon-shadow: none; // white with 0 alpha to avoid an ugly transition, since no color means // black with 0 alpha - @include _shadows(inset 0 1px transparentize(white, 1), - $_blank_edge); + @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge); } @else if $t==backdrop-insensitive-active { @@ -378,134 +378,119 @@ // backdrop insensitive pushed button // - $_bg: if($c!=$bg_color, darken(mix($c, $base_color, 85%), 5%), - darken($insensitive_bg_color, 5%)); - $_bc: if($variant=='light', $_bg,_border_color($c)); + $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%)); + $_bc: if($variant == 'light', $_bg, _border_color($c)); - label { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); } + label { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); } - border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color); - background-image: linear-gradient(to bottom, $_bg); - @include _shadows(inset 0 1px transparentize(white, 1), - $_blank_edge); + border-color: if($c != $bg_color, $_bc, $backdrop_borders_color); + $button_fill: image($_bg) !global; + background-image: $button_fill; + @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge); } @else if $t==osd { // // normal osd button // - $_bg: if($c!=$bg_color, transparentize($c, 0.5), - $osd_bg_color); + $_bg: if($c != $bg_color, transparentize($c, 0.5), $osd_bg_color); color: $osd_fg_color; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, $_bg); + background-color: transparent; + $button_fill: image($_bg) !global; + background-image: $button_fill; background-clip: padding-box; box-shadow: inset 0 1px transparentize(white, 0.9); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: transparentize($osd_fg_color, 0.7); } + @else if $t==osd-hover { // // active osd button // - $_bg: if($c!=$bg_color, transparentize($c, 0.3), - lighten($osd_bg_color, 12%)); + $_bg: if($c != $bg_color, transparentize($c, 0.3), lighten($osd_bg_color, 12%)); color: white; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, $_bg); + background-color: transparent; + $button_fill: image($_bg) !global; + background-image: $button_fill; background-clip: padding-box; box-shadow: inset 0 1px transparentize(white, 0.9); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: transparentize($osd_fg_color, 0.7); } + @else if $t==osd-active { // // active osd button // - $_bg: if($c!=$bg_color, $c, $osd_borders_color); + $_bg: if($c != $bg_color, $c, $osd_borders_color); color: white; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, $_bg); + background-color: transparent; + $button_fill: image($_bg) !global; + background-image: $button_fill; background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: transparentize($osd_fg_color, 0.7); } + @else if $t==osd-insensitive { // // insensitive osd button // color: $osd_insensitive_fg_color; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); + background-color: transparent; + $button_fill: image($osd_insensitive_bg_color) !global; + background-image: $button_fill; background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } + @else if $t==osd-backdrop { // // backdrop osd button // - $_bg: if($c!=$bg_color, transparentize($c, 0.5), - $osd_bg_color); + $_bg: if($c != $bg_color, transparentize($c, 0.5), $osd_bg_color); color: $osd_fg_color; border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, $_bg); + background-color: transparent; + $button_fill: image($_bg) !global; + background-image: $button_fill; background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } + @else if $t==undecorated { // // reset // border-color: transparent; background-color: transparent; - background-image: none; + $button_fill: none !global; + background-image: $button_fill; - @include _shadows(inset 0 1px transparentize(white, 1), - $_blank_edge); + @include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge); text-shadow: none; -gtk-icon-shadow: none; } } -@mixin trough($flat:false, $c:$bg_color, $tc:$fg_color, $noedge:true) { - color: mix($tc, $bg_color, 80%); - @if $flat { background-image: linear-gradient(to bottom, $c); } - @else { - background-image: linear-gradient(to bottom, - mix(black,$c,15%) 5%, - mix(black,$c,10%) 20%, - mix(black,$c,10%) 90%, - $c); - } - - border-color: if($c!=$bg_color, _border_color($c), $border_color); - - @if not($noedge) { - @if lightness($c) > 60% { - box-shadow: inset 0 -1px $borders_edge, - 0 1px $borders_edge; - } - @else { - box-shadow: inset 0 -1px transparentize($borders_edge, 0.5), - 0 1px transparentize($borders_edge, 0.5); - } - } - @else { box-shadow: none; } -} - @mixin headerbar_fill($c:$headerbar_color, $hc:$top_hilight, $ov: none) { // // headerbar fill @@ -514,7 +499,7 @@ // $hc: top highlight color // $ov: a background layer for background shorthand (hence no commas!) // - $gradient: linear-gradient(to top, darken($c, 13%), darken($c, 2%)); + $gradient: linear-gradient(to top, darken($c, 13%), darken($c, 2%) 2px, $c 3px); @if $variant == 'dark' { $gradient: linear-gradient(to top, darken($c, 3%), darken($c, 1%) 2px, $c 3px); } diff --git a/gtk-3.0/assets.svg b/gtk-3.0/assets.svg index e8f119c..880538f 100644 --- a/gtk-3.0/assets.svg +++ b/gtk-3.0/assets.svg @@ -15,9 +15,22 @@ id="svg9892" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="assets.svg"> + sodipodi:docname="assets.svg" + viewBox="0 0 1000 1052.3622"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="matrix(3.0403456,0,0,1.0053174,-43.533507,4.178448)" + x1="94.883377" + y1="-16.46591" + x2="94.883377" + y2="2.869415" /> + + + + + + + + + + + + + y2="2.869415" /> + y2="2.869415" /> + + + + + + + + + + + + + + + + + + + + + + + + + @@ -527,7 +565,16 @@ + id="guide8384" + inkscape:locked="false" /> + + @@ -547,7 +594,7 @@ inkscape:label="superbackdrop" style="display:inline"> - + d="m -7,-155.36218 392.87714,0 0,440 -392.87714,0 z" + id="rect18028" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4664);fill-opacity:1;fill-rule:nonzero;stroke:#91918c;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> @@ -627,7 +669,7 @@ transform="matrix(1.0002138,0,0,0.99956352,-0.04810496,-20.007174)" inkscape:label="#g5522"> @@ -635,13 +677,13 @@ inkscape:connector-curvature="0" id="path3497" d="m 218.28249,4.0830772 c 3.70998,3.7225673 9.72504,3.7225638 13.43502,0 3.70999,-3.72256391 3.70999,-9.7580291 0,-13.4805964 L 225,-16.137818 l -6.71751,6.7402988 c -3.70999,3.7225638 -3.70999,9.75802901 0,13.4805964 z" - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4605);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4666);fill-opacity:1;fill-rule:nonzero;stroke:#91918c;stroke-width:1.00058116;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" /> + transform="rotate(180,209.99273,-2.6314087)"> @@ -652,7 +694,7 @@ inkscape:connector-curvature="0" /> @@ -670,16 +712,16 @@ inkscape:connector-curvature="0" id="path3497-0-7" d="m 261.70963,4.0924971 c 3.7205,-3.70998424 3.7205,-9.7250478 0,-13.4350284 -3.72049,-3.7099807 -9.75259,-3.7099847 -13.47308,-2e-7 l -6.73655,6.7175144 6.73655,6.7175147 c 3.72049,3.7099806 9.75259,3.7099837 13.47308,-5e-7 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6165);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4668);fill-opacity:1;fill-rule:nonzero;stroke:#91918c;stroke-width:1.0002637;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -703,18 +745,18 @@ inkscape:connector-curvature="0" id="path3497-0" d="m 278.29038,-9.3425315 c -3.7205,3.7099842 -3.7205,9.72504797 0,13.4350286 3.72049,3.7099807 9.75259,3.7099842 13.47308,0 l 6.73655,-6.7175144 -6.73655,-6.7175145 c -3.72049,-3.7099802 -9.75259,-3.7099842 -13.47308,3e-7 z" - style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4637);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:nonzero;stroke:#91918c;stroke-width:1.0002637;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" /> @@ -733,12 +775,12 @@ inkscape:connector-curvature="0" id="path3497-8-2-6" d="m 201.71752,171.66311 c -3.70998,-3.71842 -9.72505,-3.71842 -13.43503,0 -3.70999,3.71841 -3.70999,9.74716 0,13.46558 l 6.71751,6.73279 6.71752,-6.73279 c 3.70999,-3.71842 3.70999,-9.74716 0,-13.46558 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;opacity:0.1" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5461);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -768,18 +810,18 @@ inkscape:connector-curvature="0" id="path3497-3-3" d="m 218.28249,185.08348 c 3.70998,3.72257 9.72504,3.72256 13.43502,0 3.70999,-3.72257 3.70999,-9.75803 0,-13.4806 L 225,164.86258 l -6.71751,6.7403 c -3.70999,3.72257 -3.70999,9.75803 0,13.4806 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;opacity:0.2" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5463);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00054956;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> + transform="rotate(180,209.99273,87.36859)"> @@ -790,7 +832,7 @@ inkscape:connector-curvature="0" /> @@ -808,18 +850,18 @@ inkscape:connector-curvature="0" id="path3497-0-7-4" d="m 261.70963,184.0925 c 3.7205,-3.70999 3.7205,-9.72505 0,-13.43503 -3.72049,-3.70998 -9.75259,-3.70998 -13.47308,0 l -6.73655,6.71751 6.73655,6.71752 c 3.72049,3.70998 9.75259,3.70998 13.47308,0 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4838-7-9-0);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5465);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00026881;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -843,18 +885,18 @@ inkscape:connector-curvature="0" id="path3497-0-9" d="m 278.29038,170.65747 c -3.7205,3.70998 -3.7205,9.72505 0,13.43503 3.72049,3.70998 9.75259,3.70998 13.47308,0 l 6.73655,-6.71752 -6.73655,-6.71751 c -3.72049,-3.70998 -9.75259,-3.70999 -13.47308,0 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4838-7-9-8);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5467);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00026896;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -879,7 +921,7 @@ inkscape:connector-curvature="0" id="path3497-8-5" d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -3.70999,9.74715932 0,13.4655793 L 195,10.862168 201.71751,4.1293766 c 3.70999,-3.71841698 3.70999,-9.7471583 0,-13.4655793 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4791);fill-opacity:1;fill-rule:nonzero;stroke:#91918b;stroke-width:1.00014535;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -905,7 +947,7 @@ transform="matrix(1,0,0,0.99944391,2.5596046e-6,9.991327)" inkscape:label="#g5522-9"> @@ -913,13 +955,13 @@ inkscape:connector-curvature="0" id="path3497-9" d="m 218.28249,4.0830772 c 3.70998,3.7225673 9.72504,3.7225638 13.43502,0 3.70999,-3.72256391 3.70999,-9.7580291 0,-13.4805964 L 225,-16.137818 l -6.71751,6.7402988 c -3.70999,3.7225638 -3.70999,9.75802901 0,13.4805964 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-5);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4793);fill-opacity:1;fill-rule:nonzero;stroke:#91918b;stroke-width:1.00074799;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> + transform="rotate(180,209.99273,-2.6314087)"> @@ -930,7 +972,7 @@ inkscape:connector-curvature="0" /> @@ -949,17 +991,17 @@ inkscape:connector-curvature="0" id="path3497-0-7-6" d="m 261.70963,4.0924971 c 3.7205,-3.70998424 3.7205,-9.7250478 0,-13.4350284 -3.72049,-3.7099807 -9.75259,-3.7099847 -13.47308,-2e-7 l -6.73655,6.7175144 6.73655,6.7175147 c 3.72049,3.7099806 9.75259,3.7099837 13.47308,-5e-7 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-3);fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4795);fill-opacity:1;fill-rule:nonzero;stroke:#91918b;stroke-width:1.0000929;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4797);fill-opacity:1;fill-rule:nonzero;stroke:#91918b;stroke-width:1.0000929;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -1014,12 +1056,12 @@ inkscape:connector-curvature="0" id="path3497-8-5-5-9-2-9-7" d="m 201.71751,-8.3368901 c -3.70998,-3.7184299 -9.72504,-3.7184199 -13.43502,0 -3.70999,3.71841 -3.70999,9.74716 0,13.46558 L 195,11.86148 201.71751,5.1286899 c 3.70999,-3.71842 3.70999,-9.74716 0,-13.46558 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;opacity:0" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1032,12 +1074,12 @@ inkscape:connector-curvature="0" id="path3497-9-4-8-8-9-7" d="m 218.28249,5.0834806 c 3.70998,3.72256 9.72504,3.72256 13.43502,0 3.70999,-3.72257 3.70999,-9.75803 0,-13.4806 L 225,-15.13742 l -6.71751,6.7403006 c -3.70999,3.72256 -3.70999,9.75803 0,13.4806 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;opacity:0" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5475);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -1121,11 +1163,11 @@ inkscape:connector-curvature="0" id="path3497-3-5" d="m 218.28249,184.08308 c 3.70998,3.72257 9.72504,3.72256 13.43502,0 3.70999,-3.72257 3.70999,-9.75803 0,-13.4806 L 225,163.86218 l -6.71751,6.7403 c -3.70999,3.72257 -3.70999,9.75803 0,13.4806 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-9);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5473);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00054957;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> + transform="rotate(180,209.99273,87.36859)"> @@ -1157,18 +1199,18 @@ inkscape:connector-curvature="0" id="path3497-0-7-4-4" d="m 261.70963,184.0925 c 3.7205,-3.70999 3.7205,-9.72505 0,-13.43503 -3.72049,-3.70998 -9.75259,-3.70998 -13.47308,0 l -6.73655,6.71751 6.73655,6.71752 c 3.72049,3.70998 9.75259,3.70998 13.47308,0 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-5);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5471);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00026881;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -1193,18 +1235,18 @@ inkscape:connector-curvature="0" id="path3497-0-9-0" d="m 278.29038,170.65747 c -3.7205,3.70998 -3.7205,9.72505 0,13.43503 3.72049,3.70998 9.75259,3.70998 13.47308,0 l 6.73655,-6.71752 -6.73655,-6.71751 c -3.72049,-3.70998 -9.75259,-3.70999 -13.47308,0 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-6);fill-opacity:1.0;fill-rule:nonzero;stroke:#1f2222;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5469);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00026896;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;font-variant-east_asian:normal;opacity:1" /> @@ -1224,7 +1266,7 @@ inkscape:connector-curvature="0" id="path3497-8-5-5-9-2-9-6" d="m 201.71751,-9.3362027 c -3.70998,-3.7184223 -9.72504,-3.7184173 -13.43502,0 -3.70999,3.718416 -3.70999,9.74715932 0,13.4655793 L 195,10.862168 201.71751,4.1293766 c 3.70999,-3.71841698 3.70999,-9.7471583 0,-13.4655793 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d99;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:1.00048888;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e8e8e7;fill-opacity:1;fill-rule:nonzero;stroke:#c0c0bd;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#b6b6b3;stroke-width:0.99952848;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#b6b6b3;stroke-width:1.00006702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#b6b6b3;stroke-width:0.99979044;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:#b6b6b3;stroke-width:0.99979044;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> @@ -1375,7 +1417,7 @@ inkscape:connector-curvature="0" id="path3497-9-4-8-8-9-4" d="m 218.28249,4.0830772 c 3.70998,3.7225673 9.72504,3.7225638 13.43502,0 3.70999,-3.72256391 3.70999,-9.7580291 0,-13.4805964 L 225,-16.137818 l -6.71751,6.7402988 c -3.70999,3.7225638 -3.70999,9.75802901 0,13.4805964 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.000278;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:1.00054941;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:1.00026885;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:1.00026885;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#33393b;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1441,7 +1483,7 @@ inkscape:connector-curvature="0" id="path3497-9-4-8-8-9-2-6" d="m 218.28249,4.0830772 c 3.70998,3.7225673 9.72504,3.7225638 13.43502,0 3.70999,-3.72256391 3.70999,-9.7580291 0,-13.4805964 L 225,-16.137818 l -6.71751,6.7402988 c -3.70999,3.7225638 -3.70999,9.75802901 0,13.4805964 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#393f3f;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.000278;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#33393b;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:1.000278;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#33393b;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#33393b;fill-opacity:1;fill-rule:nonzero;stroke:#202425;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#1b1f20;stroke-width:0.99951455;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> @@ -1507,7 +1549,7 @@ inkscape:connector-curvature="0" id="path3497-9-4-8-8-9-2-7-2" d="m 218.28249,4.0830772 c 3.70998,3.7225673 9.72504,3.7225638 13.43502,0 3.70999,-3.72256391 3.70999,-9.7580291 0,-13.4805964 L 225,-16.137818 l -6.71751,6.7402988 c -3.70999,3.7225638 -3.70999,9.75802901 0,13.4805964 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#333636;fill-opacity:1;fill-rule:nonzero;stroke:#1f2222;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#1b1f20;stroke-width:1.00006381;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#1b1f20;stroke-width:0.99978339;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d3234;fill-opacity:1;fill-rule:nonzero;stroke:#1b1f20;stroke-width:0.99978339;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-6);fill-opacity:1.0;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1581,7 +1623,7 @@ transform="matrix(1,0,0,0.99944391,2.4701977e-6,39.991327)" inkscape:label="#g5522-9-5"> @@ -1589,13 +1631,13 @@ inkscape:connector-curvature="0" id="path3497-9-7" d="m 218.28249,4.0830772 c 3.70998,3.7225673 9.72504,3.7225638 13.43502,0 3.70999,-3.72256391 3.70999,-9.7580291 0,-13.4805964 L 225,-16.137818 l -6.71751,6.7402988 c -3.70999,3.7225638 -3.70999,9.75802901 0,13.4805964 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-5-5);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-5-5);fill-opacity:1.0;fill-rule:nonzero;stroke:#184472;stroke-width:1.00027812;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + transform="rotate(180,209.99273,-2.6314087)"> @@ -1606,7 +1648,7 @@ inkscape:connector-curvature="0" /> @@ -1625,17 +1667,17 @@ inkscape:connector-curvature="0" id="path3497-0-7-6-6" d="m 261.70963,4.0924971 c 3.7205,-3.70998424 3.7205,-9.7250478 0,-13.4350284 -3.72049,-3.7099807 -9.75259,-3.7099847 -13.47308,-2e-7 l -6.73655,6.7175144 6.73655,6.7175147 c 3.72049,3.7099806 9.75259,3.7099837 13.47308,-5e-7 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-3-7);fill-opacity:1;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-3-7);fill-opacity:1.0;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7117-1-2-4);fill-opacity:1.0;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1695,7 +1737,7 @@ inkscape:connector-curvature="0" id="path3497-8-2-0-3" d="m 201.71751,170.6638 c -3.70998,-3.71842 -9.72504,-3.71842 -13.43502,0 -3.70999,3.71841 -3.70999,9.74716 0,13.46558 l 6.71751,6.73279 6.71751,-6.73279 c 3.70999,-3.71842 3.70999,-9.74716 0,-13.46558 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0);fill-opacity:1.0;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1731,13 +1773,13 @@ inkscape:connector-curvature="0" id="path3497-3-5-7" d="m 218.28249,184.08308 c 3.70998,3.72257 9.72504,3.72256 13.43502,0 3.70999,-3.72257 3.70999,-9.75803 0,-13.4806 L 225,163.86218 l -6.71751,6.7403 c -3.70999,3.72257 -3.70999,9.75803 0,13.4806 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-6);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-6);fill-opacity:1.0;fill-rule:nonzero;stroke:#0f2b48;stroke-width:1.00027823;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + transform="rotate(180,209.99273,87.36859)"> @@ -1748,7 +1790,7 @@ inkscape:connector-curvature="0" /> @@ -1767,18 +1809,18 @@ inkscape:connector-curvature="0" id="path3497-0-7-4-4-6" d="m 261.70963,184.0925 c 3.7205,-3.70999 3.7205,-9.72505 0,-13.43503 -3.72049,-3.70998 -9.75259,-3.70998 -13.47308,0 l -6.73655,6.71751 6.73655,6.71752 c 3.72049,3.70998 9.75259,3.70998 13.47308,0 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-9);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-9);fill-opacity:1.0;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1803,18 +1845,18 @@ inkscape:connector-curvature="0" id="path3497-0-9-0-6" d="m 278.29038,170.65747 c -3.7205,3.70998 -3.7205,9.72505 0,13.43503 3.72049,3.70998 9.75259,3.70998 13.47308,0 l 6.73655,-6.71752 -6.73655,-6.71751 c -3.72049,-3.70998 -9.75259,-3.70999 -13.47308,0 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-4);fill-opacity:1;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient7101-3-0-4);fill-opacity:1.0;fill-rule:nonzero;stroke:#0f2b48;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> @@ -1855,20 +1897,20 @@ + d="m 19.391061,40.242103 v 0.746384 c 0,0.995613 0.820325,1.772664 1.841514,1.772664 h 6.531232 c 1.021188,0 1.81696,-0.777051 1.81696,-1.772664 v -0.746384 c 0,0.995611 -0.795772,1.772664 -1.81696,1.772664 h -6.531232 c -1.021189,0 -1.841514,-0.777053 -1.841514,-1.772664 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#c7c7c7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" /> + d="m 19.391061,39.586662 v 0.785713 c 0,1.048072 0.820325,1.866067 1.841514,1.866067 h 6.531232 c 1.021188,0 1.81696,-0.817995 1.81696,-1.866067 v -0.785713 c 0,1.048072 -0.795772,2.170876 -1.81696,2.170876 h -6.531232 c -1.021189,0 -1.841514,-1.122804 -1.841514,-2.170876 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ededed;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50055969;marker:none;enable-background:accumulate" /> + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;-inkscape-font-specification:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2870bc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99699712;marker:none;enable-background:accumulate" /> + d="m 18.088488,34.607345 v -0.986346 c 0,-1.315724 1.029805,-2.342598 2.311766,-2.342598 h 8.199058 c 1.281961,0 2.28095,1.026874 2.28095,2.342598 v 0.986346 c 0,-1.315702 -0.998989,-2.342598 -2.28095,-2.342598 h -8.199058 c -1.281961,0 -2.311766,1.026896 -2.311766,2.342598 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.07000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;enable-background:accumulate" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4750);fill-opacity:1;fill-rule:nonzero;stroke:#91918c;stroke-width:1.0004697;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" /> - + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient10619);fill-opacity:1.0;fill-rule:nonzero;stroke:#91918b;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> - + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient11093);fill-opacity:1.0;fill-rule:nonzero;stroke:#0f2b48;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> @@ -2298,10 +2328,10 @@ @@ -2351,7 +2381,7 @@ inkscape:connector-curvature="0" id="path12834" d="m 195,-10.500316 c -2.30863,10e-7 -4.61312,0.8591138 -6.375,2.6250022 -1.88818,1.8924693 -2.49461,4.3124219 -2.35983,6.7866117 0.12078,-2.1382318 0.72789,-4.1509637 2.35983,-5.7866117 1.76188,-1.7658876 4.06637,-2.6250004 6.375,-2.6250014 2.30863,-1e-6 4.61312,0.8591118 6.375,2.6250014 1.63194,1.6356505 2.50422,3.7367683 2.625,5.875 0.13081,-2.4697869 -0.7403,-4.9860195 -2.625,-6.875 -1.76188,-1.7658904 -4.06637,-2.6250032 -6.375,-2.6250022 z" - style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93591636;marker:none;enable-background:accumulate" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ededec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99985634;marker:none;enable-background:accumulate;clip-rule:nonzero;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient12904);fill-opacity:1.0;fill-rule:nonzero;stroke:#184472;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /> - - + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4838-7-9);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00048557;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.4;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2c3133;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000014;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0" /> + style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4838-7-9);fill-opacity:1;fill-rule:nonzero;stroke:#080909;stroke-width:1.00048557;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;font-variant-east_asian:normal" /> 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: #1f2325; - 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: #222628; - 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 { - border-top-color: #1f2325; } + border-top-color: #212526; } .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical), @@ -405,14 +403,15 @@ treeview entry.flat, treeview entry { notebook > header > tabs > arrow, button.titlebutton, button { min-height: 18px; - min-width: 18px; + min-width: 16px; padding: 2px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + 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); @@ -437,28 +436,29 @@ button { button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); + 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); -gtk-icon-effect: highlight; } notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > arrow:checked, button.titlebutton:checked, button:active, button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #1e2122, #272c2d); - text-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); + border-color: #1b1f20; + background-image: image(#25292b); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; transition-duration: 50ms; } notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -475,8 +475,8 @@ button { button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2a2f31); + border-color: #202425; + background-image: image(#272c2d); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:backdrop:active label, button.sidebar-button:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.sidebar-button:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked, button:backdrop.flat:active label, @@ -491,8 +491,8 @@ button { notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -507,8 +507,8 @@ button { button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #212526); + border-color: #202425; + background-image: image(#272c2d); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:backdrop:disabled:active label, button.sidebar-button:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.sidebar-button:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, button:backdrop.flat:disabled:active label, @@ -528,8 +528,8 @@ button { -gtk-icon-shadow: none; } notebook > header > tabs > arrow:disabled, button.titlebutton:disabled, button:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -540,8 +540,8 @@ button { notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked, button:disabled:active, button:disabled:checked { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2b3031, #2d3234); + border-color: #1b1f20; + background-image: image(#232628); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked, button:disabled:active label, @@ -552,15 +552,20 @@ button { notebook > header > tabs > arrow.image-button, button.image-button.titlebutton, button.image-button { min-width: 18px; - min-height: 18px; } + padding-left: 2px; + padding-right: 2px; } notebook > header > tabs > arrow.text-button, button.text-button.titlebutton, button.text-button { padding-left: 8px; padding-right: 8px; } - notebook > header > tabs > arrow.text-button.image-button label, button.text-button.image-button.titlebutton label, - button.text-button.image-button label { - padding-left: 4px; - padding-right: 4px; } + notebook > header > tabs > arrow.text-button.image-button, button.text-button.image-button.titlebutton, + button.text-button.image-button { + padding-left: 2px; + padding-right: 2px; } + notebook > header > tabs > arrow.text-button.image-button label, button.text-button.image-button.titlebutton label, + button.text-button.image-button label { + padding-left: 4px; + padding-right: 4px; } combobox:drop(active) button.combo, notebook > header > tabs > arrow:drop(active), button.titlebutton:drop(active), button:drop(active) { color: #4e9a06; @@ -578,10 +583,10 @@ button.osd { min-height: 24px; color: #eeeeec; border-radius: 3px; - outline-color: rgba(238, 238, 236, 0.3); color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -594,7 +599,8 @@ button.osd { button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -606,7 +612,8 @@ button.osd { button.osd:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -616,9 +623,10 @@ button.osd { box-shadow: none; } button.osd:disabled:backdrop, button.osd:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -627,7 +635,8 @@ button.osd { button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -638,7 +647,8 @@ button.osd { button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -648,7 +658,8 @@ button { button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -661,7 +672,8 @@ button { button:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -670,9 +682,10 @@ button { popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -681,7 +694,8 @@ button { button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -701,7 +715,8 @@ button { button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -709,9 +724,10 @@ button { outline-color: rgba(238, 238, 236, 0.3); } popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -732,7 +748,8 @@ button { button.flat:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -741,7 +758,8 @@ button { button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; + border-color: #0f2b48; + border-bottom-color: #06121e; background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83); text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); @@ -758,25 +776,26 @@ button.suggested-action { button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); + border-color: #0f2b48; + border-bottom-color: #06121e; text-shadow: 0 -1px rgba(0, 0, 0, 0.65553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); } button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #194776, #1c5187); - text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #0f2b48; + background-image: image(#1b4e83); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } .selection-mode button.titlebutton:backdrop, button.suggested-action:backdrop, button.suggested-action.flat:backdrop { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #215d9c); + border-color: #0f2b48; + background-image: image(#215d9c); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -791,8 +810,8 @@ button.suggested-action { button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.flat:backdrop:checked { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #184472); + border-color: #0f2b48; + background-image: image(#1d4b7b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked label, .selection-mode button.titlebutton:backdrop:checked, button.suggested-action:backdrop:active label, @@ -803,12 +822,12 @@ button.suggested-action { button.suggested-action.flat:backdrop:active, button.suggested-action.flat:backdrop:checked label, button.suggested-action.flat:backdrop:checked { - color: #d1dae3; } + color: #d2dbe5; } .selection-mode button.titlebutton:backdrop:disabled, button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -823,15 +842,15 @@ button.suggested-action { button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #1c4876); + border-color: #0f2b48; + background-image: image(#1d4b7b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label, button.suggested-action:backdrop:disabled:active label, button.suggested-action:backdrop:disabled:checked label, button.suggested-action.flat:backdrop:disabled:active label, button.suggested-action.flat:backdrop:disabled:checked label { - color: #6b88a6; } + color: #6c8aa9; } .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, button.suggested-action.flat:backdrop, button.suggested-action.flat:disabled, @@ -844,8 +863,8 @@ button.suggested-action { -gtk-icon-shadow: none; color: rgba(33, 93, 156, 0.8); } button.suggested-action:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -854,19 +873,20 @@ button.suggested-action { color: #919494; } button.suggested-action:disabled:active, button.suggested-action:disabled:checked { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #1a446f, #1c4876); + border-color: #0f2b48; + background-image: image(#1b4672); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.suggested-action:disabled:active label, button.suggested-action:disabled:active, button.suggested-action:disabled:checked label, button.suggested-action:disabled:checked { - color: #a4b6c8; } + color: #a4b5c7; } .osd button.suggested-action { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5)); + background-color: transparent; + background-image: image(rgba(33, 93, 156, 0.5)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -876,7 +896,8 @@ button.suggested-action { button.suggested-action:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.7)); + background-color: transparent; + background-image: image(rgba(33, 93, 156, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -889,7 +910,8 @@ button.suggested-action { button.suggested-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, #215d9c); + background-color: transparent; + background-image: image(#215d9c); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -898,9 +920,10 @@ button.suggested-action { .osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -909,7 +932,8 @@ button.suggested-action { button.suggested-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5)); + background-color: transparent; + background-image: image(rgba(33, 93, 156, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -917,7 +941,8 @@ button.suggested-action { button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5e0707; + border-color: #760909; + border-bottom-color: #470505; background-image: linear-gradient(to bottom, #cc0f0f, #c20f0f 60%, #b90e0e); text-shadow: 0 -1px rgba(0, 0, 0, 0.64078); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078); @@ -933,24 +958,25 @@ button.destructive-action { button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5e0707; - background-image: linear-gradient(to bottom, #da1010, #cc0f0f 60%, #c20f0f); + border-color: #760909; + border-bottom-color: #470505; text-shadow: 0 -1px rgba(0, 0, 0, 0.59278); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.59278); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.2); + background-image: linear-gradient(to bottom, #da1010, #cc0f0f 60%, #c20f0f); } button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #5e0707; - background-image: linear-gradient(to bottom, #aa0d0d, #bd0e0e); - text-shadow: 0 -1px rgba(0, 0, 0, 0.72078); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.72078); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #760909; + background-image: image(#b90e0e); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } button.destructive-action:backdrop, button.destructive-action.flat:backdrop { - border-color: #5e0707; - background-image: linear-gradient(to bottom, #d51010); + border-color: #760909; + background-image: image(#d51010); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -963,8 +989,8 @@ button.destructive-action { button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.flat:backdrop:checked { - border-color: #5e0707; - background-image: linear-gradient(to bottom, #a60c0c); + border-color: #760909; + background-image: image(#a71112); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:backdrop:active label, button.destructive-action:backdrop:active, @@ -974,11 +1000,11 @@ button.destructive-action { button.destructive-action.flat:backdrop:active, button.destructive-action.flat:backdrop:checked label, button.destructive-action.flat:backdrop:checked { - color: #edcece; } + color: #edcfd0; } button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -991,14 +1017,14 @@ button.destructive-action { button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked { - border-color: #5e0707; - background-image: linear-gradient(to bottom, #a31112); + border-color: #760909; + background-image: image(#a71112); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:backdrop:disabled:active label, button.destructive-action:backdrop:disabled:checked label, button.destructive-action.flat:backdrop:disabled:active label, button.destructive-action.flat:backdrop:disabled:checked label { - color: #c36465; } + color: #c66465; } button.destructive-action.flat:backdrop, button.destructive-action.flat:disabled, button.destructive-action.flat:backdrop:disabled { @@ -1010,8 +1036,8 @@ button.destructive-action { -gtk-icon-shadow: none; color: rgba(213, 16, 16, 0.8); } button.destructive-action:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -1020,19 +1046,20 @@ button.destructive-action { color: #919494; } button.destructive-action:disabled:active, button.destructive-action:disabled:checked { - border-color: #5e0707; - background-image: linear-gradient(to bottom, #9c1011, #a31112); + border-color: #760909; + background-image: image(#9e1011); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:disabled:active label, button.destructive-action:disabled:active, button.destructive-action:disabled:checked label, button.destructive-action:disabled:checked { - color: #daa0a0; } + color: #d89fa0; } .osd button.destructive-action { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5)); + background-color: transparent; + background-image: image(rgba(213, 16, 16, 0.5)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1042,7 +1069,8 @@ button.destructive-action { button.destructive-action:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.7)); + background-color: transparent; + background-image: image(rgba(213, 16, 16, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1055,7 +1083,8 @@ button.destructive-action { button.destructive-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, #d51010); + background-color: transparent; + background-image: image(#d51010); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1064,9 +1093,10 @@ button.destructive-action { .osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1075,7 +1105,8 @@ button.destructive-action { button.destructive-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5)); + background-color: transparent; + background-image: image(rgba(213, 16, 16, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1110,6 +1141,11 @@ button { 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 { @@ -1118,6 +1154,35 @@ button:backdrop { .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, @@ -1142,7 +1207,8 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { .inline-toolbar toolbutton > button { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + 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); @@ -1150,58 +1216,59 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { .inline-toolbar toolbutton > button:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); + 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); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); } .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #1e2122, #272c2d); - text-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #1b1f20; + background-image: image(#25292b); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } .inline-toolbar toolbutton > button:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled { color: #919494; } .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2b3031, #2d3234); + border-color: #1b1f20; + background-image: image(#232628); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked { color: #919494; } .inline-toolbar toolbutton > button:backdrop { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop { color: #919494; } .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2a2f31); + border-color: #202425; + background-image: image(#272c2d); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:active label, .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked label, .inline-toolbar toolbutton > button:backdrop:checked { color: #919494; } .inline-toolbar toolbutton > button:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:disabled label, .inline-toolbar toolbutton > button:backdrop:disabled { color: #566164; } .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #212526); + border-color: #202425; + background-image: image(#272c2d); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label { color: #566164; } @@ -1269,11 +1336,8 @@ button:only-child, .linked.vertical > combobox:only-child > box > button.combo { 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, @@ -1288,46 +1352,24 @@ button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup -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 { @@ -1338,40 +1380,77 @@ button.color { /********* * 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; } @@ -1400,6 +1479,8 @@ spinbutton:not(.vertical) { 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; @@ -1408,7 +1489,7 @@ spinbutton:not(.vertical) { color: #dadad9; background-image: none; border-style: none none none solid; - border-color: rgba(23, 25, 26, 0.3); + border-color: rgba(27, 31, 32, 0.3); border-radius: 0; box-shadow: none; } spinbutton:not(.vertical) button:dir(rtl) { @@ -1417,21 +1498,26 @@ spinbutton:not(.vertical) { 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); } spinbutton:not(.vertical) button:backdrop { color: #86898a; background-color: transparent; - border-color: rgba(26, 28, 29, 0.3); + border-color: rgba(32, 36, 37, 0.3); 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; @@ -1477,11 +1563,11 @@ spinbutton:not(.vertical) { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: #878a89; + color: #858786; 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; } @@ -1510,7 +1596,8 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1519,7 +1606,8 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1528,16 +1616,18 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child:active { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } .osd spinbutton.vertical button:first-child:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1545,7 +1635,8 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1585,7 +1676,7 @@ toolbar { padding: 13px; border: none; border-radius: 4px; - background-color: rgba(32, 37, 38, 0.8); } + background-color: rgba(28, 31, 32, 0.7); } toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom { border-radius: 0; } toolbar.horizontal separator { @@ -1613,12 +1704,12 @@ searchbar, .inline-toolbar, searchbar, .location-bar { border-style: solid; - border-color: #17191a; - background-color: #2b2f31; } + border-color: #1b1f20; + background-color: #2c3133; } .inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { - border-color: #1a1c1d; - background-color: #2a2f31; + border-color: #202425; + background-color: #2c3233; box-shadow: none; transition: 200ms ease-out; } @@ -1631,22 +1722,22 @@ headerbar { min-height: 32px; border-width: 0 0 1px; border-style: solid; - border-color: #17191a; + 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); } .titlebar:backdrop:not(headerbar), headerbar:backdrop { - border-color: #1a1c1d; + border-color: #202425; background-color: #33393b; background-image: none; box-shadow: inset 0 1px rgba(238, 238, 236, 0.07); transition: 200ms ease-out; } .titlebar:not(headerbar) .title, headerbar .title { - font-weight: bold; padding-left: 8px; - padding-right: 8px; } + padding-right: 8px; + font-weight: bold; } .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; @@ -1655,8 +1746,8 @@ headerbar { .selection-mode.titlebar:not(headerbar), headerbar.selection-mode { color: #ffffff; - text-shadow: 0 -1px rgba(0, 0, 0, 0.5); border-color: #0f2b48; + text-shadow: 0 -1px rgba(0, 0, 0, 0.5); 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), @@ -1668,7 +1759,8 @@ headerbar { headerbar.selection-mode button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; + border-color: #0f2b48; + border-bottom-color: #06121e; background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83); text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); @@ -1685,26 +1777,27 @@ headerbar { headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); + border-color: #0f2b48; + border-bottom-color: #06121e; text-shadow: 0 -1px rgba(0, 0, 0, 0.65553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); } .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, headerbar.selection-mode button:active, headerbar.selection-mode button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #194776, #1c5187); - text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #0f2b48; + background-image: image(#1b4e83); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop, headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #215d9c); + border-color: #0f2b48; + background-image: image(#215d9c); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1721,8 +1814,8 @@ headerbar { headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #184472); + border-color: #0f2b48; + background-image: image(#1d4b7b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, @@ -1734,12 +1827,12 @@ headerbar { headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked label, headerbar.selection-mode button:backdrop:checked { - color: #d1dae3; } + color: #d2dbe5; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode button:backdrop:disabled { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #21558b); + border-color: #0f2b48; + background-image: image(#21558b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1755,8 +1848,8 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #1c4876); + border-color: #0f2b48; + background-image: image(#1d4b7b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked label, @@ -1764,7 +1857,7 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked label, headerbar.selection-mode button:backdrop:disabled:active label, headerbar.selection-mode button:backdrop:disabled:checked label { - color: #6b88a6; } + color: #6c8aa9; } .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button.flat:disabled, @@ -1777,8 +1870,8 @@ headerbar { -gtk-icon-shadow: none; } .selection-mode.titlebar:not(headerbar) button:disabled, headerbar.selection-mode button:disabled { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #21558b); + border-color: #0f2b48; + background-image: image(#21558b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -1789,20 +1882,21 @@ headerbar { .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #1a446f, #1c4876); + border-color: #0f2b48; + background-image: image(#1b4672); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active label, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked label, headerbar.selection-mode button:disabled:checked { - color: #a4b6c8; } + color: #a4b5c7; } .selection-mode.titlebar:not(headerbar) button.suggested-action, headerbar.selection-mode button.suggested-action { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + 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); @@ -1812,26 +1906,27 @@ headerbar { headerbar.selection-mode button.suggested-action:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); + 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); border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #1e2122, #272c2d); - text-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); + border-color: #1b1f20; + background-image: image(#25292b); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; border-color: #0f2b48; } .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1842,8 +1937,8 @@ headerbar { color: #919494; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1854,8 +1949,8 @@ headerbar { color: #919494; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, headerbar.selection-mode button.suggested-action:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1868,7 +1963,8 @@ headerbar { 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; } @@ -1890,14 +1986,24 @@ headerbar { border-radius: 0; } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { - padding: 2px; - min-height: 24px; } + min-height: 24px; + padding: 2px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 22px; min-width: 22px; 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, @@ -1909,14 +2015,17 @@ headerbar switch { margin-top: 5px; margin-bottom: 5px; } -.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: 4px; border-top-right-radius: 4px; } -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 { - border-top-left-radius: 4px; } -window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { - border-top-right-radius: 4px; } +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):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) { padding: 0; @@ -1926,7 +2035,7 @@ window.csd > .titlebar:not(headerbar) { border-color: transparent; box-shadow: none; } .titlebar:not(headerbar) > separator { - background-color: #17191a; } + background-color: #1b1f20; } /************ * Pathbars * @@ -1992,11 +2101,11 @@ treeview.view { 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 { @@ -2051,31 +2160,31 @@ treeview.view { 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-radius: 0; border-style: none; + border-radius: 0; 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; - border-radius: 0; background-image: none; - text-shadow: none; border-style: none solid solid none; - border-color: #33393b; } + border-color: #33393b; + border-radius: 0; + 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 { @@ -2112,7 +2221,7 @@ menu, margin: 4px; padding: 2px 0px; background-color: #262b2d; - border: 1px solid #17191a; } + border: 1px solid #1b1f20; } .csd menu, .csd .menu, .csd .context-menu { @@ -2232,7 +2341,7 @@ popover.background { background-color: #33393b; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); } .csd popover.background, popover.background { - border: 1px solid #17191a; } + border: 1px solid #1b1f20; } popover.background:backdrop { background-color: #33393b; box-shadow: none; } @@ -2254,12 +2363,12 @@ popover.background { *************/ notebook > header { padding: 1px; - border-color: #17191a; + border-color: #1b1f20; border-width: 1px; - background-color: #292e2f; } + background-color: #272c2e; } notebook > header:backdrop { - border-color: #1a1c1d; - background-color: #2a2f31; } + border-color: #202425; + background-color: #2c3233; } notebook > header tabs { margin: -1px; } notebook > header.top { @@ -2267,7 +2376,7 @@ notebook > header { notebook > header.top > tabs { margin-bottom: -2px; } notebook > header.top > tabs > tab:hover { - box-shadow: inset 0 -3px #17191a; } + box-shadow: inset 0 -3px #1b1f20; } notebook > header.top > tabs > tab:backdrop { box-shadow: none; } notebook > header.top > tabs > tab:checked { @@ -2277,7 +2386,7 @@ notebook > header { notebook > header.bottom > tabs { margin-top: -2px; } notebook > header.bottom > tabs > tab:hover { - box-shadow: inset 0 3px #17191a; } + box-shadow: inset 0 3px #1b1f20; } notebook > header.bottom > tabs > tab:backdrop { box-shadow: none; } notebook > header.bottom > tabs > tab:checked { @@ -2287,7 +2396,7 @@ notebook > header { notebook > header.left > tabs { margin-right: -2px; } notebook > header.left > tabs > tab:hover { - box-shadow: inset -3px 0 #17191a; } + box-shadow: inset -3px 0 #1b1f20; } notebook > header.left > tabs > tab:backdrop { box-shadow: none; } notebook > header.left > tabs > tab:checked { @@ -2297,7 +2406,7 @@ notebook > header { notebook > header.right > tabs { margin-left: -2px; } notebook > header.right > tabs > tab:hover { - box-shadow: inset 3px 0 #17191a; } + box-shadow: inset 3px 0 #1b1f20; } notebook > header.right > tabs > tab:backdrop { box-shadow: none; } notebook > header.right > tabs > tab:checked { @@ -2357,7 +2466,7 @@ notebook > header { notebook > header tab:hover { color: #c0c1c0; } notebook > header tab:hover.reorderable-page { - border-color: rgba(23, 25, 26, 0.3); + border-color: rgba(27, 31, 32, 0.3); background-color: rgba(51, 57, 59, 0.2); } notebook > header tab:backdrop { color: #6b7070; } @@ -2367,14 +2476,14 @@ notebook > header { notebook > header tab:checked { color: #eeeeec; } notebook > header tab:checked.reorderable-page { - border-color: rgba(23, 25, 26, 0.5); + border-color: rgba(27, 31, 32, 0.5); background-color: rgba(51, 57, 59, 0.5); } notebook > header tab:checked.reorderable-page:hover { background-color: rgba(51, 57, 59, 0.7); } notebook > header tab:backdrop:checked { color: #919494; } notebook > header tab:backdrop:checked.reorderable-page { - border-color: #1a1c1d; + border-color: #202425; background-color: #33393b; } notebook > header tab button.flat { padding: 0; @@ -2441,16 +2550,16 @@ scrollbar { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { - border-bottom: 1px solid #17191a; } + border-bottom: 1px solid #1b1f20; } scrollbar.bottom { - border-top: 1px solid #17191a; } + border-top: 1px solid #1b1f20; } scrollbar.left { - border-right: 1px solid #17191a; } + border-right: 1px solid #1b1f20; } scrollbar.right { - border-left: 1px solid #17191a; } + border-left: 1px solid #1b1f20; } scrollbar:backdrop { background-color: #2c3133; - border-color: #1a1c1d; + border-color: #202425; transition: 200ms ease-out; } scrollbar slider { min-width: 6px; @@ -2570,12 +2679,12 @@ scrollbar { 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 #17191a; + border-top: 1px solid #1b1f20; margin-top: -1px; } /********** @@ -2585,42 +2694,34 @@ switch { 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 #17191a; + border: 1px solid #1b1f20; border-radius: 2px; color: #eeeeec; - background-image: linear-gradient(to bottom, #282c2e); + 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: #17191a; - background-image: none; + border-color: #1b1f20; background-color: #2d3234; - box-shadow: 0 1px transparent; text-shadow: none; } switch:backdrop { color: #919494; - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2a2f31); - box-shadow: none; + border-color: #202425; + 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: #1a1c1d; - 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: 35px; @@ -2630,7 +2731,7 @@ switch { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + border-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.82745); background-image: linear-gradient(to bottom, #2c3133 20%, #25292b 90%); @@ -2638,14 +2739,14 @@ switch { switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 0, 0, 0.1); } + border-color: #0b0c0c; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 0, 0, 0.1); + background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); } switch:checked slider { border: 1px solid #0f2b48; } switch:disabled slider { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -2653,8 +2754,8 @@ switch { color: #919494; } switch:backdrop slider { transition: 200ms ease-out; - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -2663,8 +2764,8 @@ switch { switch:backdrop:checked slider { border-color: #0f2b48; } switch:backdrop:disabled slider { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -2731,7 +2832,7 @@ radio { -gtk-icon-source: none; color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + border-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.82745); background-image: linear-gradient(to bottom, #2c3133 20%, #25292b 90%); @@ -2743,22 +2844,22 @@ radio { radio:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 0, 0, 0.1); } + border-color: #0b0c0c; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 0, 0, 0.1); + background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); } check:active, radio:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #1e2122, #272c2d); - text-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.90745); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #1b1f20; + background-image: image(#25292b); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } check:disabled, radio:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -2768,8 +2869,8 @@ radio { color: #919494; } check:backdrop, radio:backdrop { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -2780,8 +2881,8 @@ radio { color: #919494; } check:backdrop:disabled, radio:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -2793,7 +2894,8 @@ radio { radio { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -2803,7 +2905,8 @@ radio { radio:hover { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -2813,7 +2916,8 @@ radio { radio:active { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -2823,16 +2927,18 @@ radio { radio:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd check:disabled, .osd radio:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -2851,8 +2957,7 @@ radio { box-shadow: none; -gtk-icon-shadow: none; color: inherit; - border-color: currentColor; - animation: none; } + border-color: currentColor; } check { border-radius: 3px; } @@ -2871,35 +2976,25 @@ radio { 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); } -radio:not(:indeterminate):checked { - animation: check_radio 400ms; } +check:not(:indeterminate):not(:checked):active:not(:backdrop) { + -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } -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, @@ -2920,31 +3015,24 @@ treeview.view radio:backdrop { * GtkScale * ************/ scale trough, scale fill, progressbar trough { - border: 1px solid #17191a; + border: 1px solid #1b1f20; border-radius: 3px; - background-color: #292e2f; - 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: #2a2f31; - border-color: #1a1c1d; - box-shadow: none; + background-color: #2c3233; + border-color: #202425; 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(53, 57, 58, 0.5); } + background-color: rgba(49, 52, 52, 0.5); } scale highlight, progressbar progress { border: 1px solid #0f2b48; @@ -2994,40 +3082,39 @@ scale { scale trough { outline-offset: 2px; -gtk-outline-radius: 5px; } - scale fill, scale fill:backdrop { - background-color: #17191a; - 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 { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + border-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.82745); -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 #101112; + 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; } scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 0, 0, 0.1); } + border-color: #0b0c0c; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 0, 0, 0.1); + background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); } scale slider:active { border-color: #0f2b48; } scale slider:disabled { - border-color: #17191a; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #1b1f20; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -3035,72 +3122,83 @@ scale { color: #919494; } scale slider:backdrop { transition: 200ms ease-out; - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop label, scale slider:backdrop { color: #919494; } scale slider:backdrop:disabled { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #2d3234); + border-color: #202425; + background-image: image(#2d3234); text-shadow: none; -gtk-icon-shadow: none; 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; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; 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); border-color: rgba(0, 0, 0, 0.7); - background-color: #202526; } + background-color: #1c1f20; } .osd scale slider:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; 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); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 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: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); 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); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); 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; } @@ -3139,6 +3237,7 @@ scale { 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; @@ -3153,6 +3252,7 @@ scale { 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; @@ -3167,6 +3267,7 @@ scale { 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; @@ -3181,6 +3282,7 @@ scale { 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; @@ -3195,6 +3297,7 @@ scale { 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; @@ -3209,6 +3312,7 @@ scale { 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; @@ -3223,6 +3327,7 @@ scale { 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; @@ -3237,6 +3342,7 @@ scale { 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; @@ -3251,6 +3357,7 @@ scale { 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; @@ -3265,6 +3372,7 @@ scale { 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; @@ -3279,6 +3387,7 @@ scale { 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; @@ -3293,6 +3402,7 @@ scale { 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; @@ -3307,6 +3417,7 @@ scale { 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; @@ -3321,6 +3432,7 @@ scale { 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; @@ -3335,6 +3447,7 @@ scale { 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; @@ -3349,6 +3462,7 @@ scale { 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; @@ -3363,6 +3477,7 @@ scale { 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; @@ -3377,6 +3492,7 @@ scale { 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; @@ -3391,6 +3507,7 @@ scale { 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; @@ -3405,6 +3522,7 @@ scale { 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; @@ -3419,6 +3537,7 @@ scale { 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; @@ -3433,6 +3552,7 @@ scale { 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; @@ -3447,6 +3567,7 @@ scale { 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; @@ -3461,6 +3582,7 @@ scale { 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; @@ -3475,7 +3597,7 @@ scale { min-height: 0; min-width: 0; } scale.color trough { - background-image: linear-gradient(to top, #17191a); + background-image: image(#1b1f20); background-repeat: no-repeat; } scale.color.horizontal { padding: 0 0 15px 0; } @@ -3577,6 +3699,8 @@ progressbar { progressbar.osd progress { border-style: none; border-radius: 0; } + progressbar trough.empty progress { + all: unset; } /************* * Level Bar * @@ -3594,13 +3718,13 @@ levelbar trough { padding: 2px; border-radius: 3px; color: white; - border-color: #17191a; - background-image: linear-gradient(to bottom, #181a1b, #1e2123 3px, #232729 90%); + border-color: #1b1f20; + background-color: #232729; box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); } levelbar trough:backdrop { color: #d3d4d5; - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #252a2c); + border-color: #202425; + background-color: #252a2c; box-shadow: none; } levelbar.horizontal.discrete block { margin: 0 1px; } @@ -3608,10 +3732,7 @@ levelbar.vertical.discrete block { 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; } @@ -3629,8 +3750,7 @@ levelbar block { 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); } @@ -3639,12 +3759,12 @@ levelbar block { *****************/ printdialog paper { color: #eeeeec; - border: 1px solid #17191a; + border: 1px solid #1b1f20; background: white; padding: 0; } printdialog paper:backdrop { color: #919494; - border-color: #1a1c1d; } + border-color: #202425; } printdialog .dialog-action-box { margin: 12px; } @@ -3657,24 +3777,24 @@ frame > border, margin: 0; padding: 0; border-radius: 0; - border: 1px solid #17191a; } + border: 1px solid #1b1f20; } frame > border.flat, .frame.flat { border-style: none; } frame > border:backdrop, .frame:backdrop { - border-color: #1a1c1d; } + border-color: #202425; } actionbar > revealer > box { padding: 6px; - border-top: 1px solid #17191a; } + border-top: 1px solid #1b1f20; } actionbar > revealer > box:backdrop { - border-color: #1a1c1d; } + border-color: #202425; } scrolledwindow viewport.frame { border-style: none; } scrolledwindow overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); + background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#040404), to(rgba(4, 4, 4, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); background-size: 100% 5%, 100% 100%; background-repeat: no-repeat; background-position: center top; @@ -3682,7 +3802,7 @@ scrolledwindow overshoot.top { border: none; box-shadow: none; } scrolledwindow overshoot.top:backdrop { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#1a1c1d), to(rgba(26, 28, 29, 0))); + background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#202425), to(rgba(32, 36, 37, 0))); background-size: 100% 5%; background-repeat: no-repeat; background-position: center top; @@ -3690,7 +3810,7 @@ scrolledwindow overshoot.top { border: none; box-shadow: none; } scrolledwindow overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(black), to(transparent)), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#040404), to(rgba(4, 4, 4, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); background-size: 100% 5%, 100% 100%; background-repeat: no-repeat; background-position: center bottom; @@ -3698,7 +3818,7 @@ scrolledwindow overshoot.bottom { border: none; box-shadow: none; } scrolledwindow overshoot.bottom:backdrop { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#1a1c1d), to(rgba(26, 28, 29, 0))); + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#202425), to(rgba(32, 36, 37, 0))); background-size: 100% 5%; background-repeat: no-repeat; background-position: center bottom; @@ -3706,7 +3826,7 @@ scrolledwindow overshoot.bottom { border: none; box-shadow: none; } scrolledwindow overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); + background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#040404), to(rgba(4, 4, 4, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); background-size: 5% 100%, 100% 100%; background-repeat: no-repeat; background-position: left center; @@ -3714,7 +3834,7 @@ scrolledwindow overshoot.left { border: none; box-shadow: none; } scrolledwindow overshoot.left:backdrop { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#1a1c1d), to(rgba(26, 28, 29, 0))); + background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#202425), to(rgba(32, 36, 37, 0))); background-size: 5% 100%; background-repeat: no-repeat; background-position: left center; @@ -3722,7 +3842,7 @@ scrolledwindow overshoot.left { border: none; box-shadow: none; } scrolledwindow overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(black), to(transparent)), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); + background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#040404), to(rgba(4, 4, 4, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(238, 238, 236, 0.07)), to(rgba(238, 238, 236, 0))); background-size: 5% 100%, 100% 100%; background-repeat: no-repeat; background-position: right center; @@ -3730,7 +3850,7 @@ scrolledwindow overshoot.right { border: none; box-shadow: none; } scrolledwindow overshoot.right:backdrop { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#1a1c1d), to(rgba(26, 28, 29, 0))); + background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#202425), to(rgba(32, 36, 37, 0))); background-size: 5% 100%; background-repeat: no-repeat; background-position: right center; @@ -3779,12 +3899,12 @@ scrolledwindow undershoot.right { box-shadow: none; } scrolledwindow junction { border-color: transparent; - border-image: linear-gradient(to bottom, #17191a 1px, transparent 1px) 0 0 0 1/0 1px stretch; + border-image: linear-gradient(to bottom, #1b1f20 1px, transparent 1px) 0 0 0 1/0 1px stretch; background-color: #2b3032; } scrolledwindow junction:dir(rtl) { border-image-slice: 0 1 0 0; } scrolledwindow junction:backdrop { - border-image-source: linear-gradient(to bottom, #1a1c1d 1px, transparent 1px); + border-image-source: linear-gradient(to bottom, #202425 1px, transparent 1px); background-color: #2c3133; transition: 200ms ease-out; } @@ -3799,10 +3919,10 @@ separator { list { color: white; background-color: #232729; - border-color: #17191a; } + border-color: #1b1f20; } list:backdrop { background-color: #252a2c; - border-color: #1a1c1d; } + border-color: #202425; } list row { padding: 2px; } @@ -3832,7 +3952,7 @@ row { .app-notification.frame { padding: 10px; border-radius: 0 0 5px 5px; - background-color: rgba(32, 37, 38, 0.8); + background-color: rgba(28, 31, 32, 0.7); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px); background-clip: padding-box; } .app-notification:backdrop, @@ -3862,7 +3982,7 @@ expander arrow { ***********/ calendar { color: white; - border: 1px solid #17191a; } + border: 1px solid #1b1f20; } calendar:selected { border-radius: 3px; } calendar.header { @@ -3883,7 +4003,7 @@ calendar { color: #566164; } calendar:backdrop { color: #d3d4d5; - border-color: #1a1c1d; } + border-color: #202425; } calendar:indeterminate { color: alpha(currentColor,0.1); } @@ -3915,9 +4035,9 @@ messagedialog.csd .dialog-action-area button { -gtk-outline-bottom-right-radius: 3px; } filechooser .dialog-action-box { - border-top: 1px solid #17191a; } + border-top: 1px solid #1b1f20; } filechooser .dialog-action-box:backdrop { - border-top-color: #1a1c1d; } + border-top-color: #202425; } filechooser #pathbarbox { border-bottom: 1px solid #33393b; } @@ -3932,16 +4052,16 @@ filechooserbutton:drop(active) { border-style: none; background-color: #2b3032; } stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) { - border-right: 1px solid #17191a; + border-right: 1px solid #1b1f20; border-left-style: none; } stacksidebar.sidebar:dir(rtl) list .sidebar:dir(rtl), stacksidebar.sidebar.right list .sidebar:dir(rtl), .sidebar.right { - border-left: 1px solid #17191a; + border-left: 1px solid #1b1f20; border-right-style: none; } .sidebar:backdrop { background-color: #2c3234; - border-color: #1a1c1d; + border-color: #202425; transition: 200ms ease-out; } .sidebar list { background-color: transparent; } @@ -4033,21 +4153,21 @@ paned > separator { -gtk-icon-source: none; border-style: none; background-color: transparent; - background-image: image(#17191a); + background-image: image(#1b1f20); background-size: 1px 1px; } paned > separator:selected { background-image: image(#215d9c); } paned > separator:backdrop { - background-image: image(#1a1c1d); } + background-image: image(#202425); } paned > separator.wide { min-width: 5px; min-height: 5px; background-color: #33393b; - background-image: image(#17191a), image(#17191a); + background-image: image(#1b1f20), image(#1b1f20); background-size: 1px 1px, 1px 1px; } paned > separator.wide:backdrop { background-color: #33393b; - background-image: image(#1a1c1d), image(#1a1c1d); } + background-image: image(#202425), image(#202425); } paned.horizontal > separator { background-repeat: repeat-y; } paned.horizontal > separator:dir(ltr) { @@ -4091,7 +4211,8 @@ infobar { infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; + border-color: #0f2b48; + border-bottom-color: #06121e; background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83); text-shadow: 0 -1px rgba(0, 0, 0, 0.70353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353); @@ -4099,43 +4220,44 @@ infobar { infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); + border-color: #0f2b48; + border-bottom-color: #06121e; text-shadow: 0 -1px rgba(0, 0, 0, 0.65553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b); } infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #194776, #1c5187); - text-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.78353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #0f2b48; + background-image: image(#1b4e83); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #21558b); + border-color: #0f2b48; + background-image: image(#21558b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } infobar.info button:disabled label, infobar.info button:disabled, infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled, infobar.error button:disabled label, infobar.error button:disabled { color: #90aac5; } infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #215d9c); + border-color: #0f2b48; + background-image: image(#215d9c); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #0b1e33; } + border-color: #0f2b48; } infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop { color: #d3dfeb; } infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled { - border-color: #0b1e33; - background-image: linear-gradient(to bottom, #21558b); + border-color: #0f2b48; + background-image: image(#21558b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #0b1e33; } + border-color: #0f2b48; } infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled label, infobar.error button:backdrop:disabled { color: #6f91b4; } infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { @@ -4164,7 +4286,7 @@ tooltip { /***************** * Color Chooser * *****************/ -colorswatch, colorswatch:drop(active) { +colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { border-top-left-radius: 5.5px; @@ -4193,30 +4315,29 @@ colorswatch.right, colorswatch:last-child:not(.bottom) { colorswatch.dark overlay { color: #ffffff; } colorswatch.dark overlay:hover { - border-color: #17191a; } + border-color: #1b1f20; } colorswatch.dark overlay:backdrop { color: #d3d4d5; } colorswatch.light overlay { color: white; } colorswatch.light overlay:hover { - border-color: #17191a; } + border-color: #1b1f20; } colorswatch.light overlay:backdrop { color: #d3d4d5; } colorswatch:drop(active) { box-shadow: none; } colorswatch:drop(active).light overlay { border-color: #4e9a06; - box-shadow: inset 0 0 0 2px #17191a, inset 0 0 0 1px #4e9a06; } + box-shadow: inset 0 0 0 2px #1b1f20, inset 0 0 0 1px #4e9a06; } colorswatch:drop(active).dark overlay { border-color: #4e9a06; - box-shadow: inset 0 0 0 2px #17191a, inset 0 0 0 1px #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 #17191a; } + 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: #17191a; + border-color: #1b1f20; box-shadow: none; } colorswatch#add-color-button { border-radius: 5px 5px 0 0; } @@ -4225,7 +4346,8 @@ colorswatch#add-color-button { colorswatch#add-color-button overlay { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; + 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); @@ -4233,14 +4355,15 @@ colorswatch#add-color-button { colorswatch#add-color-button overlay:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); - border-color: #17191a; - background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); + 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); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); + background-image: linear-gradient(to bottom, #353c3e, #2e3436 60%, #2a2e30); } colorswatch#add-color-button overlay:backdrop { - border-color: #1a1c1d; - background-image: linear-gradient(to bottom, #33393b); + border-color: #202425; + background-image: image(#33393b); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -4284,32 +4407,35 @@ colorchooser .popover.osd { decoration { border-radius: 4px 4px 0 0; border-width: 0px; - box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(23, 25, 26, 0.9); + box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(27, 31, 32, 0.9); margin: 10px; } decoration:backdrop { - box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(23, 25, 26, 0.9); + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 31, 32, 0.9); transition: 200ms ease-out; } .maximized decoration, .fullscreen decoration, .tiled decoration { border-radius: 0; } .popup decoration { box-shadow: none; } .ssd decoration { - box-shadow: 0 0 0 1px rgba(23, 25, 26, 0.9); } + box-shadow: 0 0 0 1px rgba(27, 31, 32, 0.9); } .csd.popup decoration { border-radius: 0; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(23, 25, 26, 0.8); } + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 31, 32, 0.8); } tooltip.csd decoration { border-radius: 5px; box-shadow: none; } messagedialog.csd decoration { border-radius: 4px; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(23, 25, 26, 0.8); } + 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: 2px; + background-color: #1b1f20; + border: solid 1px #1b1f20; border-radius: 0; - margin: 2px; - background-color: #33393b; - border: solid 1px #1a1c1d; - 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); @@ -4334,8 +4460,7 @@ iconview text:selected, 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, @@ -4347,8 +4472,7 @@ popover.background radiobutton:selected, 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, @@ -4358,8 +4482,7 @@ popover.background radiobutton:selected, 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, @@ -4369,8 +4492,7 @@ popover.background radiobutton:selected, 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, @@ -4378,13 +4500,12 @@ popover.background radiobutton:selected, 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 * @@ -4422,12 +4543,6 @@ cursor-handle { .context-menu { font: initial; } -button.circular { - border-radius: 20px; - -gtk-outline-radius: 20px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; @@ -4438,23 +4553,23 @@ button.circular { color: #eeeeec; background-color: #232729; border: 1px solid; - border-color: #17191a; + border-color: #1b1f20; border-radius: 5px; - box-shadow: inset 0 -3px #1c1f20; + box-shadow: inset 0 -3px #1e2224; font-size: smaller; } .keycap:backdrop { background-color: #252a2c; color: #919494; transition: 200ms ease-out; } -*:drop(active):focus, -*:drop(active) { +: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: 60px; - min-height: 16px; } + min-width: 60px; } stackswitcher button.circular, stackswitcher button.text-button.circular { @@ -4511,11 +4626,14 @@ base background color of selections on backdrop windows */ text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #ffffff; /* +insensitive color on backdrop windows*/ +@define-color unfocused_insensitive_color #566164; +/* widgets main borders color */ -@define-color borders #17191a; +@define-color borders #1b1f20; /* widgets main borders color on backdrop windows */ -@define-color unfocused_borders #1a1c1d; +@define-color unfocused_borders #202425; /* these are pretty self explicative */ @define-color warning_color #f57900; diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 59ae421..da6a156 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -8,7 +8,7 @@ -GtkWidget-text-handle-height: 20; -GtkDialog-button-spacing: 2; -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; @@ -20,10 +20,10 @@ ***************/ .background { color: #2e3436; - background-color: #f5f5f4; } + background-color: #e8e8e7; } .background:backdrop { - color: #929595; - background-color: #f5f5f4; + color: #8b8e8f; + background-color: #e8e8e7; text-shadow: none; -gtk-icon-shadow: none; } @@ -38,16 +38,16 @@ .gtkstyle-fallback { color: #2e3436; - background-color: #f5f5f4; } + background-color: #e8e8e7; } .gtkstyle-fallback:hover { color: #2e3436; background-color: white; } .gtkstyle-fallback:active { color: #2e3436; - background-color: #ddddd9; } + background-color: #cfcfcd; } .gtkstyle-fallback:disabled { - color: #929595; - background-color: #f9f9f8; } + color: #8b8e8f; + background-color: #f1f1f1; } .gtkstyle-fallback:selected { color: #ffffff; background-color: #4a90d9; } @@ -74,13 +74,14 @@ textview text { border-radius: 3px; } textview border { - background-color: #fafafa; } + background-color: #f4f4f3; } .rubberband, 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); } @@ -95,16 +96,16 @@ label { label.separator { color: #2e3436; } label.separator:backdrop { - color: #929595; } + color: #8b8e8f; } label selection { background-color: #4a90d9; color: #ffffff; } label:disabled { - color: #929595; } + color: #8b8e8f; } label:disabled:backdrop { - color: #d1d1cc; } + color: #c3c3c0; } label:backdrop { - color: #929595; } + color: #8b8e8f; } .dim-label, label.separator, .titlebar:not(headerbar) .subtitle, headerbar .subtitle { @@ -113,27 +114,28 @@ headerbar .subtitle { assistant .sidebar { background-color: #ffffff; - border-top: 1px solid #acaca4; } + border-top: 1px solid #b6b6b3; } assistant .sidebar:backdrop { background-color: #fcfcfc; - border-color: #b3b3ac; } + border-color: #c0c0bd; } assistant.csd .sidebar { border-top-style: none; } assistant .sidebar label { padding: 4px 8px; } assistant .sidebar label.highlight { - background-color: #cdcece; } + 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(32, 37, 38, 0.8); + 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; } @@ -165,17 +167,15 @@ entry { border-radius: 2px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: black; - border-color: #acaca4; - background-image: linear-gradient(to bottom, #dadad6, #fdfdfc 2px, #ffffff 90%); + border-color: #b6b6b3; + background-color: #ffffff; 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: 4px; } + margin-right: 4px; } spinbutton:not(.vertical) image.right, entry image.right { - padding-left: 4px; - padding-right: 0; } + margin-left: 4px; } spinbutton:not(.vertical) undershoot.left, entry undershoot.left { background-color: transparent; @@ -203,7 +203,7 @@ entry { entry.flat { min-height: 0; padding: 2px; - background-image: none; + background-color: transparent; border-color: transparent; border-radius: 0; } spinbutton:focus:not(.vertical), @@ -212,22 +212,22 @@ entry { border-color: #4a90d9; } spinbutton:disabled:not(.vertical), entry:disabled { - color: #929595; - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + color: #8b8e8f; + border-color: #b6b6b3; + background-color: #f1f1f1; box-shadow: none; } spinbutton:backdrop:not(.vertical), entry:backdrop { color: #323232; - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #fcfcfc); + border-color: #c0c0bd; + background-color: #fcfcfc; box-shadow: none; transition: 200ms ease-out; } spinbutton:backdrop:disabled:not(.vertical), entry:backdrop:disabled { - color: #d1d1cc; - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + color: #c3c3c0; + border-color: #c0c0bd; + background-color: #f1f1f1; box-shadow: none; } spinbutton.error:not(.vertical), entry.error { @@ -262,7 +262,7 @@ entry { color: #4a90d9; } spinbutton:not(.vertical) image:backdrop, entry image:backdrop { - color: #a7aaaa; } + color: #a2a4a5; } spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), entry:drop(active):focus, entry:drop(active) { @@ -272,7 +272,7 @@ entry { entry { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); + background-color: rgba(0, 0, 0, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: 0 1px black; @@ -281,7 +281,7 @@ entry { entry:focus { color: white; border-color: #4a90d9; - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); + background-color: rgba(0, 0, 0, 0.5); background-clip: padding-box; box-shadow: inset 0 0 0 1px #4a90d9; text-shadow: 0 1px black; @@ -290,16 +290,16 @@ entry { entry:backdrop { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); + background-color: rgba(0, 0, 0, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd spinbutton:disabled:not(.vertical), .osd entry:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: rgba(49, 52, 52, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -336,17 +336,15 @@ entry { .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: #e6e6e4; - 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: #e6e6e4; - 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 { - border-top-color: #e6e6e4; } + border-top-color: #e9e9e8; } .linked.vertical > spinbutton:not(.vertical) + spinbutton:focus:not(:only-child):not(.vertical), .linked.vertical > spinbutton:not(.vertical) + entry:focus:not(:only-child), .linked.vertical > entry + spinbutton:focus:not(:only-child):not(.vertical), @@ -405,18 +403,19 @@ treeview entry.flat, treeview entry { notebook > header > tabs > arrow, button.titlebutton, button { min-height: 18px; - min-width: 18px; + min-width: 16px; padding: 2px; border: 1px solid; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); + 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 white; } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } notebook > header > tabs > arrow, button.sidebar-button, button.titlebutton, button.flat { border-color: transparent; @@ -437,28 +436,29 @@ button { button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); + 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); -gtk-icon-effect: highlight; } notebook > header > tabs > arrow:active, button.titlebutton:active, notebook > header > tabs > arrow:checked, button.titlebutton:checked, button:active, button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #d5d5d1, #e9e9e7); - 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 2px 1px -2px rgba(0, 0, 0, 0.6); + border-color: #b6b6b3; + background-image: image(#d9d9d7); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; transition-duration: 50ms; } notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop, button:backdrop.flat, button:backdrop { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -469,14 +469,14 @@ button { button:backdrop.flat, button:backdrop label, button:backdrop { - color: #929595; } + color: #8b8e8f; } notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked, button:backdrop.flat:active, button:backdrop.flat:checked, button:backdrop:active, button:backdrop:checked { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #dededb); + border-color: #c0c0bd; + background-image: image(#d7d7d7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:backdrop:active label, button.sidebar-button:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.sidebar-button:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.sidebar-button:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.sidebar-button:backdrop:checked, button.titlebutton:backdrop:checked, notebook > header > tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked, button:backdrop.flat:active label, @@ -487,12 +487,12 @@ button { button:backdrop:active, button:backdrop:checked label, button:backdrop:checked { - color: #929595; } + color: #8b8e8f; } notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled, button:backdrop.flat:disabled, button:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -501,21 +501,21 @@ button { button:backdrop.flat:disabled, button:backdrop:disabled label, button:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } notebook > header > tabs > arrow:backdrop:disabled:active, button.sidebar-button:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.sidebar-button:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked, button:backdrop.flat:disabled:active, button:backdrop.flat:disabled:checked, button:backdrop:disabled:active, button:backdrop:disabled:checked { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #ededea); + border-color: #c0c0bd; + background-image: image(#d7d7d7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:backdrop:disabled:active label, button.sidebar-button:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.sidebar-button:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, button:backdrop.flat:disabled:active label, button:backdrop.flat:disabled:checked label, button:backdrop:disabled:active label, button:backdrop:disabled:checked label { - color: #d1d1cc; } + color: #c3c3c0; } notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, button.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, button.flat:backdrop, button.flat:disabled, @@ -528,39 +528,44 @@ button { -gtk-icon-shadow: none; } notebook > header > tabs > arrow:disabled, button.titlebutton:disabled, button:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:disabled label, button.titlebutton:disabled label, notebook > header > tabs > arrow:disabled, button.titlebutton:disabled, button:disabled label, button:disabled { - color: #929595; } + color: #8b8e8f; } notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked, button:disabled:active, button:disabled:checked { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f1f1f0, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#d7d7d7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked, button:disabled:active label, button:disabled:active, button:disabled:checked label, button:disabled:checked { - color: #929595; } + color: #8b8e8f; } notebook > header > tabs > arrow.image-button, button.image-button.titlebutton, button.image-button { min-width: 18px; - min-height: 18px; } + padding-left: 2px; + padding-right: 2px; } notebook > header > tabs > arrow.text-button, button.text-button.titlebutton, button.text-button { padding-left: 8px; padding-right: 8px; } - notebook > header > tabs > arrow.text-button.image-button label, button.text-button.image-button.titlebutton label, - button.text-button.image-button label { - padding-left: 4px; - padding-right: 4px; } + notebook > header > tabs > arrow.text-button.image-button, button.text-button.image-button.titlebutton, + button.text-button.image-button { + padding-left: 2px; + padding-right: 2px; } + notebook > header > tabs > arrow.text-button.image-button label, button.text-button.image-button.titlebutton label, + button.text-button.image-button label { + padding-left: 4px; + padding-right: 4px; } combobox:drop(active) button.combo, notebook > header > tabs > arrow:drop(active), button.titlebutton:drop(active), button:drop(active) { color: #4e9a06; @@ -581,10 +586,10 @@ button.osd { min-height: 24px; color: #eeeeec; border-radius: 3px; - outline-color: rgba(238, 238, 236, 0.3); color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -597,7 +602,8 @@ button.osd { button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -609,7 +615,8 @@ button.osd { button.osd:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -619,9 +626,10 @@ button.osd { box-shadow: none; } button.osd:disabled:backdrop, button.osd:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -630,7 +638,8 @@ button.osd { button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -641,7 +650,8 @@ button.osd { button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -651,7 +661,8 @@ button { button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -664,7 +675,8 @@ button { button:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -673,9 +685,10 @@ button { popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -684,7 +697,8 @@ button { button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -704,7 +718,8 @@ button { button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -712,9 +727,10 @@ button { outline-color: rgba(238, 238, 236, 0.3); } popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -735,7 +751,8 @@ button { button.flat:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -744,7 +761,8 @@ button { button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; + border-color: #215d9c; + border-bottom-color: #184472; background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6); text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); @@ -761,25 +779,26 @@ button.suggested-action { button.suggested-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); + border-color: #215d9c; + border-bottom-color: #184472; text-shadow: 0 -1px rgba(0, 0, 0, 0.49553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); + background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); } button.suggested-action:active, button.suggested-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #276fba, #3583d5); - text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #215d9c; + background-image: image(#3180d4); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } .selection-mode button.titlebutton:backdrop, button.suggested-action:backdrop, button.suggested-action.flat:backdrop { border-color: #4a90d9; - background-image: linear-gradient(to bottom, #4a90d9); + background-image: image(#4a90d9); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -794,8 +813,8 @@ button.suggested-action { button.suggested-action:backdrop:checked, button.suggested-action.flat:backdrop:active, button.suggested-action.flat:backdrop:checked { - border-color: #2a76c6; - background-image: linear-gradient(to bottom, #2a76c6); + border-color: #438cd8; + background-image: image(#438cd8); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked label, .selection-mode button.titlebutton:backdrop:checked, button.suggested-action:backdrop:active label, @@ -806,12 +825,12 @@ button.suggested-action { button.suggested-action.flat:backdrop:active, button.suggested-action.flat:backdrop:checked label, button.suggested-action.flat:backdrop:checked { - color: #d4e4f4; } + color: #d9e8f7; } .selection-mode button.titlebutton:backdrop:disabled, button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -820,21 +839,21 @@ button.suggested-action { button.suggested-action:backdrop:disabled, button.suggested-action.flat:backdrop:disabled label, button.suggested-action.flat:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } .selection-mode button.titlebutton:backdrop:disabled:active, .selection-mode button.titlebutton:backdrop:disabled:checked, button.suggested-action:backdrop:disabled:active, button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked { - border-color: #5094db; - background-image: linear-gradient(to bottom, #5094db); + border-color: #438cd8; + background-image: image(#438cd8); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label, button.suggested-action:backdrop:disabled:active label, button.suggested-action:backdrop:disabled:checked label, button.suggested-action.flat:backdrop:disabled:active label, button.suggested-action.flat:backdrop:disabled:checked label { - color: #8db9e8; } + color: #85b4e6; } .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, button.suggested-action.flat:backdrop, button.suggested-action.flat:disabled, @@ -847,29 +866,30 @@ button.suggested-action { -gtk-icon-shadow: none; color: rgba(74, 144, 217, 0.8); } button.suggested-action:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.suggested-action:disabled label, button.suggested-action:disabled { - color: #929595; } + color: #8b8e8f; } button.suggested-action:disabled:active, button.suggested-action:disabled:checked { - border-color: #1c5187; - background-image: linear-gradient(to bottom, #4b8dd3, #5094db); + border-color: #215d9c; + background-image: image(#438cd8); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.suggested-action:disabled:active label, button.suggested-action:disabled:active, button.suggested-action:disabled:checked label, button.suggested-action:disabled:checked { - color: #b9d4f1; } + color: #b4d1ef; } .osd button.suggested-action { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5)); + background-color: transparent; + background-image: image(rgba(74, 144, 217, 0.5)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -879,7 +899,8 @@ button.suggested-action { button.suggested-action:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.7)); + background-color: transparent; + background-image: image(rgba(74, 144, 217, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -892,7 +913,8 @@ button.suggested-action { button.suggested-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, #4a90d9); + background-color: transparent; + background-image: image(#4a90d9); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -901,9 +923,10 @@ button.suggested-action { .osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -912,7 +935,8 @@ button.suggested-action { button.suggested-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5)); + background-color: transparent; + background-image: image(rgba(74, 144, 217, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -920,7 +944,8 @@ button.suggested-action { button.destructive-action { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8e0b0b; + border-color: #a60c0c; + border-bottom-color: #760909; background-image: linear-gradient(to bottom, #ef2929, #ee1616 60%, #d51010); text-shadow: 0 -1px rgba(0, 0, 0, 0.56078); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078); @@ -936,24 +961,25 @@ button.destructive-action { button.destructive-action:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #f14545, #ef2929 60%, #ee1616); + border-color: #a60c0c; + border-bottom-color: #760909; text-shadow: 0 -1px rgba(0, 0, 0, 0.51278); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.51278); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); + background-image: linear-gradient(to bottom, #f14545, #ef2929 60%, #ee1616); } button.destructive-action:active, button.destructive-action:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #c70f0f, #ed1212); - text-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #a60c0c; + background-image: image(#e81111); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } button.destructive-action:backdrop, button.destructive-action.flat:backdrop { border-color: #ef2929; - background-image: linear-gradient(to bottom, #ef2929); + background-image: image(#ef2929); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -966,8 +992,8 @@ button.destructive-action { button.destructive-action:backdrop:checked, button.destructive-action.flat:backdrop:active, button.destructive-action.flat:backdrop:checked { - border-color: #d51010; - background-image: linear-gradient(to bottom, #d51010); + border-color: #ee2323; + background-image: image(#ee2323); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:backdrop:active label, button.destructive-action:backdrop:active, @@ -977,11 +1003,11 @@ button.destructive-action { button.destructive-action.flat:backdrop:active, button.destructive-action.flat:backdrop:checked label, button.destructive-action.flat:backdrop:checked { - color: #f7cfcf; } + color: #fcd3d3; } button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -989,19 +1015,19 @@ button.destructive-action { button.destructive-action:backdrop:disabled, button.destructive-action.flat:backdrop:disabled label, button.destructive-action.flat:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } button.destructive-action:backdrop:disabled:active, button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked { - border-color: #ef3131; - background-image: linear-gradient(to bottom, #ef3131); + border-color: #ee2323; + background-image: image(#ee2323); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:backdrop:disabled:active label, button.destructive-action:backdrop:disabled:checked label, button.destructive-action.flat:backdrop:disabled:active label, button.destructive-action.flat:backdrop:disabled:checked label { - color: #f57979; } + color: #f47070; } button.destructive-action.flat:backdrop, button.destructive-action.flat:disabled, button.destructive-action.flat:backdrop:disabled { @@ -1013,29 +1039,30 @@ button.destructive-action { -gtk-icon-shadow: none; color: rgba(239, 41, 41, 0.8); } button.destructive-action:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:disabled label, button.destructive-action:disabled { - color: #929595; } + color: #8b8e8f; } button.destructive-action:disabled:active, button.destructive-action:disabled:checked { - border-color: #8e0b0b; - background-image: linear-gradient(to bottom, #e52d2d, #ef3131); + border-color: #a60c0c; + background-image: image(#ee2323); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:disabled:active label, button.destructive-action:disabled:active, button.destructive-action:disabled:checked label, button.destructive-action:disabled:checked { - color: #f9adad; } + color: #f8a7a7; } .osd button.destructive-action { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5)); + background-color: transparent; + background-image: image(rgba(239, 41, 41, 0.5)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1045,7 +1072,8 @@ button.destructive-action { button.destructive-action:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.7)); + background-color: transparent; + background-image: image(rgba(239, 41, 41, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1058,7 +1086,8 @@ button.destructive-action { button.destructive-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, #ef2929); + background-color: transparent; + background-image: image(#ef2929); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1067,9 +1096,10 @@ button.destructive-action { .osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1078,7 +1108,8 @@ button.destructive-action { button.destructive-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5)); + background-color: transparent; + background-image: image(rgba(239, 41, 41, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1113,6 +1144,11 @@ button { 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 { @@ -1121,6 +1157,35 @@ button:backdrop { .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, @@ -1145,69 +1210,71 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { .inline-toolbar toolbutton > button { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); + 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 white; } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } .inline-toolbar toolbutton > button:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); + 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; } + box-shadow: inset 0 1px white; + background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); } .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #d5d5d1, #e9e9e7); - 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 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #b6b6b3; + background-image: image(#d9d9d7); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } .inline-toolbar toolbutton > button:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled { - color: #929595; } + color: #8b8e8f; } .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f1f1f0, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#d7d7d7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked { - color: #929595; } + color: #8b8e8f; } .inline-toolbar toolbutton > button:backdrop { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop { - color: #929595; } + color: #8b8e8f; } .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #dededb); + border-color: #c0c0bd; + background-image: image(#d7d7d7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:active label, .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked label, .inline-toolbar toolbutton > button:backdrop:checked { - color: #929595; } + color: #8b8e8f; } .inline-toolbar toolbutton > button:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:disabled label, .inline-toolbar toolbutton > button:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #ededea); + border-color: #c0c0bd; + background-image: image(#d7d7d7); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label { - color: #d1d1cc; } + color: #c3c3c0; } toolbar.inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > @@ -1272,11 +1339,8 @@ button:only-child, .linked.vertical > combobox:only-child > box > button.combo { 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, @@ -1291,46 +1355,24 @@ button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup -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: white; } - modelbutton.flat check:last-child, popover.background checkbutton check:last-child, - popover.background radiobutton check:last-child, - modelbutton.flat radio:last-child, - popover.background checkbutton radio:last-child, - popover.background radiobutton radio:last-child, - .menuitem.button.flat check:last-child, - .menuitem.button.flat radio:last-child { - margin-left: 8px; } - 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; } + background-color: #f4f4f4; } -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 { @@ -1339,46 +1381,85 @@ button.color { 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; } @@ -1407,6 +1488,8 @@ spinbutton:not(.vertical) { 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; @@ -1415,7 +1498,7 @@ spinbutton:not(.vertical) { color: #43484a; background-image: none; border-style: none none none solid; - border-color: rgba(172, 172, 164, 0.3); + border-color: rgba(182, 182, 179, 0.3); border-radius: 0; box-shadow: none; } spinbutton:not(.vertical) button:dir(rtl) { @@ -1424,21 +1507,26 @@ spinbutton:not(.vertical) { color: #2e3436; background-color: rgba(46, 52, 54, 0.05); } spinbutton:not(.vertical) button:disabled { - color: rgba(146, 149, 149, 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); } spinbutton:not(.vertical) button:backdrop { - color: #9d9f9f; + color: #96999a; background-color: transparent; - border-color: rgba(179, 179, 172, 0.3); + border-color: rgba(192, 192, 189, 0.3); transition: 200ms ease-out; } spinbutton:not(.vertical) button:backdrop:disabled { - color: rgba(209, 209, 204, 0.3); - background-image: none; + color: rgba(195, 195, 192, 0.3); + 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; @@ -1484,18 +1572,18 @@ spinbutton:not(.vertical) { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: #878a89; + color: #858786; 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; } spinbutton.vertical:disabled { - color: #929595; } + color: #8b8e8f; } spinbutton.vertical:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } spinbutton.vertical:drop(active) { border-color: transparent; box-shadow: none; } @@ -1517,7 +1605,8 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1526,7 +1615,8 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -1535,16 +1625,18 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child:active { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } .osd spinbutton.vertical button:first-child:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1552,7 +1644,8 @@ spinbutton.vertical button.down { .osd spinbutton.vertical button:first-child:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -1582,7 +1675,7 @@ toolbar, .inline-toolbar, searchbar, .location-bar { -GtkWidget-window-dragging: true; padding: 2px; - background-color: #f5f5f4; } + background-color: #e8e8e7; } toolbar { padding: 3px; } @@ -1592,7 +1685,7 @@ toolbar { padding: 13px; border: none; border-radius: 4px; - background-color: rgba(32, 37, 38, 0.8); } + background-color: rgba(28, 31, 32, 0.7); } toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom { border-radius: 0; } toolbar.horizontal separator { @@ -1620,12 +1713,12 @@ searchbar, .inline-toolbar, searchbar, .location-bar { border-style: solid; - border-color: #acaca4; - background-color: #dfdfdc; } + border-color: #b6b6b3; + background-color: #d9d9d7; } .inline-toolbar:backdrop, searchbar:backdrop, .location-bar:backdrop { - border-color: #b3b3ac; - background-color: #dededb; + border-color: #c0c0bd; + background-color: #dadad8; box-shadow: none; transition: 200ms ease-out; } @@ -1638,22 +1731,22 @@ headerbar { min-height: 32px; border-width: 0 0 1px; border-style: solid; - border-color: #acaca4; + border-color: #91918c; border-radius: 0; - background: white linear-gradient(to top, #dfdfdc, #fafafa); + background: #f4f4f4 linear-gradient(to top, #d4d4d2, #efefef 2px, #f4f4f4 3px); box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } .titlebar:backdrop:not(headerbar), headerbar:backdrop { - border-color: #b3b3ac; - background-color: #f5f5f4; + border-color: #c0c0bd; + background-color: #e8e8e7; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); transition: 200ms ease-out; } .titlebar:not(headerbar) .title, headerbar .title { - font-weight: bold; padding-left: 8px; - padding-right: 8px; } + padding-right: 8px; + font-weight: bold; } .titlebar:not(headerbar) .subtitle, headerbar .subtitle { font-size: smaller; @@ -1662,9 +1755,9 @@ headerbar { .selection-mode.titlebar:not(headerbar), headerbar.selection-mode { color: #ffffff; - text-shadow: 0 -1px rgba(0, 0, 0, 0.5); border-color: #184472; - background: #4a90d9 linear-gradient(to top, #276fba, #428bd7); + text-shadow: 0 -1px rgba(0, 0, 0, 0.5); + 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), headerbar.selection-mode:backdrop { @@ -1675,7 +1768,8 @@ headerbar { headerbar.selection-mode button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; + border-color: #215d9c; + border-bottom-color: #184472; background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6); text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); @@ -1692,26 +1786,27 @@ headerbar { headerbar.selection-mode button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); + border-color: #215d9c; + border-bottom-color: #184472; text-shadow: 0 -1px rgba(0, 0, 0, 0.49553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); + background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); } .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked, headerbar.selection-mode button:active, headerbar.selection-mode button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #276fba, #3583d5); - text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #215d9c; + background-image: image(#3180d4); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop, headerbar.selection-mode button:backdrop.flat, headerbar.selection-mode button:backdrop { border-color: #4a90d9; - background-image: linear-gradient(to bottom, #4a90d9); + background-image: image(#4a90d9); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1728,8 +1823,8 @@ headerbar { headerbar.selection-mode button:backdrop.flat:checked, headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked { - border-color: #2a76c6; - background-image: linear-gradient(to bottom, #2a76c6); + border-color: #438cd8; + background-image: image(#438cd8); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, @@ -1741,12 +1836,12 @@ headerbar { headerbar.selection-mode button:backdrop:active, headerbar.selection-mode button:backdrop:checked label, headerbar.selection-mode button:backdrop:checked { - color: #d4e4f4; } + color: #d9e8f7; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, headerbar.selection-mode button:backdrop.flat:disabled, headerbar.selection-mode button:backdrop:disabled { border-color: #65a1df; - background-image: linear-gradient(to bottom, #65a1df); + background-image: image(#65a1df); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1762,8 +1857,8 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { - border-color: #5094db; - background-image: linear-gradient(to bottom, #5094db); + border-color: #438cd8; + background-image: image(#438cd8); box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked label, @@ -1771,7 +1866,7 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked label, headerbar.selection-mode button:backdrop:disabled:active label, headerbar.selection-mode button:backdrop:disabled:checked label { - color: #8db9e8; } + color: #85b4e6; } .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button.flat:disabled, @@ -1784,8 +1879,8 @@ headerbar { -gtk-icon-shadow: none; } .selection-mode.titlebar:not(headerbar) button:disabled, headerbar.selection-mode button:disabled { - border-color: #1c5187; - background-image: linear-gradient(to bottom, #65a1df); + border-color: #215d9c; + background-image: image(#65a1df); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -1796,49 +1891,51 @@ headerbar { .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { - border-color: #1c5187; - background-image: linear-gradient(to bottom, #4b8dd3, #5094db); + border-color: #215d9c; + background-image: image(#438cd8); box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active label, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked label, headerbar.selection-mode button:disabled:checked { - color: #b9d4f1; } + color: #b4d1ef; } .selection-mode.titlebar:not(headerbar) button.suggested-action, headerbar.selection-mode button.suggested-action { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); + 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 white; + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, headerbar.selection-mode button.suggested-action:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); + 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); border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:active, headerbar.selection-mode button.suggested-action:active { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #d5d5d1, #e9e9e7); - 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 2px 1px -2px rgba(0, 0, 0, 0.6); + border-color: #b6b6b3; + background-image: image(#d9d9d7); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; border-color: #184472; } .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1846,11 +1943,11 @@ headerbar { .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, headerbar.selection-mode button.suggested-action:disabled label, headerbar.selection-mode button.suggested-action:disabled { - color: #929595; } + color: #8b8e8f; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1858,11 +1955,11 @@ headerbar { .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, headerbar.selection-mode button.suggested-action:backdrop label, headerbar.selection-mode button.suggested-action:backdrop { - color: #929595; } + color: #8b8e8f; } .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, headerbar.selection-mode button.suggested-action:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -1870,12 +1967,13 @@ headerbar { .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, headerbar.selection-mode button.suggested-action:backdrop:disabled label, headerbar.selection-mode button.suggested-action:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu, 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; } @@ -1897,14 +1995,24 @@ headerbar { border-radius: 0; } .default-decoration.titlebar:not(headerbar), headerbar.default-decoration { - padding: 2px; - min-height: 24px; } + min-height: 24px; + padding: 2px; } .default-decoration.titlebar:not(headerbar) button.titlebutton, headerbar.default-decoration button.titlebutton { min-height: 22px; min-width: 22px; 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, @@ -1916,14 +2024,17 @@ headerbar switch { margin-top: 5px; margin-bottom: 5px; } -.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: 4px; border-top-right-radius: 4px; } -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 { - border-top-left-radius: 4px; } -window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child { - border-top-right-radius: 4px; } +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):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) { padding: 0; @@ -1933,7 +2044,7 @@ window.csd > .titlebar:not(headerbar) { border-color: transparent; box-shadow: none; } .titlebar:not(headerbar) > separator { - background-color: #acaca4; } + background-color: #b6b6b3; } /************ * Pathbars * @@ -1960,7 +2071,7 @@ window.csd > .titlebar:not(headerbar) { **************/ treeview.view { border-left-color: #979a9b; - border-top-color: #f5f5f4; } + border-top-color: #e8e8e7; } * { -GtkTreeView-horizontal-separator: 4; -GtkTreeView-grid-line-width: 1; @@ -1974,21 +2085,21 @@ treeview.view { border-left-color: #a5c8ec; border-top-color: rgba(46, 52, 54, 0.1); } treeview.view:disabled { - color: #929595; } + color: #8b8e8f; } treeview.view:disabled:selected { color: #92bce8; } treeview.view:disabled:selected:backdrop { color: #7fb0e4; } treeview.view:disabled:backdrop { - color: #d1d1cc; } + color: #c3c3c0; } treeview.view.separator { min-height: 2px; - color: #f5f5f4; } + color: #e8e8e7; } treeview.view.separator:backdrop { - color: rgba(245, 245, 244, 0.1); } + color: rgba(232, 232, 231, 0.1); } treeview.view:backdrop { - border-left-color: #c4c5c5; - border-top: #f5f5f4; } + border-left-color: #babbbb; + border-top: #e8e8e7; } treeview.view:drop(active) { border-style: solid none; border-width: 1px; @@ -1999,11 +2110,11 @@ treeview.view { 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 { @@ -2013,7 +2124,7 @@ treeview.view { treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } treeview.view.expander:backdrop { - color: #b2b4b4; } + color: #adafb0; } treeview.view.progressbar { color: #ffffff; border: 1px solid #184472; @@ -2064,35 +2175,35 @@ treeview.view { 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-radius: 0; border-style: none; + border-radius: 0; 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; - border-radius: 0; background-image: none; - text-shadow: none; border-style: none solid solid none; - border-color: #f5f5f4; } + border-color: #e8e8e7; + border-radius: 0; + text-shadow: none; } treeview.view header button:disabled { - border-color: #f5f5f4; + border-color: #e8e8e7; background-image: none; } treeview.view header button:backdrop { - border-color: #f5f5f4; + color: #babbbb; + border-color: #e8e8e7; border-style: none solid solid none; - color: #c4c5c5; background-image: none; background-color: #fcfcfc; } treeview.view header button:backdrop:disabled { - border-color: #f5f5f4; + border-color: #e8e8e7; background-image: none; } /********* @@ -2105,7 +2216,7 @@ menubar, box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { - background-color: #f5f5f4; } + background-color: #e8e8e7; } menubar > menuitem, .menubar > menuitem { min-height: 16px; @@ -2116,7 +2227,7 @@ menubar, color: #2a76c6; } menubar > menuitem:disabled, .menubar > menuitem:disabled { - color: #929595; + color: #8b8e8f; box-shadow: none; } menu, @@ -2125,7 +2236,7 @@ menu, margin: 4px; padding: 2px 0px; background-color: #ffffff; - border: 1px solid #acaca4; } + border: 1px solid #b6b6b3; } .csd menu, .csd .menu, .csd .context-menu { @@ -2149,17 +2260,17 @@ menu, menu menuitem:disabled, .menu menuitem:disabled, .context-menu menuitem:disabled { - color: #929595; } + color: #8b8e8f; } menu menuitem:disabled:backdrop, .menu menuitem:disabled:backdrop, .context-menu menuitem:disabled:backdrop { - color: #d1d1cc; } + color: #c3c3c0; } menu menuitem:backdrop, menu menuitem:backdrop:hover, .menu menuitem:backdrop, .menu menuitem:backdrop:hover, .context-menu menuitem:backdrop, .context-menu menuitem:backdrop:hover { - color: #929595; + color: #8b8e8f; background-color: transparent; } menu menuitem arrow, .menu menuitem arrow, @@ -2242,12 +2353,12 @@ menuitem radio { popover.background { padding: 2px; border-radius: 3px; - background-color: #f5f5f4; + background-color: #e8e8e7; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); } .csd popover.background, popover.background { - border: 1px solid #acaca4; } + border: 1px solid #b6b6b3; } popover.background:backdrop { - background-color: #f5f5f4; + background-color: #e8e8e7; box-shadow: none; } popover.background > list, popover.background > .view, @@ -2267,12 +2378,12 @@ popover.background { *************/ notebook > header { padding: 1px; - border-color: #acaca4; + border-color: #b6b6b3; border-width: 1px; - background-color: #dbdbd8; } + background-color: #cfcfcd; } notebook > header:backdrop { - border-color: #b3b3ac; - background-color: #dededb; } + border-color: #c0c0bd; + background-color: #dadad8; } notebook > header tabs { margin: -1px; } notebook > header.top { @@ -2280,7 +2391,7 @@ notebook > header { notebook > header.top > tabs { margin-bottom: -2px; } notebook > header.top > tabs > tab:hover { - box-shadow: inset 0 -3px #acaca4; } + box-shadow: inset 0 -3px #b6b6b3; } notebook > header.top > tabs > tab:backdrop { box-shadow: none; } notebook > header.top > tabs > tab:checked { @@ -2290,7 +2401,7 @@ notebook > header { notebook > header.bottom > tabs { margin-top: -2px; } notebook > header.bottom > tabs > tab:hover { - box-shadow: inset 0 3px #acaca4; } + box-shadow: inset 0 3px #b6b6b3; } notebook > header.bottom > tabs > tab:backdrop { box-shadow: none; } notebook > header.bottom > tabs > tab:checked { @@ -2300,7 +2411,7 @@ notebook > header { notebook > header.left > tabs { margin-right: -2px; } notebook > header.left > tabs > tab:hover { - box-shadow: inset -3px 0 #acaca4; } + box-shadow: inset -3px 0 #b6b6b3; } notebook > header.left > tabs > tab:backdrop { box-shadow: none; } notebook > header.left > tabs > tab:checked { @@ -2310,7 +2421,7 @@ notebook > header { notebook > header.right > tabs { margin-left: -2px; } notebook > header.right > tabs > tab:hover { - box-shadow: inset 3px 0 #acaca4; } + box-shadow: inset 3px 0 #b6b6b3; } notebook > header.right > tabs > tab:backdrop { box-shadow: none; } notebook > header.right > tabs > tab:checked { @@ -2363,32 +2474,32 @@ notebook > header { min-width: 20px; padding: 1px 6px; outline-offset: -5px; - color: #929595; + color: #8b8e8f; font-weight: bold; border-width: 1px; border-color: transparent; } notebook > header tab:hover { - color: #606566; } + color: #5d6163; } notebook > header tab:hover.reorderable-page { - border-color: rgba(172, 172, 164, 0.3); - background-color: rgba(245, 245, 244, 0.2); } + border-color: rgba(182, 182, 179, 0.3); + background-color: rgba(232, 232, 231, 0.2); } notebook > header tab:backdrop { - color: #babbbb; } + color: #b0b2b2; } notebook > header tab:backdrop.reorderable-page { border-color: transparent; background-color: transparent; } notebook > header tab:checked { color: #2e3436; } notebook > header tab:checked.reorderable-page { - border-color: rgba(172, 172, 164, 0.5); - background-color: rgba(245, 245, 244, 0.5); } + border-color: rgba(182, 182, 179, 0.5); + background-color: rgba(232, 232, 231, 0.5); } notebook > header tab:checked.reorderable-page:hover { - background-color: rgba(245, 245, 244, 0.7); } + background-color: rgba(232, 232, 231, 0.7); } notebook > header tab:backdrop:checked { - color: #929595; } + color: #8b8e8f; } notebook > header tab:backdrop:checked.reorderable-page { - border-color: #b3b3ac; - background-color: #f5f5f4; } + border-color: #c0c0bd; + background-color: #e8e8e7; } notebook > header tab button.flat { padding: 0; margin-top: 2px; @@ -2448,22 +2559,22 @@ notebook > stack:not(:only-child) { * Scrollbars * **************/ scrollbar { - background-color: #cdcece; + background-color: #c3c4c4; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } * { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { - border-bottom: 1px solid #acaca4; } + border-bottom: 1px solid #b6b6b3; } scrollbar.bottom { - border-top: 1px solid #acaca4; } + border-top: 1px solid #b6b6b3; } scrollbar.left { - border-right: 1px solid #acaca4; } + border-right: 1px solid #b6b6b3; } scrollbar.right { - border-left: 1px solid #acaca4; } + border-left: 1px solid #b6b6b3; } scrollbar:backdrop { - background-color: #eeeeec; - border-color: #b3b3ac; + background-color: #e1e1df; + border-color: #c0c0bd; transition: 200ms ease-out; } scrollbar slider { min-width: 6px; @@ -2472,13 +2583,13 @@ scrollbar { border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; - background-color: #7e8182; } + background-color: #787c7d; } scrollbar slider:hover { - background-color: #565b5c; } + background-color: #535859; } scrollbar slider:hover:active { background-color: #2a76c6; } scrollbar slider:backdrop { - background-color: #cdcfce; } + background-color: #c3c4c4; } scrollbar slider:disabled { background-color: transparent; } scrollbar.fine-tune slider { @@ -2537,7 +2648,7 @@ scrollbar { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: #7e8182; } + color: #787c7d; } scrollbar button:hover { border-color: transparent; background-color: transparent; @@ -2545,7 +2656,7 @@ scrollbar { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: #565b5c; } + color: #535859; } scrollbar button:active, scrollbar button:checked { border-color: transparent; background-color: transparent; @@ -2561,7 +2672,7 @@ scrollbar { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: rgba(126, 129, 130, 0.2); } + color: rgba(120, 124, 125, 0.2); } scrollbar button:backdrop { border-color: transparent; background-color: transparent; @@ -2569,7 +2680,7 @@ scrollbar { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: #cdcfce; } + color: #c3c4c4; } scrollbar button:backdrop:disabled { border-color: transparent; background-color: transparent; @@ -2577,18 +2688,18 @@ scrollbar { box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; - color: rgba(205, 207, 206, 0.2); } + color: rgba(195, 196, 196, 0.2); } scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } 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 #acaca4; + border-top: 1px solid #b6b6b3; margin-top: -1px; } /********** @@ -2598,43 +2709,35 @@ switch { 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 #acaca4; + border: 1px solid #b6b6b3; border-radius: 2px; color: #2e3436; - background-image: linear-gradient(to bottom, #d8d8d4); + 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: #929595; - border-color: #acaca4; - background-image: none; - background-color: #f9f9f8; - box-shadow: 0 1px transparent; + color: #8b8e8f; + border-color: #b6b6b3; + background-color: #f1f1f1; text-shadow: none; } switch:backdrop { - color: #929595; - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #dededb); - box-shadow: none; + color: #8b8e8f; + border-color: #c0c0bd; + background-color: #dadad8; text-shadow: none; transition: 200ms ease-out; } switch:backdrop:checked { - color: #f5f5f4; + color: #e8e8e7; border-color: #4a90d9; - background-image: linear-gradient(to bottom, #4a90d9); - box-shadow: none; } - switch:disabled { - color: #d1d1cc; - border-color: #b3b3ac; - background-image: none; - background-color: #f9f9f8; } + background-color: #4a90d9; } + switch:backdrop:disabled { + color: #c3c3c0; + border-color: #c0c0bd; + background-color: #f1f1f1; } switch slider { margin: -1px; min-width: 35px; @@ -2644,55 +2747,55 @@ switch { transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; + border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - background-image: linear-gradient(to bottom, white 20%, #f5f5f4 90%); - box-shadow: inset 0 1px white, inset 0 -2px #fafaf9, inset 0 -1px #d8d8d4, 0 1px rgba(0, 0, 0, 0.1); } + 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); } switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white 10%, white 90%); - box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #ddddd9, 0 1px rgba(0, 0, 0, 0.1); } + border-color: #91918c; + box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); + background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); } switch:checked slider { border: 1px solid #184472; } switch:disabled slider { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } switch:disabled slider label, switch:disabled slider { - color: #929595; } + color: #8b8e8f; } switch:backdrop slider { transition: 200ms ease-out; - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } switch:backdrop slider label, switch:backdrop slider { - color: #929595; } + color: #8b8e8f; } switch:backdrop:checked slider { border-color: #4a90d9; } switch:backdrop:disabled slider { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } switch:backdrop:disabled slider label, switch:backdrop:disabled slider { - color: #d1d1cc; } + color: #c3c3c0; } row:selected switch { box-shadow: none; border-color: #184472; } row:selected switch:backdrop { border-color: #184472; } row:selected switch.slider:dir(rtl) { - border-left-color: #acaca4; } + border-left-color: #b6b6b3; } row:selected switch.slider:dir(ltr) { - border-right-color: #acaca4; } + border-right-color: #b6b6b3; } row:selected switch.slider:checked, row:selected switch.slider { border-color: #184472; } @@ -2756,11 +2859,11 @@ radio { -gtk-icon-source: none; color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; + border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - background-image: linear-gradient(to bottom, white 20%, #f5f5f4 90%); - box-shadow: inset 0 1px white, inset 0 -2px #fafaf9, inset 0 -1px #d8d8d4, 0 1px rgba(0, 0, 0, 0.1); } + 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); } check:only-child, radio:only-child { margin: 0; } @@ -2768,33 +2871,33 @@ radio { radio:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white 10%, white 90%); - box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #ddddd9, 0 1px rgba(0, 0, 0, 0.1); } + border-color: #91918c; + box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); + background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); } check:active, radio:active { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #d5d5d1, #e9e9e7); - 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 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #b6b6b3; + background-image: image(#d9d9d7); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } check:disabled, radio:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } check:disabled label, check:disabled, radio:disabled label, radio:disabled { - color: #929595; } + color: #8b8e8f; } check:backdrop, radio:backdrop { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); @@ -2802,18 +2905,18 @@ radio { check:backdrop label, check:backdrop, radio:backdrop label, radio:backdrop { - color: #929595; } + color: #8b8e8f; } check:backdrop:disabled, radio:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } check:backdrop:disabled label, check:backdrop:disabled, radio:backdrop:disabled label, radio:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } row:selected check, row:selected radio { border-color: #184472; } @@ -2821,7 +2924,8 @@ radio { radio { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -2831,7 +2935,8 @@ radio { radio:hover { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; @@ -2841,7 +2946,8 @@ radio { radio:active { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -2851,16 +2957,18 @@ radio { radio:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd check:disabled, .osd radio:disabled { - color: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; @@ -2879,8 +2987,7 @@ radio { box-shadow: none; -gtk-icon-shadow: none; color: inherit; - border-color: currentColor; - animation: none; } + border-color: currentColor; } check { border-radius: 3px; } @@ -2899,35 +3006,25 @@ radio { 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); } -radio:not(:indeterminate):checked { - animation: check_radio 400ms; } +check:not(:indeterminate):not(:checked):active:not(:backdrop) { + -gtk-icon-transform: translate(6px, -3px) rotate(-45deg) scaleY(0.2) rotate(45deg) scaleX(0); } -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, @@ -2936,44 +3033,37 @@ treeview.view radio:selected { border-color: #184472; } treeview.view check:selected:disabled, treeview.view radio:selected:disabled { - color: #929595; } + color: #8b8e8f; } treeview.view check:selected:disabled:backdrop, treeview.view radio:selected:disabled:backdrop { - color: #d1d1cc; } + color: #c3c3c0; } treeview.view check:backdrop:selected, treeview.view check:backdrop, treeview.view radio:backdrop:selected, treeview.view radio:backdrop { - color: #929595; } + color: #8b8e8f; } /************ * GtkScale * ************/ scale trough, scale fill, progressbar trough { - border: 1px solid #acaca4; + border: 1px solid #b6b6b3; border-radius: 3px; - background-color: #dbdbd8; - 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: #f9f9f8; - box-shadow: none; } + background-color: #f1f1f1; } scale trough:backdrop, scale fill:backdrop, progressbar trough:backdrop, progressbar:backdrop trough { - background-color: #dededb; - border-color: #b3b3ac; - box-shadow: none; + background-color: #dadad8; + border-color: #c0c0bd; transition: 200ms ease-out; } scale trough:backdrop:disabled, scale fill:backdrop:disabled, progressbar trough:backdrop:disabled, progressbar:backdrop trough:disabled { - background-color: #f9f9f8; } - 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; } + background-color: #f1f1f1; } + 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(53, 57, 58, 0.5); } + background-color: rgba(49, 52, 52, 0.5); } scale highlight, progressbar progress { border: 1px solid #184472; @@ -3023,113 +3113,123 @@ scale { scale trough { outline-offset: 2px; -gtk-outline-radius: 5px; } - scale fill, scale fill:backdrop { - background-color: #acaca4; - 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 { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; + border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.76923); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - background-image: linear-gradient(to bottom, white 20%, #f5f5f4 90%); - box-shadow: inset 0 1px white, inset 0 -2px #fafaf9, inset 0 -1px #d8d8d4, 0 1px rgba(0, 0, 0, 0.1); - border: 1px solid #a5a59c; + 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 #898984; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; } scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white 10%, white 90%); - box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #ddddd9, 0 1px rgba(0, 0, 0, 0.1); } + border-color: #91918c; + box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); + background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); } scale slider:active { border-color: #184472; } scale slider:disabled { - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #b6b6b3; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:disabled label, scale slider:disabled { - color: #929595; } + color: #8b8e8f; } scale slider:backdrop { transition: 200ms ease-out; - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop label, scale slider:backdrop { - color: #929595; } + color: #8b8e8f; } scale slider:backdrop:disabled { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f9f9f8); + border-color: #c0c0bd; + background-image: image(#f1f1f1); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop:disabled label, scale slider:backdrop:disabled { - color: #d1d1cc; } - row:selected scale slider, row:selected scale slider:disabled { + color: #c3c3c0; } + row:selected scale slider:disabled, row:selected scale slider { border-color: #184472; } .osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); background-clip: padding-box; 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); border-color: rgba(0, 0, 0, 0.7); - background-color: #202526; } + background-color: #1c1f20; } .osd scale slider:hover { color: white; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.8)); + background-color: transparent; + background-image: image(rgba(57, 63, 65, 0.7)); background-clip: padding-box; 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); - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7)); + background-color: transparent; + background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 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: #878a89; + color: #858786; border-color: rgba(0, 0, 0, 0.7); - background-image: linear-gradient(to bottom, rgba(53, 57, 58, 0.5)); + background-color: transparent; + background-image: image(rgba(49, 52, 52, 0.5)); 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); - background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8)); + background-color: transparent; + background-image: image(rgba(28, 31, 32, 0.7)); 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; } @@ -3168,6 +3268,7 @@ scale { 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; @@ -3182,6 +3283,7 @@ scale { 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; @@ -3196,6 +3298,7 @@ scale { 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; @@ -3210,6 +3313,7 @@ scale { 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; @@ -3224,6 +3328,7 @@ scale { 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; @@ -3238,6 +3343,7 @@ scale { 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; @@ -3252,6 +3358,7 @@ scale { 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; @@ -3266,6 +3373,7 @@ scale { 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; @@ -3280,6 +3388,7 @@ scale { 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; @@ -3294,6 +3403,7 @@ scale { 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; @@ -3308,6 +3418,7 @@ scale { 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; @@ -3322,6 +3433,7 @@ scale { 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; @@ -3336,6 +3448,7 @@ scale { 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; @@ -3350,6 +3463,7 @@ scale { 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; @@ -3364,6 +3478,7 @@ scale { 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; @@ -3378,6 +3493,7 @@ scale { 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; @@ -3392,6 +3508,7 @@ scale { 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; @@ -3406,6 +3523,7 @@ scale { 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; @@ -3420,6 +3538,7 @@ scale { 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; @@ -3434,6 +3553,7 @@ scale { 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; @@ -3448,6 +3568,7 @@ scale { 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; @@ -3462,6 +3583,7 @@ scale { 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; @@ -3476,6 +3598,7 @@ scale { 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; @@ -3490,6 +3613,7 @@ scale { 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; @@ -3504,7 +3628,7 @@ scale { min-height: 0; min-width: 0; } scale.color trough { - background-image: linear-gradient(to top, #acaca4); + background-image: image(#b6b6b3); background-repeat: no-repeat; } scale.color.horizontal { padding: 0 0 15px 0; } @@ -3606,6 +3730,8 @@ progressbar { progressbar.osd progress { border-style: none; border-radius: 0; } + progressbar trough.empty progress { + all: unset; } /************* * Level Bar * @@ -3623,13 +3749,13 @@ levelbar trough { padding: 2px; border-radius: 3px; color: black; - border-color: #acaca4; - background-image: linear-gradient(to bottom, #dadad6, #fdfdfc 2px, #ffffff 90%); + border-color: #b6b6b3; + background-color: #ffffff; box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); } levelbar trough:backdrop { color: #323232; - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #fcfcfc); + border-color: #c0c0bd; + background-color: #fcfcfc; box-shadow: none; } levelbar.horizontal.discrete block { margin: 0 1px; } @@ -3637,10 +3763,7 @@ levelbar.vertical.discrete block { 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; } @@ -3658,22 +3781,21 @@ levelbar block { 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(146, 149, 149, 0.15); } + border-color: rgba(139, 142, 143, 0.15); } /**************** * Print dialog * *****************/ printdialog paper { color: #2e3436; - border: 1px solid #acaca4; + border: 1px solid #b6b6b3; background: white; padding: 0; } printdialog paper:backdrop { - color: #929595; - border-color: #b3b3ac; } + color: #8b8e8f; + border-color: #c0c0bd; } printdialog .dialog-action-box { margin: 12px; } @@ -3686,24 +3808,24 @@ frame > border, margin: 0; padding: 0; border-radius: 0; - border: 1px solid #acaca4; } + border: 1px solid #b6b6b3; } frame > border.flat, .frame.flat { border-style: none; } frame > border:backdrop, .frame:backdrop { - border-color: #b3b3ac; } + border-color: #c0c0bd; } actionbar > revealer > box { padding: 6px; - border-top: 1px solid #acaca4; } + border-top: 1px solid #b6b6b3; } actionbar > revealer > box:backdrop { - border-color: #b3b3ac; } + border-color: #c0c0bd; } scrolledwindow viewport.frame { border-style: none; } scrolledwindow overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#949489), to(rgba(148, 148, 137, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); + background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#9d9d99), to(rgba(157, 157, 153, 0))), -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); background-size: 100% 5%, 100% 100%; background-repeat: no-repeat; background-position: center top; @@ -3711,7 +3833,7 @@ scrolledwindow overshoot.top { border: none; box-shadow: none; } scrolledwindow overshoot.top:backdrop { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#b3b3ac), to(rgba(179, 179, 172, 0))); + background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, to(#c0c0bd), to(rgba(192, 192, 189, 0))); background-size: 100% 5%; background-repeat: no-repeat; background-position: center top; @@ -3719,7 +3841,7 @@ scrolledwindow overshoot.top { border: none; box-shadow: none; } scrolledwindow overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#949489), to(rgba(148, 148, 137, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#9d9d99), to(rgba(157, 157, 153, 0))), -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); background-size: 100% 5%, 100% 100%; background-repeat: no-repeat; background-position: center bottom; @@ -3727,7 +3849,7 @@ scrolledwindow overshoot.bottom { border: none; box-shadow: none; } scrolledwindow overshoot.bottom:backdrop { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#b3b3ac), to(rgba(179, 179, 172, 0))); + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, to(#c0c0bd), to(rgba(192, 192, 189, 0))); background-size: 100% 5%; background-repeat: no-repeat; background-position: center bottom; @@ -3735,7 +3857,7 @@ scrolledwindow overshoot.bottom { border: none; box-shadow: none; } scrolledwindow overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#949489), to(rgba(148, 148, 137, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); + background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#9d9d99), to(rgba(157, 157, 153, 0))), -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); background-size: 5% 100%, 100% 100%; background-repeat: no-repeat; background-position: left center; @@ -3743,7 +3865,7 @@ scrolledwindow overshoot.left { border: none; box-shadow: none; } scrolledwindow overshoot.left:backdrop { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#b3b3ac), to(rgba(179, 179, 172, 0))); + background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, to(#c0c0bd), to(rgba(192, 192, 189, 0))); background-size: 5% 100%; background-repeat: no-repeat; background-position: left center; @@ -3751,7 +3873,7 @@ scrolledwindow overshoot.left { border: none; box-shadow: none; } scrolledwindow overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#949489), to(rgba(148, 148, 137, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); + background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#9d9d99), to(rgba(157, 157, 153, 0))), -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(46, 52, 54, 0.07)), to(rgba(46, 52, 54, 0))); background-size: 5% 100%, 100% 100%; background-repeat: no-repeat; background-position: right center; @@ -3759,7 +3881,7 @@ scrolledwindow overshoot.right { border: none; box-shadow: none; } scrolledwindow overshoot.right:backdrop { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#b3b3ac), to(rgba(179, 179, 172, 0))); + background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, to(#c0c0bd), to(rgba(192, 192, 189, 0))); background-size: 5% 100%; background-repeat: no-repeat; background-position: right center; @@ -3808,13 +3930,13 @@ scrolledwindow undershoot.right { box-shadow: none; } scrolledwindow junction { border-color: transparent; - border-image: linear-gradient(to bottom, #acaca4 1px, transparent 1px) 0 0 0 1/0 1px stretch; - background-color: #cdcece; } + border-image: linear-gradient(to bottom, #b6b6b3 1px, transparent 1px) 0 0 0 1/0 1px stretch; + background-color: #c3c4c4; } scrolledwindow junction:dir(rtl) { border-image-slice: 0 1 0 0; } scrolledwindow junction:backdrop { - border-image-source: linear-gradient(to bottom, #b3b3ac 1px, transparent 1px); - background-color: #eeeeec; + border-image-source: linear-gradient(to bottom, #c0c0bd 1px, transparent 1px); + background-color: #e1e1df; transition: 200ms ease-out; } separator { @@ -3828,10 +3950,10 @@ separator { list { color: black; background-color: #ffffff; - border-color: #acaca4; } + border-color: #b6b6b3; } list:backdrop { background-color: #fcfcfc; - border-color: #b3b3ac; } + border-color: #c0c0bd; } list row { padding: 2px; } @@ -3861,7 +3983,7 @@ row { .app-notification.frame { padding: 10px; border-radius: 0 0 5px 5px; - background-color: rgba(32, 37, 38, 0.8); + background-color: rgba(28, 31, 32, 0.7); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px); background-clip: padding-box; } .app-notification:backdrop, @@ -3891,7 +4013,7 @@ expander arrow { ***********/ calendar { color: black; - border: 1px solid #acaca4; } + border: 1px solid #b6b6b3; } calendar:selected { border-radius: 3px; } calendar.header { @@ -3903,16 +4025,16 @@ calendar { calendar.button:hover { color: #2e3436; } calendar.button:backdrop { - color: rgba(146, 149, 149, 0.45); } + color: rgba(139, 142, 143, 0.45); } calendar.button:disabled { - color: rgba(146, 149, 149, 0.45); } + color: rgba(139, 142, 143, 0.45); } calendar.highlight { - color: #929595; } + color: #8b8e8f; } calendar.highlight:backdrop { - color: #d1d1cc; } + color: #c3c3c0; } calendar:backdrop { color: #323232; - border-color: #b3b3ac; } + border-color: #c0c0bd; } calendar:indeterminate { color: alpha(currentColor,0.1); } @@ -3922,7 +4044,7 @@ calendar { messagedialog .titlebar { min-height: 16px; background-image: none; - background-color: #f5f5f4; + background-color: #e8e8e7; border-style: none; border-top-left-radius: 4px; border-top-right-radius: 4px; } @@ -3944,11 +4066,11 @@ messagedialog.csd .dialog-action-area button { -gtk-outline-bottom-right-radius: 3px; } filechooser .dialog-action-box { - border-top: 1px solid #acaca4; } + border-top: 1px solid #b6b6b3; } filechooser .dialog-action-box:backdrop { - border-top-color: #b3b3ac; } + border-top-color: #c0c0bd; } filechooser #pathbarbox { - border-bottom: 1px solid #f5f5f4; } + border-bottom: 1px solid #e8e8e7; } filechooserbutton:drop(active) { box-shadow: none; @@ -3959,18 +4081,18 @@ filechooserbutton:drop(active) { ***********/ .sidebar { border-style: none; - background-color: #fafafa; } + background-color: #f4f4f3; } stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) { - border-right: 1px solid #acaca4; + border-right: 1px solid #b6b6b3; border-left-style: none; } stacksidebar.sidebar:dir(rtl) list .sidebar:dir(rtl), stacksidebar.sidebar.right list .sidebar:dir(rtl), .sidebar.right { - border-left: 1px solid #acaca4; + border-left: 1px solid #b6b6b3; border-right-style: none; } .sidebar:backdrop { - background-color: #f9f9f8; - border-color: #b3b3ac; + background-color: #f2f2f2; + border-color: #c0c0bd; transition: 200ms ease-out; } .sidebar list { background-color: transparent; } @@ -3998,13 +4120,13 @@ placessidebar row { placessidebar row:selected { color: #ffffff; } placessidebar row:disabled { - color: #929595; } + color: #8b8e8f; } placessidebar row:backdrop { - color: #929595; } + color: #8b8e8f; } placessidebar row:backdrop:selected { color: #fcfcfc; } placessidebar row:backdrop:disabled { - color: #d1d1cc; } + color: #c3c3c0; } placessidebar row image.sidebar-icon { opacity: 0.7; } placessidebar row image.sidebar-icon:dir(ltr) { @@ -4062,21 +4184,21 @@ paned > separator { -gtk-icon-source: none; border-style: none; background-color: transparent; - background-image: image(#acaca4); + background-image: image(#b6b6b3); background-size: 1px 1px; } paned > separator:selected { background-image: image(#4a90d9); } paned > separator:backdrop { - background-image: image(#b3b3ac); } + background-image: image(#c0c0bd); } paned > separator.wide { min-width: 5px; min-height: 5px; - background-color: #f5f5f4; - background-image: image(#acaca4), image(#acaca4); + background-color: #e8e8e7; + background-image: image(#b6b6b3), image(#b6b6b3); background-size: 1px 1px, 1px 1px; } paned > separator.wide:backdrop { - background-color: #f5f5f4; - background-image: image(#b3b3ac), image(#b3b3ac); } + background-color: #e8e8e7; + background-image: image(#c0c0bd), image(#c0c0bd); } paned.horizontal > separator { background-repeat: repeat-y; } paned.horizontal > separator:dir(ltr) { @@ -4120,7 +4242,8 @@ infobar { infobar.info button, infobar.question button, infobar.warning button, infobar.error button { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; + border-color: #215d9c; + border-bottom-color: #184472; background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6); text-shadow: 0 -1px rgba(0, 0, 0, 0.54353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353); @@ -4128,22 +4251,23 @@ infobar { infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); + border-color: #215d9c; + border-bottom-color: #184472; text-shadow: 0 -1px rgba(0, 0, 0, 0.49553); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553); - box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); + background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5); } infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #1c5187; - background-image: linear-gradient(to bottom, #276fba, #3583d5); - text-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353); - box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6); } + border-color: #215d9c; + background-image: image(#3180d4); + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; } infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { - border-color: #1c5187; - background-image: linear-gradient(to bottom, #65a1df); + border-color: #215d9c; + background-image: image(#65a1df); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } @@ -4151,20 +4275,20 @@ infobar { color: #b2d0ef; } infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop { border-color: #4a90d9; - background-image: linear-gradient(to bottom, #4a90d9); + background-image: image(#4a90d9); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #1c5187; } + border-color: #215d9c; } infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop { color: #dbe9f7; } infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled { border-color: #65a1df; - background-image: linear-gradient(to bottom, #65a1df); + background-image: image(#65a1df); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); - border-color: #1c5187; } + border-color: #215d9c; } infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled label, infobar.error button:backdrop:disabled { color: #9bc2ea; } infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { @@ -4193,7 +4317,7 @@ tooltip { /***************** * Color Chooser * *****************/ -colorswatch, colorswatch:drop(active) { +colorswatch:drop(active), colorswatch { border-style: none; } colorswatch.top { border-top-left-radius: 5.5px; @@ -4240,10 +4364,9 @@ colorswatch:drop(active) { 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; } @@ -4254,27 +4377,29 @@ colorswatch#add-color-button { colorswatch#add-color-button overlay { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, #f5f5f4, #ebebe9 60%, #ddddd9); + 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 white; } + box-shadow: inset 0 1px rgba(255, 255, 255, 0.8); } colorswatch#add-color-button overlay:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); - border-color: #acaca4; - background-image: linear-gradient(to bottom, white, #f5f5f4 60%, #ebebe9); + 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; } + box-shadow: inset 0 1px white; + background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd); } colorswatch#add-color-button overlay:backdrop { - border-color: #b3b3ac; - background-image: linear-gradient(to bottom, #f5f5f4); + border-color: #c0c0bd; + background-image: image(#e8e8e7); text-shadow: none; -gtk-icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } colorswatch#add-color-button overlay:backdrop label, colorswatch#add-color-button overlay:backdrop { - color: #929595; } + color: #8b8e8f; } colorswatch:disabled { opacity: 0.5; } colorswatch:disabled overlay { @@ -4294,11 +4419,11 @@ colorchooser .popover.osd { * Misc * ********/ .content-view { - background-color: #e4e4e1; } + background-color: #d7d7d5; } .content-view:hover { -gtk-icon-effect: highlight; } .content-view:backdrop { - background-color: #e4e4e1; } + background-color: #d7d7d5; } .osd .scale-popup button.flat { border-style: none; @@ -4334,11 +4459,14 @@ decoration { border-radius: 4px; 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: 2px; + background-color: #b6b6b3; + border: solid 1px #b6b6b3; border-radius: 0; - margin: 2px; - background-color: #f5f5f4; - border: solid 1px #b3b3ac; - 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); @@ -4363,8 +4491,7 @@ iconview text:selected, 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, @@ -4376,11 +4503,9 @@ popover.background radiobutton:selected, 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, @@ -4388,8 +4513,7 @@ popover.background radiobutton:selected, 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, @@ -4399,8 +4523,7 @@ popover.background radiobutton:selected, 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, @@ -4408,13 +4531,12 @@ popover.background radiobutton:selected, 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 * @@ -4452,12 +4574,6 @@ cursor-handle { .context-menu { font: initial; } -button.circular { - border-radius: 20px; - -gtk-outline-radius: 20px; } - button.circular label { - padding: 0; } - .keycap { min-width: 20px; min-height: 25px; @@ -4468,23 +4584,23 @@ button.circular { color: #2e3436; background-color: #ffffff; border: 1px solid; - border-color: #d1d1cc; + border-color: #cfcfcd; border-radius: 5px; - box-shadow: inset 0 -3px #f7f7f6; + box-shadow: inset 0 -3px #ededec; font-size: smaller; } .keycap:backdrop { background-color: #fcfcfc; - color: #929595; + color: #8b8e8f; transition: 200ms ease-out; } -*:drop(active):focus, -*:drop(active) { +: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: 60px; - min-height: 16px; } + min-width: 60px; } stackswitcher button.circular, stackswitcher button.text-button.circular { @@ -4503,7 +4619,7 @@ text color for entries, views and content in general */ @define-color theme_text_color black; /* widget base background color */ -@define-color theme_bg_color #f5f5f4; +@define-color theme_bg_color #e8e8e7; /* text widgets and the like base background color */ @define-color theme_base_color #ffffff; @@ -4515,22 +4631,22 @@ text/foreground color of selections */ @define-color theme_selected_fg_color #ffffff; /* base background color of insensitive widgets */ -@define-color insensitive_bg_color #f9f9f8; +@define-color insensitive_bg_color #f1f1f1; /* text foreground color of insensitive widgets */ -@define-color insensitive_fg_color #929595; +@define-color insensitive_fg_color #8b8e8f; /* insensitive text widgets and the like base background color */ @define-color insensitive_base_color #ffffff; /* widget text/foreground color on backdrop windows */ -@define-color theme_unfocused_fg_color #929595; +@define-color theme_unfocused_fg_color #8b8e8f; /* text color for entries, views and content in general on backdrop windows */ @define-color theme_unfocused_text_color black; /* widget base background color on backdrop windows */ -@define-color theme_unfocused_bg_color #f5f5f4; +@define-color theme_unfocused_bg_color #e8e8e7; /* text widgets and the like base background color on backdrop windows */ @define-color theme_unfocused_base_color #fcfcfc; @@ -4541,11 +4657,14 @@ base background color of selections on backdrop windows */ text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #ffffff; /* +insensitive color on backdrop windows*/ +@define-color unfocused_insensitive_color #c3c3c0; +/* widgets main borders color */ -@define-color borders #acaca4; +@define-color borders #b6b6b3; /* widgets main borders color on backdrop windows */ -@define-color unfocused_borders #b3b3ac; +@define-color unfocused_borders #c0c0bd; /* these are pretty self explicative */ @define-color warning_color #f57900; @@ -4555,16 +4674,16 @@ these are pretty self explicative */ these colors are exported for the window manager and shouldn't be used in applications, read if you used those and something break with a version upgrade you're on your own... */ @define-color wm_title shade(#2e3436, 1.8); -@define-color wm_unfocused_title #929595; +@define-color wm_unfocused_title #8b8e8f; @define-color wm_highlight rgba(255, 255, 255, 0.8); @define-color wm_borders_edge rgba(255, 255, 255, 0.8); -@define-color wm_bg_a shade(#f5f5f4, 1.2); -@define-color wm_bg_b #f5f5f4; +@define-color wm_bg_a shade(#e8e8e7, 1.2); +@define-color wm_bg_b #e8e8e7; @define-color wm_shadow alpha(black, 0.35); @define-color wm_border alpha(black, 0.18); -@define-color wm_button_hover_color_a shade(#f5f5f4, 1.3); -@define-color wm_button_hover_color_b #f5f5f4; -@define-color wm_button_active_color_a shade(#f5f5f4, 0.85); -@define-color wm_button_active_color_b shade(#f5f5f4, 0.89); -@define-color wm_button_active_color_c shade(#f5f5f4, 0.9); +@define-color wm_button_hover_color_a shade(#e8e8e7, 1.3); +@define-color wm_button_hover_color_b #e8e8e7; +@define-color wm_button_active_color_a shade(#e8e8e7, 0.85); +@define-color wm_button_active_color_b shade(#e8e8e7, 0.89); +@define-color wm_button_active_color_c shade(#e8e8e7, 0.9); @define-color content_view_bg #ffffff; diff --git a/gtk-3.0/parse-sass.sh b/gtk-3.0/parse-sass.sh index 10e1142..a25cca4 100755 --- a/gtk-3.0/parse-sass.sh +++ b/gtk-3.0/parse-sass.sh @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/sh #bundle exec sass --update --sourcemap=none . scss --update --sourcemap=none .