From 9ba6f63059f63d40ed7bcc0e50dee370fbbeba54 Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Mon, 2 May 2016 14:04:40 -0400 Subject: [PATCH] a few fixes --- Paper/gtk-3.16/gtk-dark.css | 273 +++++++-------------- Paper/gtk-3.16/gtk.css | 273 +++++++-------------- Paper/gtk-3.16/widgets/_checks-radios.scss | 30 +-- Paper/gtk-3.16/widgets/_toolbars.scss | 44 +++- Paper/gtk-3.18/gtk-dark.css | 273 +++++++-------------- Paper/gtk-3.18/gtk.css | 273 +++++++-------------- Paper/gtk-3.18/widgets/_checks-radios.scss | 30 +-- Paper/gtk-3.18/widgets/_toolbars.scss | 44 +++- Paper/gtk-3.20/gtk-dark.css | 172 ++++++------- Paper/gtk-3.20/gtk.css | 172 ++++++------- Paper/gtk-3.20/widgets/_checks-radios.scss | 44 ++-- 11 files changed, 672 insertions(+), 956 deletions(-) diff --git a/Paper/gtk-3.16/gtk-dark.css b/Paper/gtk-3.16/gtk-dark.css index 27207b2..7a223ac 100644 --- a/Paper/gtk-3.16/gtk-dark.css +++ b/Paper/gtk-3.16/gtk-dark.css @@ -1448,43 +1448,43 @@ GtkCalendar { icon-shadow: none; } .check:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-hover-dark.png"), url("../assets/selected-checkbox-unchecked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-hover-dark.png"), url("../assets/selected-radio-unchecked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-active-dark.png"), url("../assets/selected-checkbox-unchecked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-active-dark.png"), url("../assets/selected-radio-unchecked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop-dark.png"), url("../assets/selected-checkbox-unchecked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop-dark.png"), url("../assets/selected-radio-unchecked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-dark.png"), url("../assets/selected-checkbox-unchecked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-dark.png"), url("../assets/selected-radio-unchecked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-unchecked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-backdrop-dark.png"), url("../assets/selected-radio-unchecked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:checked:selected { @@ -1496,43 +1496,43 @@ GtkCalendar { icon-shadow: none; } .check:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-hover-dark.png"), url("../assets/selected-checkbox-checked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-hover-dark.png"), url("../assets/selected-radio-checked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-active-dark.png"), url("../assets/selected-checkbox-checked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-active-dark.png"), url("../assets/selected-radio-checked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-backdrop-dark.png"), url("../assets/selected-checkbox-checked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-backdrop-dark.png"), url("../assets/selected-radio-checked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-dark.png"), url("../assets/selected-checkbox-checked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-dark.png"), url("../assets/selected-radio-checked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-checked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-backdrop-dark.png"), url("../assets/selected-radio-checked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:inconsistent:selected { @@ -1544,43 +1544,43 @@ GtkCalendar { icon-shadow: none; } .check:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-hover-dark.png"), url("../assets/selected-checkbox-mixed-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-hover-dark.png"), url("../assets/selected-radio-mixed-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-active-dark.png"), url("../assets/selected-checkbox-mixed-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-active-dark.png"), url("../assets/selected-radio-mixed-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-backdrop-dark.png"), url("../assets/selected-checkbox-mixed-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-backdrop-dark.png"), url("../assets/selected-radio-mixed-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-dark.png"), url("../assets/selected-checkbox-mixed-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-dark.png"), url("../assets/selected-radio-mixed-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-mixed-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-backdrop-dark.png"), url("../assets/selected-radio-mixed-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .view.content-view.check, GtkIconView.content-view.check { @@ -4409,183 +4409,100 @@ searchbar, .search-bar:backdrop, .location-bar:backdrop, .inline-toolbar:backdrop { background-color: #434b4e; } - searchbar button, - .search-bar button, .location-bar button, searchbar .button, - .search-bar .button, - .location-bar .button, - searchbar .flat, - .search-bar .flat, - .location-bar .flat, - searchbar .text-button, - .search-bar .text-button, - .location-bar .text-button, - searchbar .image-button, - .search-bar .image-button, - .location-bar .image-button, - .inline-toolbar button, - .inline-toolbar .button, - .inline-toolbar .flat, - .inline-toolbar .text-button, - .inline-toolbar .image-button { - border: none; - background: none; - text-shadow: none; - box-shadow: none; + .search-bar .button, .location-bar .button, + .inline-toolbar .button { background-color: transparent; - color: #bcc1c3; + background-image: none; border-radius: 0px; - padding: 10px; } - searchbar button:focus, - .search-bar button:focus, .location-bar button:focus, searchbar button:active, - .search-bar button:active, .location-bar button:active, + border: none; + box-shadow: none; + icon-shadow: none; + margin: 0; + padding: 10px; + text-shadow: none; } + searchbar .button.suggested-action, + .search-bar .button.suggested-action, .location-bar .button.suggested-action, searchbar .button.text-button, + .search-bar .button.text-button, .location-bar .button.text-button, searchbar .button.menu-button, + .search-bar .button.menu-button, .location-bar .button.menu-button, searchbar .button.image-button, + .search-bar .button.image-button, .location-bar .button.image-button, searchbar .button.linked, + .search-bar .button.linked, .location-bar .button.linked, searchbar .button.flat, + .search-bar .button.flat, .location-bar .button.flat, + .inline-toolbar .button.suggested-action, + .inline-toolbar .button.text-button, + .inline-toolbar .button.menu-button, + .inline-toolbar .button.image-button, + .inline-toolbar .button.linked, + .inline-toolbar .button.flat { + border: none; + background: none; + text-shadow: none; + box-shadow: none; + background-color: transparent; + color: #bcc1c3; + border-radius: 0px; + padding: 10px; } searchbar .button:focus, - .search-bar .button:focus, - .location-bar .button:focus, - searchbar .button:active, - .search-bar .button:active, - .location-bar .button:active, - searchbar .flat:focus, - .search-bar .flat:focus, - .location-bar .flat:focus, - searchbar .flat:active, - .search-bar .flat:active, - .location-bar .flat:active, - searchbar .text-button:focus, - .search-bar .text-button:focus, - .location-bar .text-button:focus, - searchbar .text-button:active, - .search-bar .text-button:active, - .location-bar .text-button:active, - searchbar .image-button:focus, - .search-bar .image-button:focus, - .location-bar .image-button:focus, - searchbar .image-button:active, - .search-bar .image-button:active, - .location-bar .image-button:active, - .inline-toolbar button:focus, - .inline-toolbar button:active, + .search-bar .button:focus, .location-bar .button:focus, searchbar .button:active, + .search-bar .button:active, .location-bar .button:active, .inline-toolbar .button:focus, - .inline-toolbar .button:active, - .inline-toolbar .flat:focus, - .inline-toolbar .flat:active, - .inline-toolbar .text-button:focus, - .inline-toolbar .text-button:active, - .inline-toolbar .image-button:focus, - .inline-toolbar .image-button:active { + .inline-toolbar .button:active { font: bold; color: #bcc1c3; text-shadow: none; box-shadow: none; background-color: rgba(0, 0, 0, 0.05); } - searchbar button:focus:backdrop, - .search-bar button:focus:backdrop, .location-bar button:focus:backdrop, searchbar button:active:backdrop, - .search-bar button:active:backdrop, .location-bar button:active:backdrop, searchbar .button:focus:backdrop, - .search-bar .button:focus:backdrop, - .location-bar .button:focus:backdrop, - searchbar .button:active:backdrop, - .search-bar .button:active:backdrop, - .location-bar .button:active:backdrop, - searchbar .flat:focus:backdrop, - .search-bar .flat:focus:backdrop, - .location-bar .flat:focus:backdrop, - searchbar .flat:active:backdrop, - .search-bar .flat:active:backdrop, - .location-bar .flat:active:backdrop, - searchbar .text-button:focus:backdrop, - .search-bar .text-button:focus:backdrop, - .location-bar .text-button:focus:backdrop, - searchbar .text-button:active:backdrop, - .search-bar .text-button:active:backdrop, - .location-bar .text-button:active:backdrop, - searchbar .image-button:focus:backdrop, - .search-bar .image-button:focus:backdrop, - .location-bar .image-button:focus:backdrop, - searchbar .image-button:active:backdrop, - .search-bar .image-button:active:backdrop, - .location-bar .image-button:active:backdrop, - .inline-toolbar button:focus:backdrop, - .inline-toolbar button:active:backdrop, + .search-bar .button:focus:backdrop, .location-bar .button:focus:backdrop, searchbar .button:active:backdrop, + .search-bar .button:active:backdrop, .location-bar .button:active:backdrop, .inline-toolbar .button:focus:backdrop, - .inline-toolbar .button:active:backdrop, - .inline-toolbar .flat:focus:backdrop, - .inline-toolbar .flat:active:backdrop, - .inline-toolbar .text-button:focus:backdrop, - .inline-toolbar .text-button:active:backdrop, - .inline-toolbar .image-button:focus:backdrop, - .inline-toolbar .image-button:active:backdrop { + .inline-toolbar .button:active:backdrop { border: none; background-color: transparent; color: #868d90; } - searchbar button:hover, - .search-bar button:hover, .location-bar button:hover, searchbar .button:hover, - .search-bar .button:hover, - .location-bar .button:hover, - searchbar .flat:hover, - .search-bar .flat:hover, - .location-bar .flat:hover, - searchbar .text-button:hover, - .search-bar .text-button:hover, - .location-bar .text-button:hover, - searchbar .image-button:hover, - .search-bar .image-button:hover, - .location-bar .image-button:hover, - .inline-toolbar button:hover, - .inline-toolbar .button:hover, - .inline-toolbar .flat:hover, - .inline-toolbar .text-button:hover, - .inline-toolbar .image-button:hover { + .search-bar .button:hover, .location-bar .button:hover, + .inline-toolbar .button:hover { background-color: rgba(0, 0, 0, 0.05); text-shadow: none; color: #bcc1c3; box-shadow: none; } - searchbar button:insensitive, - .search-bar button:insensitive, .location-bar button:insensitive, searchbar .button:insensitive, - .search-bar .button:insensitive, - .location-bar .button:insensitive, - searchbar .flat:insensitive, - .search-bar .flat:insensitive, - .location-bar .flat:insensitive, - searchbar .text-button:insensitive, - .search-bar .text-button:insensitive, - .location-bar .text-button:insensitive, - searchbar .image-button:insensitive, - .search-bar .image-button:insensitive, - .location-bar .image-button:insensitive, - .inline-toolbar button:insensitive, - .inline-toolbar .button:insensitive, - .inline-toolbar .flat:insensitive, - .inline-toolbar .text-button:insensitive, - .inline-toolbar .image-button:insensitive { + .search-bar .button:insensitive, .location-bar .button:insensitive, + .inline-toolbar .button:insensitive { background: none; background-color: transparent; color: rgba(188, 193, 195, 0.5); } - searchbar button:backdrop, - .search-bar button:backdrop, .location-bar button:backdrop, searchbar .button:backdrop, - .search-bar .button:backdrop, - .location-bar .button:backdrop, - searchbar .flat:backdrop, - .search-bar .flat:backdrop, - .location-bar .flat:backdrop, - searchbar .text-button:backdrop, - .search-bar .text-button:backdrop, - .location-bar .text-button:backdrop, - searchbar .image-button:backdrop, - .search-bar .image-button:backdrop, - .location-bar .image-button:backdrop, - .inline-toolbar button:backdrop, - .inline-toolbar .button:backdrop, - .inline-toolbar .flat:backdrop, - .inline-toolbar .text-button:backdrop, - .inline-toolbar .image-button:backdrop { + .search-bar .button:backdrop, .location-bar .button:backdrop, + .inline-toolbar .button:backdrop { border: none; background: none; background-color: transparent; color: #868d90; } + searchbar .button GtkLabel, + .search-bar .button GtkLabel, .location-bar .button GtkLabel, + searchbar .button GtkImage, + .search-bar .button GtkImage, + .location-bar .button GtkImage, + .inline-toolbar .button GtkLabel, + .inline-toolbar .button GtkImage { + color: #bcc1c3; } + searchbar .button GtkLabel:insensitive, + .search-bar .button GtkLabel:insensitive, .location-bar .button GtkLabel:insensitive, searchbar .button GtkLabel:backdrop, + .search-bar .button GtkLabel:backdrop, .location-bar .button GtkLabel:backdrop, + searchbar .button GtkImage:insensitive, + .search-bar .button GtkImage:insensitive, + .location-bar .button GtkImage:insensitive, + searchbar .button GtkImage:backdrop, + .search-bar .button GtkImage:backdrop, + .location-bar .button GtkImage:backdrop, + .inline-toolbar .button GtkLabel:insensitive, + .inline-toolbar .button GtkLabel:backdrop, + .inline-toolbar .button GtkImage:insensitive, + .inline-toolbar .button GtkImage:backdrop { + color: #868d90; + -gtk-image-effect: dim; } searchbar .entry, .search-bar .entry, .location-bar .entry, searchbar entry, diff --git a/Paper/gtk-3.16/gtk.css b/Paper/gtk-3.16/gtk.css index 2213620..278c65d 100644 --- a/Paper/gtk-3.16/gtk.css +++ b/Paper/gtk-3.16/gtk.css @@ -1456,43 +1456,43 @@ GtkCalendar { icon-shadow: none; } .check:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-hover.png"), url("../assets/selected-checkbox-unchecked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-hover.png"), url("../assets/selected-radio-unchecked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-active.png"), url("../assets/selected-checkbox-unchecked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-active.png"), url("../assets/selected-radio-unchecked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop.png"), url("../assets/selected-checkbox-unchecked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop.png"), url("../assets/selected-radio-unchecked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive.png"), url("../assets/selected-checkbox-unchecked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive.png"), url("../assets/selected-radio-unchecked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-backdrop.png"), url("../assets/selected-checkbox-unchecked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-backdrop.png"), url("../assets/selected-radio-unchecked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:checked:selected { @@ -1504,43 +1504,43 @@ GtkCalendar { icon-shadow: none; } .check:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-hover.png"), url("../assets/selected-checkbox-checked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-hover.png"), url("../assets/selected-radio-checked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-active.png"), url("../assets/selected-checkbox-checked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-active.png"), url("../assets/selected-radio-checked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-backdrop.png"), url("../assets/selected-checkbox-checked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-backdrop.png"), url("../assets/selected-radio-checked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive.png"), url("../assets/selected-checkbox-checked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive.png"), url("../assets/selected-radio-checked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-backdrop.png"), url("../assets/selected-checkbox-checked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-backdrop.png"), url("../assets/selected-radio-checked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:inconsistent:selected { @@ -1552,43 +1552,43 @@ GtkCalendar { icon-shadow: none; } .check:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-hover.png"), url("../assets/selected-checkbox-mixed-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-hover.png"), url("../assets/selected-radio-mixed-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-active.png"), url("../assets/selected-checkbox-mixed-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-active.png"), url("../assets/selected-radio-mixed-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-backdrop.png"), url("../assets/selected-checkbox-mixed-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-backdrop.png"), url("../assets/selected-radio-mixed-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive.png"), url("../assets/selected-checkbox-mixed-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive.png"), url("../assets/selected-radio-mixed-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-backdrop.png"), url("../assets/selected-checkbox-mixed-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-backdrop.png"), url("../assets/selected-radio-mixed-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .view.content-view.check, GtkIconView.content-view.check { @@ -4418,183 +4418,100 @@ searchbar, .search-bar:backdrop, .location-bar:backdrop, .inline-toolbar:backdrop { background-color: #eaeaea; } - searchbar button, - .search-bar button, .location-bar button, searchbar .button, - .search-bar .button, - .location-bar .button, - searchbar .flat, - .search-bar .flat, - .location-bar .flat, - searchbar .text-button, - .search-bar .text-button, - .location-bar .text-button, - searchbar .image-button, - .search-bar .image-button, - .location-bar .image-button, - .inline-toolbar button, - .inline-toolbar .button, - .inline-toolbar .flat, - .inline-toolbar .text-button, - .inline-toolbar .image-button { - border: none; - background: none; - text-shadow: none; - box-shadow: none; + .search-bar .button, .location-bar .button, + .inline-toolbar .button { background-color: transparent; - color: #444; + background-image: none; border-radius: 0px; - padding: 10px; } - searchbar button:focus, - .search-bar button:focus, .location-bar button:focus, searchbar button:active, - .search-bar button:active, .location-bar button:active, + border: none; + box-shadow: none; + icon-shadow: none; + margin: 0; + padding: 10px; + text-shadow: none; } + searchbar .button.suggested-action, + .search-bar .button.suggested-action, .location-bar .button.suggested-action, searchbar .button.text-button, + .search-bar .button.text-button, .location-bar .button.text-button, searchbar .button.menu-button, + .search-bar .button.menu-button, .location-bar .button.menu-button, searchbar .button.image-button, + .search-bar .button.image-button, .location-bar .button.image-button, searchbar .button.linked, + .search-bar .button.linked, .location-bar .button.linked, searchbar .button.flat, + .search-bar .button.flat, .location-bar .button.flat, + .inline-toolbar .button.suggested-action, + .inline-toolbar .button.text-button, + .inline-toolbar .button.menu-button, + .inline-toolbar .button.image-button, + .inline-toolbar .button.linked, + .inline-toolbar .button.flat { + border: none; + background: none; + text-shadow: none; + box-shadow: none; + background-color: transparent; + color: #444; + border-radius: 0px; + padding: 10px; } searchbar .button:focus, - .search-bar .button:focus, - .location-bar .button:focus, - searchbar .button:active, - .search-bar .button:active, - .location-bar .button:active, - searchbar .flat:focus, - .search-bar .flat:focus, - .location-bar .flat:focus, - searchbar .flat:active, - .search-bar .flat:active, - .location-bar .flat:active, - searchbar .text-button:focus, - .search-bar .text-button:focus, - .location-bar .text-button:focus, - searchbar .text-button:active, - .search-bar .text-button:active, - .location-bar .text-button:active, - searchbar .image-button:focus, - .search-bar .image-button:focus, - .location-bar .image-button:focus, - searchbar .image-button:active, - .search-bar .image-button:active, - .location-bar .image-button:active, - .inline-toolbar button:focus, - .inline-toolbar button:active, + .search-bar .button:focus, .location-bar .button:focus, searchbar .button:active, + .search-bar .button:active, .location-bar .button:active, .inline-toolbar .button:focus, - .inline-toolbar .button:active, - .inline-toolbar .flat:focus, - .inline-toolbar .flat:active, - .inline-toolbar .text-button:focus, - .inline-toolbar .text-button:active, - .inline-toolbar .image-button:focus, - .inline-toolbar .image-button:active { + .inline-toolbar .button:active { font: bold; color: #444; text-shadow: none; box-shadow: none; background-color: rgba(0, 0, 0, 0.05); } - searchbar button:focus:backdrop, - .search-bar button:focus:backdrop, .location-bar button:focus:backdrop, searchbar button:active:backdrop, - .search-bar button:active:backdrop, .location-bar button:active:backdrop, searchbar .button:focus:backdrop, - .search-bar .button:focus:backdrop, - .location-bar .button:focus:backdrop, - searchbar .button:active:backdrop, - .search-bar .button:active:backdrop, - .location-bar .button:active:backdrop, - searchbar .flat:focus:backdrop, - .search-bar .flat:focus:backdrop, - .location-bar .flat:focus:backdrop, - searchbar .flat:active:backdrop, - .search-bar .flat:active:backdrop, - .location-bar .flat:active:backdrop, - searchbar .text-button:focus:backdrop, - .search-bar .text-button:focus:backdrop, - .location-bar .text-button:focus:backdrop, - searchbar .text-button:active:backdrop, - .search-bar .text-button:active:backdrop, - .location-bar .text-button:active:backdrop, - searchbar .image-button:focus:backdrop, - .search-bar .image-button:focus:backdrop, - .location-bar .image-button:focus:backdrop, - searchbar .image-button:active:backdrop, - .search-bar .image-button:active:backdrop, - .location-bar .image-button:active:backdrop, - .inline-toolbar button:focus:backdrop, - .inline-toolbar button:active:backdrop, + .search-bar .button:focus:backdrop, .location-bar .button:focus:backdrop, searchbar .button:active:backdrop, + .search-bar .button:active:backdrop, .location-bar .button:active:backdrop, .inline-toolbar .button:focus:backdrop, - .inline-toolbar .button:active:backdrop, - .inline-toolbar .flat:focus:backdrop, - .inline-toolbar .flat:active:backdrop, - .inline-toolbar .text-button:focus:backdrop, - .inline-toolbar .text-button:active:backdrop, - .inline-toolbar .image-button:focus:backdrop, - .inline-toolbar .image-button:active:backdrop { + .inline-toolbar .button:active:backdrop { border: none; background-color: transparent; color: #9e9e9e; } - searchbar button:hover, - .search-bar button:hover, .location-bar button:hover, searchbar .button:hover, - .search-bar .button:hover, - .location-bar .button:hover, - searchbar .flat:hover, - .search-bar .flat:hover, - .location-bar .flat:hover, - searchbar .text-button:hover, - .search-bar .text-button:hover, - .location-bar .text-button:hover, - searchbar .image-button:hover, - .search-bar .image-button:hover, - .location-bar .image-button:hover, - .inline-toolbar button:hover, - .inline-toolbar .button:hover, - .inline-toolbar .flat:hover, - .inline-toolbar .text-button:hover, - .inline-toolbar .image-button:hover { + .search-bar .button:hover, .location-bar .button:hover, + .inline-toolbar .button:hover { background-color: rgba(0, 0, 0, 0.05); text-shadow: none; color: #444; box-shadow: none; } - searchbar button:insensitive, - .search-bar button:insensitive, .location-bar button:insensitive, searchbar .button:insensitive, - .search-bar .button:insensitive, - .location-bar .button:insensitive, - searchbar .flat:insensitive, - .search-bar .flat:insensitive, - .location-bar .flat:insensitive, - searchbar .text-button:insensitive, - .search-bar .text-button:insensitive, - .location-bar .text-button:insensitive, - searchbar .image-button:insensitive, - .search-bar .image-button:insensitive, - .location-bar .image-button:insensitive, - .inline-toolbar button:insensitive, - .inline-toolbar .button:insensitive, - .inline-toolbar .flat:insensitive, - .inline-toolbar .text-button:insensitive, - .inline-toolbar .image-button:insensitive { + .search-bar .button:insensitive, .location-bar .button:insensitive, + .inline-toolbar .button:insensitive { background: none; background-color: transparent; color: rgba(68, 68, 68, 0.5); } - searchbar button:backdrop, - .search-bar button:backdrop, .location-bar button:backdrop, searchbar .button:backdrop, - .search-bar .button:backdrop, - .location-bar .button:backdrop, - searchbar .flat:backdrop, - .search-bar .flat:backdrop, - .location-bar .flat:backdrop, - searchbar .text-button:backdrop, - .search-bar .text-button:backdrop, - .location-bar .text-button:backdrop, - searchbar .image-button:backdrop, - .search-bar .image-button:backdrop, - .location-bar .image-button:backdrop, - .inline-toolbar button:backdrop, - .inline-toolbar .button:backdrop, - .inline-toolbar .flat:backdrop, - .inline-toolbar .text-button:backdrop, - .inline-toolbar .image-button:backdrop { + .search-bar .button:backdrop, .location-bar .button:backdrop, + .inline-toolbar .button:backdrop { border: none; background: none; background-color: transparent; color: #9e9e9e; } + searchbar .button GtkLabel, + .search-bar .button GtkLabel, .location-bar .button GtkLabel, + searchbar .button GtkImage, + .search-bar .button GtkImage, + .location-bar .button GtkImage, + .inline-toolbar .button GtkLabel, + .inline-toolbar .button GtkImage { + color: #444; } + searchbar .button GtkLabel:insensitive, + .search-bar .button GtkLabel:insensitive, .location-bar .button GtkLabel:insensitive, searchbar .button GtkLabel:backdrop, + .search-bar .button GtkLabel:backdrop, .location-bar .button GtkLabel:backdrop, + searchbar .button GtkImage:insensitive, + .search-bar .button GtkImage:insensitive, + .location-bar .button GtkImage:insensitive, + searchbar .button GtkImage:backdrop, + .search-bar .button GtkImage:backdrop, + .location-bar .button GtkImage:backdrop, + .inline-toolbar .button GtkLabel:insensitive, + .inline-toolbar .button GtkLabel:backdrop, + .inline-toolbar .button GtkImage:insensitive, + .inline-toolbar .button GtkImage:backdrop { + color: #9e9e9e; + -gtk-image-effect: dim; } searchbar .entry, .search-bar .entry, .location-bar .entry, searchbar entry, diff --git a/Paper/gtk-3.16/widgets/_checks-radios.scss b/Paper/gtk-3.16/widgets/_checks-radios.scss index 65f2699..0029120 100644 --- a/Paper/gtk-3.16/widgets/_checks-radios.scss +++ b/Paper/gtk-3.16/widgets/_checks-radios.scss @@ -58,11 +58,11 @@ // unchecked:selected @each $s,$un in (':selected','-unchecked'), - (':hover:selected', '-unchecked-hover'), - (':active:selected', '-unchecked-active'), - (':backdrop:selected', '-unchecked-backdrop'), - (':insensitive:selected', '-unchecked-insensitive'), - (':insensitive:backdrop:selected', '-unchecked-insensitive-backdrop') { + (':hover:selected', '-unchecked'), + (':active:selected', '-unchecked'), + (':backdrop:selected', '-unchecked'), + (':insensitive:selected', '-unchecked'), + (':insensitive:backdrop:selected', '-unchecked') { .check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$un}.png"),url("../assets/selected-checkbox#{$un}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$un}-dark.png"),url("../assets/selected-checkbox#{$un}-dark@2.png"))); icon-shadow: none; @@ -75,11 +75,11 @@ // checked:selected @each $s,$ch in (':checked:selected', '-checked'), - (':checked:hover:selected', '-checked-hover'), - (':checked:active:selected', '-checked-active'), - (':checked:backdrop:selected', '-checked-backdrop'), - (':checked:insensitive:selected', '-checked-insensitive'), - (':checked:insensitive:backdrop:selected', '-checked-insensitive-backdrop') { + (':checked:hover:selected', '-checked'), + (':checked:active:selected', '-checked'), + (':checked:backdrop:selected', '-checked'), + (':checked:insensitive:selected', '-checked'), + (':checked:insensitive:backdrop:selected', '-checked') { .check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$ch}.png"),url("../assets/selected-checkbox#{$ch}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$ch}-dark.png"),url("../assets/selected-checkbox#{$ch}-dark@2.png"))); icon-shadow: none; @@ -93,11 +93,11 @@ // mixed:selected @each $s,$mx in (':inconsistent:selected', '-mixed'), - (':inconsistent:hover:selected', '-mixed-hover'), - (':inconsistent:active:selected', '-mixed-active'), - (':inconsistent:backdrop:selected', '-mixed-backdrop'), - (':inconsistent:insensitive:selected', '-mixed-insensitive'), - (':inconsistent:insensitive:backdrop:selected', '-mixed-insensitive-backdrop') { + (':inconsistent:hover:selected', '-mixed'), + (':inconsistent:active:selected', '-mixed'), + (':inconsistent:backdrop:selected', '-mixed'), + (':inconsistent:insensitive:selected', '-mixed'), + (':inconsistent:insensitive:backdrop:selected', '-mixed') { .check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$mx}.png"),url("../assets/selected-checkbox#{$mx}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$mx}-dark.png"),url("../assets/selected-checkbox#{$mx}-dark@2.png"))); icon-shadow: none; diff --git a/Paper/gtk-3.16/widgets/_toolbars.scss b/Paper/gtk-3.16/widgets/_toolbars.scss index 7b6b424..cd999d4 100644 --- a/Paper/gtk-3.16/widgets/_toolbars.scss +++ b/Paper/gtk-3.16/widgets/_toolbars.scss @@ -206,19 +206,32 @@ } // buttons - button, - .button, - .flat, - .text-button, - .image-button { - border: none; - background: none; - text-shadow: none; - box-shadow: none; + .button { background-color: transparent; - color: $fg_color; + background-image: none; border-radius: 0px; + border: none; + box-shadow: none; + icon-shadow: none; + margin: 0; padding: 10px; + text-shadow: none; + + &.suggested-action, + &.text-button, + &.menu-button, + &.image-button, + &.linked, + &.flat { + border: none; + background: none; + text-shadow: none; + box-shadow: none; + background-color: transparent; + color: $fg_color; + border-radius: 0px; + padding: 10px; + } &:focus, &:active { @@ -253,6 +266,17 @@ background:none; background-color: transparent; color: $backdrop_fg_color; + } + + GtkLabel, + GtkImage { + color: $fg_color; + + &:insensitive, + &:backdrop { + color: $backdrop_fg_color; + -gtk-image-effect: dim; + } } } diff --git a/Paper/gtk-3.18/gtk-dark.css b/Paper/gtk-3.18/gtk-dark.css index 27207b2..7a223ac 100644 --- a/Paper/gtk-3.18/gtk-dark.css +++ b/Paper/gtk-3.18/gtk-dark.css @@ -1448,43 +1448,43 @@ GtkCalendar { icon-shadow: none; } .check:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-hover-dark.png"), url("../assets/selected-checkbox-unchecked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-hover-dark.png"), url("../assets/selected-radio-unchecked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-active-dark.png"), url("../assets/selected-checkbox-unchecked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-active-dark.png"), url("../assets/selected-radio-unchecked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop-dark.png"), url("../assets/selected-checkbox-unchecked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop-dark.png"), url("../assets/selected-radio-unchecked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-dark.png"), url("../assets/selected-checkbox-unchecked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-dark.png"), url("../assets/selected-radio-unchecked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-unchecked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); icon-shadow: none; } .radio:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-backdrop-dark.png"), url("../assets/selected-radio-unchecked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); icon-shadow: none; } .check:checked:selected { @@ -1496,43 +1496,43 @@ GtkCalendar { icon-shadow: none; } .check:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-hover-dark.png"), url("../assets/selected-checkbox-checked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-hover-dark.png"), url("../assets/selected-radio-checked-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-active-dark.png"), url("../assets/selected-checkbox-checked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-active-dark.png"), url("../assets/selected-radio-checked-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-backdrop-dark.png"), url("../assets/selected-checkbox-checked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-backdrop-dark.png"), url("../assets/selected-radio-checked-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-dark.png"), url("../assets/selected-checkbox-checked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-dark.png"), url("../assets/selected-radio-checked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-checked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); icon-shadow: none; } .radio:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-backdrop-dark.png"), url("../assets/selected-radio-checked-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); icon-shadow: none; } .check:inconsistent:selected { @@ -1544,43 +1544,43 @@ GtkCalendar { icon-shadow: none; } .check:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-hover-dark.png"), url("../assets/selected-checkbox-mixed-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-hover-dark.png"), url("../assets/selected-radio-mixed-hover-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-active-dark.png"), url("../assets/selected-checkbox-mixed-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-active-dark.png"), url("../assets/selected-radio-mixed-active-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-backdrop-dark.png"), url("../assets/selected-checkbox-mixed-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-backdrop-dark.png"), url("../assets/selected-radio-mixed-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-dark.png"), url("../assets/selected-checkbox-mixed-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-dark.png"), url("../assets/selected-radio-mixed-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-mixed-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-backdrop-dark.png"), url("../assets/selected-radio-mixed-insensitive-backdrop-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); icon-shadow: none; } .view.content-view.check, GtkIconView.content-view.check { @@ -4409,183 +4409,100 @@ searchbar, .search-bar:backdrop, .location-bar:backdrop, .inline-toolbar:backdrop { background-color: #434b4e; } - searchbar button, - .search-bar button, .location-bar button, searchbar .button, - .search-bar .button, - .location-bar .button, - searchbar .flat, - .search-bar .flat, - .location-bar .flat, - searchbar .text-button, - .search-bar .text-button, - .location-bar .text-button, - searchbar .image-button, - .search-bar .image-button, - .location-bar .image-button, - .inline-toolbar button, - .inline-toolbar .button, - .inline-toolbar .flat, - .inline-toolbar .text-button, - .inline-toolbar .image-button { - border: none; - background: none; - text-shadow: none; - box-shadow: none; + .search-bar .button, .location-bar .button, + .inline-toolbar .button { background-color: transparent; - color: #bcc1c3; + background-image: none; border-radius: 0px; - padding: 10px; } - searchbar button:focus, - .search-bar button:focus, .location-bar button:focus, searchbar button:active, - .search-bar button:active, .location-bar button:active, + border: none; + box-shadow: none; + icon-shadow: none; + margin: 0; + padding: 10px; + text-shadow: none; } + searchbar .button.suggested-action, + .search-bar .button.suggested-action, .location-bar .button.suggested-action, searchbar .button.text-button, + .search-bar .button.text-button, .location-bar .button.text-button, searchbar .button.menu-button, + .search-bar .button.menu-button, .location-bar .button.menu-button, searchbar .button.image-button, + .search-bar .button.image-button, .location-bar .button.image-button, searchbar .button.linked, + .search-bar .button.linked, .location-bar .button.linked, searchbar .button.flat, + .search-bar .button.flat, .location-bar .button.flat, + .inline-toolbar .button.suggested-action, + .inline-toolbar .button.text-button, + .inline-toolbar .button.menu-button, + .inline-toolbar .button.image-button, + .inline-toolbar .button.linked, + .inline-toolbar .button.flat { + border: none; + background: none; + text-shadow: none; + box-shadow: none; + background-color: transparent; + color: #bcc1c3; + border-radius: 0px; + padding: 10px; } searchbar .button:focus, - .search-bar .button:focus, - .location-bar .button:focus, - searchbar .button:active, - .search-bar .button:active, - .location-bar .button:active, - searchbar .flat:focus, - .search-bar .flat:focus, - .location-bar .flat:focus, - searchbar .flat:active, - .search-bar .flat:active, - .location-bar .flat:active, - searchbar .text-button:focus, - .search-bar .text-button:focus, - .location-bar .text-button:focus, - searchbar .text-button:active, - .search-bar .text-button:active, - .location-bar .text-button:active, - searchbar .image-button:focus, - .search-bar .image-button:focus, - .location-bar .image-button:focus, - searchbar .image-button:active, - .search-bar .image-button:active, - .location-bar .image-button:active, - .inline-toolbar button:focus, - .inline-toolbar button:active, + .search-bar .button:focus, .location-bar .button:focus, searchbar .button:active, + .search-bar .button:active, .location-bar .button:active, .inline-toolbar .button:focus, - .inline-toolbar .button:active, - .inline-toolbar .flat:focus, - .inline-toolbar .flat:active, - .inline-toolbar .text-button:focus, - .inline-toolbar .text-button:active, - .inline-toolbar .image-button:focus, - .inline-toolbar .image-button:active { + .inline-toolbar .button:active { font: bold; color: #bcc1c3; text-shadow: none; box-shadow: none; background-color: rgba(0, 0, 0, 0.05); } - searchbar button:focus:backdrop, - .search-bar button:focus:backdrop, .location-bar button:focus:backdrop, searchbar button:active:backdrop, - .search-bar button:active:backdrop, .location-bar button:active:backdrop, searchbar .button:focus:backdrop, - .search-bar .button:focus:backdrop, - .location-bar .button:focus:backdrop, - searchbar .button:active:backdrop, - .search-bar .button:active:backdrop, - .location-bar .button:active:backdrop, - searchbar .flat:focus:backdrop, - .search-bar .flat:focus:backdrop, - .location-bar .flat:focus:backdrop, - searchbar .flat:active:backdrop, - .search-bar .flat:active:backdrop, - .location-bar .flat:active:backdrop, - searchbar .text-button:focus:backdrop, - .search-bar .text-button:focus:backdrop, - .location-bar .text-button:focus:backdrop, - searchbar .text-button:active:backdrop, - .search-bar .text-button:active:backdrop, - .location-bar .text-button:active:backdrop, - searchbar .image-button:focus:backdrop, - .search-bar .image-button:focus:backdrop, - .location-bar .image-button:focus:backdrop, - searchbar .image-button:active:backdrop, - .search-bar .image-button:active:backdrop, - .location-bar .image-button:active:backdrop, - .inline-toolbar button:focus:backdrop, - .inline-toolbar button:active:backdrop, + .search-bar .button:focus:backdrop, .location-bar .button:focus:backdrop, searchbar .button:active:backdrop, + .search-bar .button:active:backdrop, .location-bar .button:active:backdrop, .inline-toolbar .button:focus:backdrop, - .inline-toolbar .button:active:backdrop, - .inline-toolbar .flat:focus:backdrop, - .inline-toolbar .flat:active:backdrop, - .inline-toolbar .text-button:focus:backdrop, - .inline-toolbar .text-button:active:backdrop, - .inline-toolbar .image-button:focus:backdrop, - .inline-toolbar .image-button:active:backdrop { + .inline-toolbar .button:active:backdrop { border: none; background-color: transparent; color: #868d90; } - searchbar button:hover, - .search-bar button:hover, .location-bar button:hover, searchbar .button:hover, - .search-bar .button:hover, - .location-bar .button:hover, - searchbar .flat:hover, - .search-bar .flat:hover, - .location-bar .flat:hover, - searchbar .text-button:hover, - .search-bar .text-button:hover, - .location-bar .text-button:hover, - searchbar .image-button:hover, - .search-bar .image-button:hover, - .location-bar .image-button:hover, - .inline-toolbar button:hover, - .inline-toolbar .button:hover, - .inline-toolbar .flat:hover, - .inline-toolbar .text-button:hover, - .inline-toolbar .image-button:hover { + .search-bar .button:hover, .location-bar .button:hover, + .inline-toolbar .button:hover { background-color: rgba(0, 0, 0, 0.05); text-shadow: none; color: #bcc1c3; box-shadow: none; } - searchbar button:insensitive, - .search-bar button:insensitive, .location-bar button:insensitive, searchbar .button:insensitive, - .search-bar .button:insensitive, - .location-bar .button:insensitive, - searchbar .flat:insensitive, - .search-bar .flat:insensitive, - .location-bar .flat:insensitive, - searchbar .text-button:insensitive, - .search-bar .text-button:insensitive, - .location-bar .text-button:insensitive, - searchbar .image-button:insensitive, - .search-bar .image-button:insensitive, - .location-bar .image-button:insensitive, - .inline-toolbar button:insensitive, - .inline-toolbar .button:insensitive, - .inline-toolbar .flat:insensitive, - .inline-toolbar .text-button:insensitive, - .inline-toolbar .image-button:insensitive { + .search-bar .button:insensitive, .location-bar .button:insensitive, + .inline-toolbar .button:insensitive { background: none; background-color: transparent; color: rgba(188, 193, 195, 0.5); } - searchbar button:backdrop, - .search-bar button:backdrop, .location-bar button:backdrop, searchbar .button:backdrop, - .search-bar .button:backdrop, - .location-bar .button:backdrop, - searchbar .flat:backdrop, - .search-bar .flat:backdrop, - .location-bar .flat:backdrop, - searchbar .text-button:backdrop, - .search-bar .text-button:backdrop, - .location-bar .text-button:backdrop, - searchbar .image-button:backdrop, - .search-bar .image-button:backdrop, - .location-bar .image-button:backdrop, - .inline-toolbar button:backdrop, - .inline-toolbar .button:backdrop, - .inline-toolbar .flat:backdrop, - .inline-toolbar .text-button:backdrop, - .inline-toolbar .image-button:backdrop { + .search-bar .button:backdrop, .location-bar .button:backdrop, + .inline-toolbar .button:backdrop { border: none; background: none; background-color: transparent; color: #868d90; } + searchbar .button GtkLabel, + .search-bar .button GtkLabel, .location-bar .button GtkLabel, + searchbar .button GtkImage, + .search-bar .button GtkImage, + .location-bar .button GtkImage, + .inline-toolbar .button GtkLabel, + .inline-toolbar .button GtkImage { + color: #bcc1c3; } + searchbar .button GtkLabel:insensitive, + .search-bar .button GtkLabel:insensitive, .location-bar .button GtkLabel:insensitive, searchbar .button GtkLabel:backdrop, + .search-bar .button GtkLabel:backdrop, .location-bar .button GtkLabel:backdrop, + searchbar .button GtkImage:insensitive, + .search-bar .button GtkImage:insensitive, + .location-bar .button GtkImage:insensitive, + searchbar .button GtkImage:backdrop, + .search-bar .button GtkImage:backdrop, + .location-bar .button GtkImage:backdrop, + .inline-toolbar .button GtkLabel:insensitive, + .inline-toolbar .button GtkLabel:backdrop, + .inline-toolbar .button GtkImage:insensitive, + .inline-toolbar .button GtkImage:backdrop { + color: #868d90; + -gtk-image-effect: dim; } searchbar .entry, .search-bar .entry, .location-bar .entry, searchbar entry, diff --git a/Paper/gtk-3.18/gtk.css b/Paper/gtk-3.18/gtk.css index 2213620..278c65d 100644 --- a/Paper/gtk-3.18/gtk.css +++ b/Paper/gtk-3.18/gtk.css @@ -1456,43 +1456,43 @@ GtkCalendar { icon-shadow: none; } .check:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-hover.png"), url("../assets/selected-checkbox-unchecked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-hover.png"), url("../assets/selected-radio-unchecked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-active.png"), url("../assets/selected-checkbox-unchecked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-active.png"), url("../assets/selected-radio-unchecked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop.png"), url("../assets/selected-checkbox-unchecked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop.png"), url("../assets/selected-radio-unchecked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive.png"), url("../assets/selected-checkbox-unchecked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive.png"), url("../assets/selected-radio-unchecked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-backdrop.png"), url("../assets/selected-checkbox-unchecked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); icon-shadow: none; } .radio:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-backdrop.png"), url("../assets/selected-radio-unchecked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); icon-shadow: none; } .check:checked:selected { @@ -1504,43 +1504,43 @@ GtkCalendar { icon-shadow: none; } .check:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-hover.png"), url("../assets/selected-checkbox-checked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-hover.png"), url("../assets/selected-radio-checked-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-active.png"), url("../assets/selected-checkbox-checked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-active.png"), url("../assets/selected-radio-checked-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-backdrop.png"), url("../assets/selected-checkbox-checked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-backdrop.png"), url("../assets/selected-radio-checked-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive.png"), url("../assets/selected-checkbox-checked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive.png"), url("../assets/selected-radio-checked-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-backdrop.png"), url("../assets/selected-checkbox-checked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); icon-shadow: none; } .radio:checked:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-backdrop.png"), url("../assets/selected-radio-checked-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); icon-shadow: none; } .check:inconsistent:selected { @@ -1552,43 +1552,43 @@ GtkCalendar { icon-shadow: none; } .check:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-hover.png"), url("../assets/selected-checkbox-mixed-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-hover.png"), url("../assets/selected-radio-mixed-hover@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-active.png"), url("../assets/selected-checkbox-mixed-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-active.png"), url("../assets/selected-radio-mixed-active@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-backdrop.png"), url("../assets/selected-checkbox-mixed-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-backdrop.png"), url("../assets/selected-radio-mixed-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive.png"), url("../assets/selected-checkbox-mixed-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive.png"), url("../assets/selected-radio-mixed-insensitive@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .check:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-backdrop.png"), url("../assets/selected-checkbox-mixed-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); icon-shadow: none; } .radio:inconsistent:insensitive:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-backdrop.png"), url("../assets/selected-radio-mixed-insensitive-backdrop@2.png")); + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); icon-shadow: none; } .view.content-view.check, GtkIconView.content-view.check { @@ -4418,183 +4418,100 @@ searchbar, .search-bar:backdrop, .location-bar:backdrop, .inline-toolbar:backdrop { background-color: #eaeaea; } - searchbar button, - .search-bar button, .location-bar button, searchbar .button, - .search-bar .button, - .location-bar .button, - searchbar .flat, - .search-bar .flat, - .location-bar .flat, - searchbar .text-button, - .search-bar .text-button, - .location-bar .text-button, - searchbar .image-button, - .search-bar .image-button, - .location-bar .image-button, - .inline-toolbar button, - .inline-toolbar .button, - .inline-toolbar .flat, - .inline-toolbar .text-button, - .inline-toolbar .image-button { - border: none; - background: none; - text-shadow: none; - box-shadow: none; + .search-bar .button, .location-bar .button, + .inline-toolbar .button { background-color: transparent; - color: #444; + background-image: none; border-radius: 0px; - padding: 10px; } - searchbar button:focus, - .search-bar button:focus, .location-bar button:focus, searchbar button:active, - .search-bar button:active, .location-bar button:active, + border: none; + box-shadow: none; + icon-shadow: none; + margin: 0; + padding: 10px; + text-shadow: none; } + searchbar .button.suggested-action, + .search-bar .button.suggested-action, .location-bar .button.suggested-action, searchbar .button.text-button, + .search-bar .button.text-button, .location-bar .button.text-button, searchbar .button.menu-button, + .search-bar .button.menu-button, .location-bar .button.menu-button, searchbar .button.image-button, + .search-bar .button.image-button, .location-bar .button.image-button, searchbar .button.linked, + .search-bar .button.linked, .location-bar .button.linked, searchbar .button.flat, + .search-bar .button.flat, .location-bar .button.flat, + .inline-toolbar .button.suggested-action, + .inline-toolbar .button.text-button, + .inline-toolbar .button.menu-button, + .inline-toolbar .button.image-button, + .inline-toolbar .button.linked, + .inline-toolbar .button.flat { + border: none; + background: none; + text-shadow: none; + box-shadow: none; + background-color: transparent; + color: #444; + border-radius: 0px; + padding: 10px; } searchbar .button:focus, - .search-bar .button:focus, - .location-bar .button:focus, - searchbar .button:active, - .search-bar .button:active, - .location-bar .button:active, - searchbar .flat:focus, - .search-bar .flat:focus, - .location-bar .flat:focus, - searchbar .flat:active, - .search-bar .flat:active, - .location-bar .flat:active, - searchbar .text-button:focus, - .search-bar .text-button:focus, - .location-bar .text-button:focus, - searchbar .text-button:active, - .search-bar .text-button:active, - .location-bar .text-button:active, - searchbar .image-button:focus, - .search-bar .image-button:focus, - .location-bar .image-button:focus, - searchbar .image-button:active, - .search-bar .image-button:active, - .location-bar .image-button:active, - .inline-toolbar button:focus, - .inline-toolbar button:active, + .search-bar .button:focus, .location-bar .button:focus, searchbar .button:active, + .search-bar .button:active, .location-bar .button:active, .inline-toolbar .button:focus, - .inline-toolbar .button:active, - .inline-toolbar .flat:focus, - .inline-toolbar .flat:active, - .inline-toolbar .text-button:focus, - .inline-toolbar .text-button:active, - .inline-toolbar .image-button:focus, - .inline-toolbar .image-button:active { + .inline-toolbar .button:active { font: bold; color: #444; text-shadow: none; box-shadow: none; background-color: rgba(0, 0, 0, 0.05); } - searchbar button:focus:backdrop, - .search-bar button:focus:backdrop, .location-bar button:focus:backdrop, searchbar button:active:backdrop, - .search-bar button:active:backdrop, .location-bar button:active:backdrop, searchbar .button:focus:backdrop, - .search-bar .button:focus:backdrop, - .location-bar .button:focus:backdrop, - searchbar .button:active:backdrop, - .search-bar .button:active:backdrop, - .location-bar .button:active:backdrop, - searchbar .flat:focus:backdrop, - .search-bar .flat:focus:backdrop, - .location-bar .flat:focus:backdrop, - searchbar .flat:active:backdrop, - .search-bar .flat:active:backdrop, - .location-bar .flat:active:backdrop, - searchbar .text-button:focus:backdrop, - .search-bar .text-button:focus:backdrop, - .location-bar .text-button:focus:backdrop, - searchbar .text-button:active:backdrop, - .search-bar .text-button:active:backdrop, - .location-bar .text-button:active:backdrop, - searchbar .image-button:focus:backdrop, - .search-bar .image-button:focus:backdrop, - .location-bar .image-button:focus:backdrop, - searchbar .image-button:active:backdrop, - .search-bar .image-button:active:backdrop, - .location-bar .image-button:active:backdrop, - .inline-toolbar button:focus:backdrop, - .inline-toolbar button:active:backdrop, + .search-bar .button:focus:backdrop, .location-bar .button:focus:backdrop, searchbar .button:active:backdrop, + .search-bar .button:active:backdrop, .location-bar .button:active:backdrop, .inline-toolbar .button:focus:backdrop, - .inline-toolbar .button:active:backdrop, - .inline-toolbar .flat:focus:backdrop, - .inline-toolbar .flat:active:backdrop, - .inline-toolbar .text-button:focus:backdrop, - .inline-toolbar .text-button:active:backdrop, - .inline-toolbar .image-button:focus:backdrop, - .inline-toolbar .image-button:active:backdrop { + .inline-toolbar .button:active:backdrop { border: none; background-color: transparent; color: #9e9e9e; } - searchbar button:hover, - .search-bar button:hover, .location-bar button:hover, searchbar .button:hover, - .search-bar .button:hover, - .location-bar .button:hover, - searchbar .flat:hover, - .search-bar .flat:hover, - .location-bar .flat:hover, - searchbar .text-button:hover, - .search-bar .text-button:hover, - .location-bar .text-button:hover, - searchbar .image-button:hover, - .search-bar .image-button:hover, - .location-bar .image-button:hover, - .inline-toolbar button:hover, - .inline-toolbar .button:hover, - .inline-toolbar .flat:hover, - .inline-toolbar .text-button:hover, - .inline-toolbar .image-button:hover { + .search-bar .button:hover, .location-bar .button:hover, + .inline-toolbar .button:hover { background-color: rgba(0, 0, 0, 0.05); text-shadow: none; color: #444; box-shadow: none; } - searchbar button:insensitive, - .search-bar button:insensitive, .location-bar button:insensitive, searchbar .button:insensitive, - .search-bar .button:insensitive, - .location-bar .button:insensitive, - searchbar .flat:insensitive, - .search-bar .flat:insensitive, - .location-bar .flat:insensitive, - searchbar .text-button:insensitive, - .search-bar .text-button:insensitive, - .location-bar .text-button:insensitive, - searchbar .image-button:insensitive, - .search-bar .image-button:insensitive, - .location-bar .image-button:insensitive, - .inline-toolbar button:insensitive, - .inline-toolbar .button:insensitive, - .inline-toolbar .flat:insensitive, - .inline-toolbar .text-button:insensitive, - .inline-toolbar .image-button:insensitive { + .search-bar .button:insensitive, .location-bar .button:insensitive, + .inline-toolbar .button:insensitive { background: none; background-color: transparent; color: rgba(68, 68, 68, 0.5); } - searchbar button:backdrop, - .search-bar button:backdrop, .location-bar button:backdrop, searchbar .button:backdrop, - .search-bar .button:backdrop, - .location-bar .button:backdrop, - searchbar .flat:backdrop, - .search-bar .flat:backdrop, - .location-bar .flat:backdrop, - searchbar .text-button:backdrop, - .search-bar .text-button:backdrop, - .location-bar .text-button:backdrop, - searchbar .image-button:backdrop, - .search-bar .image-button:backdrop, - .location-bar .image-button:backdrop, - .inline-toolbar button:backdrop, - .inline-toolbar .button:backdrop, - .inline-toolbar .flat:backdrop, - .inline-toolbar .text-button:backdrop, - .inline-toolbar .image-button:backdrop { + .search-bar .button:backdrop, .location-bar .button:backdrop, + .inline-toolbar .button:backdrop { border: none; background: none; background-color: transparent; color: #9e9e9e; } + searchbar .button GtkLabel, + .search-bar .button GtkLabel, .location-bar .button GtkLabel, + searchbar .button GtkImage, + .search-bar .button GtkImage, + .location-bar .button GtkImage, + .inline-toolbar .button GtkLabel, + .inline-toolbar .button GtkImage { + color: #444; } + searchbar .button GtkLabel:insensitive, + .search-bar .button GtkLabel:insensitive, .location-bar .button GtkLabel:insensitive, searchbar .button GtkLabel:backdrop, + .search-bar .button GtkLabel:backdrop, .location-bar .button GtkLabel:backdrop, + searchbar .button GtkImage:insensitive, + .search-bar .button GtkImage:insensitive, + .location-bar .button GtkImage:insensitive, + searchbar .button GtkImage:backdrop, + .search-bar .button GtkImage:backdrop, + .location-bar .button GtkImage:backdrop, + .inline-toolbar .button GtkLabel:insensitive, + .inline-toolbar .button GtkLabel:backdrop, + .inline-toolbar .button GtkImage:insensitive, + .inline-toolbar .button GtkImage:backdrop { + color: #9e9e9e; + -gtk-image-effect: dim; } searchbar .entry, .search-bar .entry, .location-bar .entry, searchbar entry, diff --git a/Paper/gtk-3.18/widgets/_checks-radios.scss b/Paper/gtk-3.18/widgets/_checks-radios.scss index 65f2699..0029120 100644 --- a/Paper/gtk-3.18/widgets/_checks-radios.scss +++ b/Paper/gtk-3.18/widgets/_checks-radios.scss @@ -58,11 +58,11 @@ // unchecked:selected @each $s,$un in (':selected','-unchecked'), - (':hover:selected', '-unchecked-hover'), - (':active:selected', '-unchecked-active'), - (':backdrop:selected', '-unchecked-backdrop'), - (':insensitive:selected', '-unchecked-insensitive'), - (':insensitive:backdrop:selected', '-unchecked-insensitive-backdrop') { + (':hover:selected', '-unchecked'), + (':active:selected', '-unchecked'), + (':backdrop:selected', '-unchecked'), + (':insensitive:selected', '-unchecked'), + (':insensitive:backdrop:selected', '-unchecked') { .check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$un}.png"),url("../assets/selected-checkbox#{$un}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$un}-dark.png"),url("../assets/selected-checkbox#{$un}-dark@2.png"))); icon-shadow: none; @@ -75,11 +75,11 @@ // checked:selected @each $s,$ch in (':checked:selected', '-checked'), - (':checked:hover:selected', '-checked-hover'), - (':checked:active:selected', '-checked-active'), - (':checked:backdrop:selected', '-checked-backdrop'), - (':checked:insensitive:selected', '-checked-insensitive'), - (':checked:insensitive:backdrop:selected', '-checked-insensitive-backdrop') { + (':checked:hover:selected', '-checked'), + (':checked:active:selected', '-checked'), + (':checked:backdrop:selected', '-checked'), + (':checked:insensitive:selected', '-checked'), + (':checked:insensitive:backdrop:selected', '-checked') { .check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$ch}.png"),url("../assets/selected-checkbox#{$ch}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$ch}-dark.png"),url("../assets/selected-checkbox#{$ch}-dark@2.png"))); icon-shadow: none; @@ -93,11 +93,11 @@ // mixed:selected @each $s,$mx in (':inconsistent:selected', '-mixed'), - (':inconsistent:hover:selected', '-mixed-hover'), - (':inconsistent:active:selected', '-mixed-active'), - (':inconsistent:backdrop:selected', '-mixed-backdrop'), - (':inconsistent:insensitive:selected', '-mixed-insensitive'), - (':inconsistent:insensitive:backdrop:selected', '-mixed-insensitive-backdrop') { + (':inconsistent:hover:selected', '-mixed'), + (':inconsistent:active:selected', '-mixed'), + (':inconsistent:backdrop:selected', '-mixed'), + (':inconsistent:insensitive:selected', '-mixed'), + (':inconsistent:insensitive:backdrop:selected', '-mixed') { .check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$mx}.png"),url("../assets/selected-checkbox#{$mx}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$mx}-dark.png"),url("../assets/selected-checkbox#{$mx}-dark@2.png"))); icon-shadow: none; diff --git a/Paper/gtk-3.18/widgets/_toolbars.scss b/Paper/gtk-3.18/widgets/_toolbars.scss index 7b6b424..cd999d4 100644 --- a/Paper/gtk-3.18/widgets/_toolbars.scss +++ b/Paper/gtk-3.18/widgets/_toolbars.scss @@ -206,19 +206,32 @@ } // buttons - button, - .button, - .flat, - .text-button, - .image-button { - border: none; - background: none; - text-shadow: none; - box-shadow: none; + .button { background-color: transparent; - color: $fg_color; + background-image: none; border-radius: 0px; + border: none; + box-shadow: none; + icon-shadow: none; + margin: 0; padding: 10px; + text-shadow: none; + + &.suggested-action, + &.text-button, + &.menu-button, + &.image-button, + &.linked, + &.flat { + border: none; + background: none; + text-shadow: none; + box-shadow: none; + background-color: transparent; + color: $fg_color; + border-radius: 0px; + padding: 10px; + } &:focus, &:active { @@ -253,6 +266,17 @@ background:none; background-color: transparent; color: $backdrop_fg_color; + } + + GtkLabel, + GtkImage { + color: $fg_color; + + &:insensitive, + &:backdrop { + color: $backdrop_fg_color; + -gtk-image-effect: dim; + } } } diff --git a/Paper/gtk-3.20/gtk-dark.css b/Paper/gtk-3.20/gtk-dark.css index 5cd92c1..38642e5 100644 --- a/Paper/gtk-3.20/gtk-dark.css +++ b/Paper/gtk-3.20/gtk-dark.css @@ -1529,147 +1529,147 @@ radio:indeterminate:disabled:backdrop { check:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } radio:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } check:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-hover-dark.png"), url("../assets/selected-checkbox-unchecked-hover-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); + icon-shadow: none; } radio:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-hover-dark.png"), url("../assets/selected-radio-unchecked-hover-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); + icon-shadow: none; } check:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-active-dark.png"), url("../assets/selected-checkbox-unchecked-active-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); + icon-shadow: none; } radio:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-active-dark.png"), url("../assets/selected-radio-unchecked-active-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); + icon-shadow: none; } check:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop-dark.png"), url("../assets/selected-checkbox-unchecked-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); + icon-shadow: none; } radio:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop-dark.png"), url("../assets/selected-radio-unchecked-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); + icon-shadow: none; } -check:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive-dark.png"), url("../assets/selected-checkbox-unchecked-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +check:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); + icon-shadow: none; } -radio:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive-dark.png"), url("../assets/selected-radio-unchecked-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +radio:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); + icon-shadow: none; } -check:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop-insensitive-dark.png"), url("../assets/selected-checkbox-unchecked-backdrop-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +check:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-dark.png"), url("../assets/selected-checkbox-unchecked-dark@2.png")); + icon-shadow: none; } -radio:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop-insensitive-dark.png"), url("../assets/selected-radio-unchecked-backdrop-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +radio:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-dark.png"), url("../assets/selected-radio-unchecked-dark@2.png")); + icon-shadow: none; } check:checked:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } radio:checked:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } check:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-hover-dark.png"), url("../assets/selected-checkbox-checked-hover-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); + icon-shadow: none; } radio:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-hover-dark.png"), url("../assets/selected-radio-checked-hover-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); + icon-shadow: none; } check:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-active-dark.png"), url("../assets/selected-checkbox-checked-active-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); + icon-shadow: none; } radio:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-active-dark.png"), url("../assets/selected-radio-checked-active-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); + icon-shadow: none; } check:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-backdrop-dark.png"), url("../assets/selected-checkbox-checked-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); + icon-shadow: none; } radio:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-backdrop-dark.png"), url("../assets/selected-radio-checked-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); + icon-shadow: none; } -check:checked:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-dark.png"), url("../assets/selected-checkbox-checked-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +check:checked:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); + icon-shadow: none; } -radio:checked:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-dark.png"), url("../assets/selected-radio-checked-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +radio:checked:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); + icon-shadow: none; } -check:checked:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-checked-insensitive-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } +check:checked:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-dark.png"), url("../assets/selected-checkbox-checked-dark@2.png")); + icon-shadow: none; } -radio:checked:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-backdrop-dark.png"), url("../assets/selected-radio-checked-insensitive-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } +radio:checked:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-dark.png"), url("../assets/selected-radio-checked-dark@2.png")); + icon-shadow: none; } -check:indeterminate:selected { +check:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } -radio:indeterminate:selected { +radio:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } -check:indeterminate:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-hover-dark.png"), url("../assets/selected-checkbox-mixed-hover-dark@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:hover:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); + icon-shadow: none; } -radio:indeterminate:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-hover-dark.png"), url("../assets/selected-radio-mixed-hover-dark@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:hover:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); + icon-shadow: none; } -check:indeterminate:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-active-dark.png"), url("../assets/selected-checkbox-mixed-active-dark@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:active:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); + icon-shadow: none; } -radio:indeterminate:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-active-dark.png"), url("../assets/selected-radio-mixed-active-dark@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:active:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); + icon-shadow: none; } -check:indeterminate:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-backdrop-dark.png"), url("../assets/selected-checkbox-mixed-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); + icon-shadow: none; } -radio:indeterminate:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-backdrop-dark.png"), url("../assets/selected-radio-mixed-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); + icon-shadow: none; } -check:indeterminate:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-dark.png"), url("../assets/selected-checkbox-mixed-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); + icon-shadow: none; } -radio:indeterminate:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-dark.png"), url("../assets/selected-radio-mixed-insensitive-dark@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); + icon-shadow: none; } -check:indeterminate:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-backdrop-dark.png"), url("../assets/selected-checkbox-mixed-insensitive-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-dark.png"), url("../assets/selected-checkbox-mixed-dark@2.png")); + icon-shadow: none; } -radio:indeterminate:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-backdrop-dark.png"), url("../assets/selected-radio-mixed-insensitive-backdrop-dark@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-dark.png"), url("../assets/selected-radio-mixed-dark@2.png")); + icon-shadow: none; } .view.content-view check, GtkIconView.content-view check, iconview.content-view check, diff --git a/Paper/gtk-3.20/gtk.css b/Paper/gtk-3.20/gtk.css index 77c56ff..5f28c8e 100644 --- a/Paper/gtk-3.20/gtk.css +++ b/Paper/gtk-3.20/gtk.css @@ -1536,147 +1536,147 @@ radio:indeterminate:disabled:backdrop { check:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } radio:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } check:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-hover.png"), url("../assets/selected-checkbox-unchecked-hover@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); + icon-shadow: none; } radio:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-hover.png"), url("../assets/selected-radio-unchecked-hover@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); + icon-shadow: none; } check:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-active.png"), url("../assets/selected-checkbox-unchecked-active@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); + icon-shadow: none; } radio:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-active.png"), url("../assets/selected-radio-unchecked-active@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); + icon-shadow: none; } check:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop.png"), url("../assets/selected-checkbox-unchecked-backdrop@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); + icon-shadow: none; } radio:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop.png"), url("../assets/selected-radio-unchecked-backdrop@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); + icon-shadow: none; } -check:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-insensitive.png"), url("../assets/selected-checkbox-unchecked-insensitive@2.png")); - -gtk-icon-shadow: none; } +check:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); + icon-shadow: none; } -radio:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-insensitive.png"), url("../assets/selected-radio-unchecked-insensitive@2.png")); - -gtk-icon-shadow: none; } +radio:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); + icon-shadow: none; } -check:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked-backdrop-insensitive.png"), url("../assets/selected-checkbox-unchecked-backdrop-insensitive@2.png")); - -gtk-icon-shadow: none; } +check:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-unchecked.png"), url("../assets/selected-checkbox-unchecked@2.png")); + icon-shadow: none; } -radio:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked-backdrop-insensitive.png"), url("../assets/selected-radio-unchecked-backdrop-insensitive@2.png")); - -gtk-icon-shadow: none; } +radio:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-unchecked.png"), url("../assets/selected-radio-unchecked@2.png")); + icon-shadow: none; } check:checked:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } radio:checked:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } check:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-hover.png"), url("../assets/selected-checkbox-checked-hover@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); + icon-shadow: none; } radio:checked:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-hover.png"), url("../assets/selected-radio-checked-hover@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); + icon-shadow: none; } check:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-active.png"), url("../assets/selected-checkbox-checked-active@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); + icon-shadow: none; } radio:checked:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-active.png"), url("../assets/selected-radio-checked-active@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); + icon-shadow: none; } check:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-backdrop.png"), url("../assets/selected-checkbox-checked-backdrop@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); + icon-shadow: none; } radio:checked:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-backdrop.png"), url("../assets/selected-radio-checked-backdrop@2.png")); - -gtk-icon-shadow: none; } + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); + icon-shadow: none; } -check:checked:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive.png"), url("../assets/selected-checkbox-checked-insensitive@2.png")); - -gtk-icon-shadow: none; } +check:checked:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); + icon-shadow: none; } -radio:checked:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive.png"), url("../assets/selected-radio-checked-insensitive@2.png")); - -gtk-icon-shadow: none; } +radio:checked:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); + icon-shadow: none; } -check:checked:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked-insensitive-backdrop.png"), url("../assets/selected-checkbox-checked-insensitive-backdrop@2.png")); - -gtk-icon-shadow: none; } +check:checked:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-checked.png"), url("../assets/selected-checkbox-checked@2.png")); + icon-shadow: none; } -radio:checked:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked-insensitive-backdrop.png"), url("../assets/selected-radio-checked-insensitive-backdrop@2.png")); - -gtk-icon-shadow: none; } +radio:checked:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-checked.png"), url("../assets/selected-radio-checked@2.png")); + icon-shadow: none; } -check:indeterminate:selected { +check:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } -radio:indeterminate:selected { +radio:inconsistent:selected { -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); - -gtk-icon-shadow: none; } + icon-shadow: none; } -check:indeterminate:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-hover.png"), url("../assets/selected-checkbox-mixed-hover@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:hover:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); + icon-shadow: none; } -radio:indeterminate:hover:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-hover.png"), url("../assets/selected-radio-mixed-hover@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:hover:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); + icon-shadow: none; } -check:indeterminate:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-active.png"), url("../assets/selected-checkbox-mixed-active@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:active:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); + icon-shadow: none; } -radio:indeterminate:active:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-active.png"), url("../assets/selected-radio-mixed-active@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:active:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); + icon-shadow: none; } -check:indeterminate:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-backdrop.png"), url("../assets/selected-checkbox-mixed-backdrop@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); + icon-shadow: none; } -radio:indeterminate:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-backdrop.png"), url("../assets/selected-radio-mixed-backdrop@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); + icon-shadow: none; } -check:indeterminate:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive.png"), url("../assets/selected-checkbox-mixed-insensitive@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); + icon-shadow: none; } -radio:indeterminate:disabled:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive.png"), url("../assets/selected-radio-mixed-insensitive@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:insensitive:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); + icon-shadow: none; } -check:indeterminate:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed-insensitive-backdrop.png"), url("../assets/selected-checkbox-mixed-insensitive-backdrop@2.png")); - -gtk-icon-shadow: none; } +check:inconsistent:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-checkbox-mixed.png"), url("../assets/selected-checkbox-mixed@2.png")); + icon-shadow: none; } -radio:indeterminate:disabled:backdrop:selected { - -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed-insensitive-backdrop.png"), url("../assets/selected-radio-mixed-insensitive-backdrop@2.png")); - -gtk-icon-shadow: none; } +radio:inconsistent:insensitive:backdrop:selected { + -gtk-icon-source: -gtk-scaled(url("../assets/selected-radio-mixed.png"), url("../assets/selected-radio-mixed@2.png")); + icon-shadow: none; } .view.content-view check, GtkIconView.content-view check, iconview.content-view check, diff --git a/Paper/gtk-3.20/widgets/_checks-radios.scss b/Paper/gtk-3.20/widgets/_checks-radios.scss index c731f49..fffce2d 100644 --- a/Paper/gtk-3.20/widgets/_checks-radios.scss +++ b/Paper/gtk-3.20/widgets/_checks-radios.scss @@ -58,53 +58,53 @@ // unchecked:selected @each $s,$un in (':selected','-unchecked'), - (':hover:selected', '-unchecked-hover'), - (':active:selected', '-unchecked-active'), - (':backdrop:selected', '-unchecked-backdrop'), - (':disabled:selected', '-unchecked-insensitive'), - (':disabled:backdrop:selected', '-unchecked-backdrop-insensitive') { + (':hover:selected', '-unchecked'), + (':active:selected', '-unchecked'), + (':backdrop:selected', '-unchecked'), + (':insensitive:selected', '-unchecked'), + (':insensitive:backdrop:selected', '-unchecked') { check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$un}.png"),url("../assets/selected-checkbox#{$un}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$un}-dark.png"),url("../assets/selected-checkbox#{$un}-dark@2.png"))); - -gtk-icon-shadow: none; + icon-shadow: none; } radio#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-radio#{$un}.png"),url("../assets/selected-radio#{$un}@2.png")), -gtk-scaled(url("../assets/selected-radio#{$un}-dark.png"),url("../assets/selected-radio#{$un}-dark@2.png"))); - -gtk-icon-shadow: none; + icon-shadow: none; } } // checked:selected @each $s,$ch in (':checked:selected', '-checked'), - (':checked:hover:selected', '-checked-hover'), - (':checked:active:selected', '-checked-active'), - (':checked:backdrop:selected', '-checked-backdrop'), - (':checked:disabled:selected', '-checked-insensitive'), - (':checked:disabled:backdrop:selected', '-checked-insensitive-backdrop') { + (':checked:hover:selected', '-checked'), + (':checked:active:selected', '-checked'), + (':checked:backdrop:selected', '-checked'), + (':checked:insensitive:selected', '-checked'), + (':checked:insensitive:backdrop:selected', '-checked') { check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$ch}.png"),url("../assets/selected-checkbox#{$ch}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$ch}-dark.png"),url("../assets/selected-checkbox#{$ch}-dark@2.png"))); - -gtk-icon-shadow: none; + icon-shadow: none; } radio#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-radio#{$ch}.png"),url("../assets/selected-radio#{$ch}@2.png")), -gtk-scaled(url("../assets/selected-radio#{$ch}-dark.png"),url("../assets/selected-radio#{$ch}-dark@2.png"))); - -gtk-icon-shadow: none; + icon-shadow: none; } } // mixed:selected -@each $s,$mx in (':indeterminate:selected', '-mixed'), - (':indeterminate:hover:selected', '-mixed-hover'), - (':indeterminate:active:selected', '-mixed-active'), - (':indeterminate:backdrop:selected', '-mixed-backdrop'), - (':indeterminate:disabled:selected', '-mixed-insensitive'), - (':indeterminate:disabled:backdrop:selected', '-mixed-insensitive-backdrop') { +@each $s,$mx in (':inconsistent:selected', '-mixed'), + (':inconsistent:hover:selected', '-mixed'), + (':inconsistent:active:selected', '-mixed'), + (':inconsistent:backdrop:selected', '-mixed'), + (':inconsistent:insensitive:selected', '-mixed'), + (':inconsistent:insensitive:backdrop:selected', '-mixed') { check#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-checkbox#{$mx}.png"),url("../assets/selected-checkbox#{$mx}@2.png")), -gtk-scaled(url("../assets/selected-checkbox#{$mx}-dark.png"),url("../assets/selected-checkbox#{$mx}-dark@2.png"))); - -gtk-icon-shadow: none; + icon-shadow: none; } radio#{$s}{ -gtk-icon-source: if($variant == 'light', -gtk-scaled(url("../assets/selected-radio#{$mx}.png"),url("../assets/selected-radio#{$mx}@2.png")), -gtk-scaled(url("../assets/selected-radio#{$mx}-dark.png"),url("../assets/selected-radio#{$mx}-dark@2.png"))); - -gtk-icon-shadow: none; + icon-shadow: none; } }