diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..aebc411 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +*.scss \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index e83af87..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "svg.preview.background": "transparent" -} diff --git a/build-theme.js b/build-theme.js old mode 100644 new mode 100755 index b03f7ce..ac7f038 --- a/build-theme.js +++ b/build-theme.js @@ -1,3 +1,4 @@ +#!/usr/bin/env node /** * {} * @author yutent @@ -17,11 +18,15 @@ const GTK3_SCSS = './gtk-3.0/sass/gtk.scss' const GTK3_STYLE = './gtk-3.0/gtk.css' function render(file) { - return scss.renderSync({ - file, - indentType: 'space', - indentWidth: 2 - }).css + try { + return scss.renderSync({ + file, + indentType: 'space', + indentWidth: 2 + }).css + } catch (err) { + console.log(err) + } } /*=======================================================*/ diff --git a/build-themes.py b/build-themes.py deleted file mode 100644 index 476dcc6..0000000 --- a/build-themes.py +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/env python3 - -import os - -VARIATIONS = ["Mint-Y", - "Mint-Y-Dark"] - -DEST = '../../usr/share/themes' - -curdir = os.getcwd() - -print("Updating Gtk3 assets") -os.chdir("gtk-3.0/") -os.system("sassc ./sass/gtk.scss gtk.css") -os.system("sassc ./sass/gtk-dark.scss gtk-dark.css") -os.system("./render-assets.sh") -print("Gtk3 assets updated") - -os.chdir(curdir) - -print("Updating Gtk2 assets") -os.chdir("gtk-2.0/") -os.system("./render-assets.sh") -os.system("./render-dark-assets.sh") -print("Gtk2 assets updated") - -os.chdir(curdir) - -print("Updating Cinnamon assets") -os.chdir("cinnamon/") -os.system("sassc ./sass/cinnamon.scss cinnamon.css") -os.system("sassc ./sass/cinnamon-dark.scss cinnamon-dark.css") -print("Cinnamon assets updated") - -os.chdir(curdir) - -print("Updating Xfwm4 assets") -os.chdir("xfwm4/") -os.system("./render-assets.sh") - -os.chdir(curdir) - -print("Updating Xfwm4 dark assets") -os.chdir("xfwm4-dark/") -os.system("./render-assets.sh") - -os.chdir(curdir) - -if __name__ == '__main__': - print("Building themes") - for variation in VARIATIONS: - dest_folder = os.path.join(DEST, variation) - os.system("mkdir -p %s" % dest_folder) - if variation == "Mint-Y": - print(" Building Mint-Y") - os.system("cp index.theme %s/" % dest_folder) - # Gtk2 - version_folder = os.path.join(dest_folder, "gtk-2.0") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R gtk-2.0/assets %s" % version_folder) - os.system("cp gtk-2.0/*.rc %s" % version_folder) - os.system("cp gtk-2.0/gtkrc %s" % version_folder) - # Gtk3 - version_folder = os.path.join(dest_folder, "gtk-3.0") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R gtk-3.0/assets %s" % version_folder) - os.system("cp gtk-3.0/gtk.css %s" % version_folder) - os.system("cp gtk-3.0/gtk-dark.css %s" % version_folder) - os.system("cp gtk-3.0/thumbnail.png %s" % version_folder) - # Metacity - os.system("cp -R metacity-1 %s" % dest_folder) - # Cinnamon - version_folder = os.path.join(dest_folder, "cinnamon") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R cinnamon/common-assets %s" % version_folder) - os.system("cp -R cinnamon/light-assets %s" % version_folder) - os.system("cp cinnamon/mint-y-thumbnail.png %s" % os.path.join(version_folder, "thumbnail.png")) - os.system("cp cinnamon/cinnamon.css %s" % version_folder) - # XFWM - version_folder = os.path.join(dest_folder, "xfwm4") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R xfwm4/*.png %s" % version_folder) - os.system("cp -R xfwm4/themerc %s" % version_folder) - - elif variation == "Mint-Y-Dark": - print(" Building Mint-Y-Dark") - os.system("cp index.theme-dark %s" % os.path.join(dest_folder, "index.theme")) - # Gtk2 - version_folder = os.path.join(dest_folder, "gtk-2.0") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R gtk-2.0/assets-dark %s" % version_folder) - os.system("rm -rf %s" % os.path.join(version_folder, "assets")) - os.system("mv %s %s" % (os.path.join(version_folder, "assets-dark"), os.path.join(version_folder, "assets"))) - os.system("cp gtk-2.0/*.rc %s" % version_folder) - os.system("cp gtk-2.0/gtkrc-dark %s" % os.path.join(version_folder, "gtkrc")) - os.system("cp gtk-2.0/menubar-toolbar-dark.rc %s" % os.path.join(version_folder, "menubar-toolbar.rc")) - # Gtk3 - version_folder = os.path.join(dest_folder, "gtk-3.0") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R gtk-3.0/assets %s" % version_folder) - os.system("cp gtk-3.0/gtk-dark.css %s" % os.path.join(version_folder, "gtk.css")) - os.system("cp gtk-3.0/thumbnail-dark.png %s" % os.path.join(version_folder, "thumbnail.png")) - # Cinnamon - version_folder = os.path.join(dest_folder, "cinnamon") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R cinnamon/common-assets %s" % version_folder) - os.system("cp -R cinnamon/dark-assets %s" % version_folder) - os.system("cp cinnamon/mint-y-dark-thumbnail.png %s" % os.path.join(version_folder, "thumbnail.png")) - os.system("cp cinnamon/cinnamon-dark.css %s" % os.path.join(version_folder, "cinnamon.css")) - # XFWM - version_folder = os.path.join(dest_folder, "xfwm4") - os.system("mkdir -p %s" % version_folder) - os.system("cp -R xfwm4-dark/*.png %s" % version_folder) - os.system("cp -R xfwm4-dark/themerc %s" % version_folder) diff --git a/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg b/cinnamon/assets/checkbox/checkbox-checked-focused.svg similarity index 100% rename from cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg rename to cinnamon/assets/checkbox/checkbox-checked-focused.svg diff --git a/cinnamon/dark-assets/checkbox/checkbox-checked.svg b/cinnamon/assets/checkbox/checkbox-checked.svg similarity index 100% rename from cinnamon/dark-assets/checkbox/checkbox-checked.svg rename to cinnamon/assets/checkbox/checkbox-checked.svg diff --git a/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg b/cinnamon/assets/checkbox/checkbox-unchecked-focused.svg similarity index 100% rename from cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg rename to cinnamon/assets/checkbox/checkbox-unchecked-focused.svg diff --git a/cinnamon/dark-assets/checkbox/checkbox-unchecked.svg b/cinnamon/assets/checkbox/checkbox-unchecked.svg similarity index 100% rename from cinnamon/dark-assets/checkbox/checkbox-unchecked.svg rename to cinnamon/assets/checkbox/checkbox-unchecked.svg diff --git a/cinnamon/dark-assets/menu/menu-hover.svg b/cinnamon/assets/menu/menu-hover.svg similarity index 100% rename from cinnamon/dark-assets/menu/menu-hover.svg rename to cinnamon/assets/menu/menu-hover.svg diff --git a/cinnamon/common-assets/menu/menu-separator.svg b/cinnamon/assets/menu/menu-separator.svg similarity index 100% rename from cinnamon/common-assets/menu/menu-separator.svg rename to cinnamon/assets/menu/menu-separator.svg diff --git a/cinnamon/dark-assets/menu/menu.svg b/cinnamon/assets/menu/menu.svg similarity index 100% rename from cinnamon/dark-assets/menu/menu.svg rename to cinnamon/assets/menu/menu.svg diff --git a/cinnamon/dark-assets/menu/submenu.svg b/cinnamon/assets/menu/submenu.svg similarity index 100% rename from cinnamon/dark-assets/menu/submenu.svg rename to cinnamon/assets/menu/submenu.svg diff --git a/cinnamon/common-assets/misc/add-workspace-active.svg b/cinnamon/assets/misc/add-workspace-active.svg similarity index 100% rename from cinnamon/common-assets/misc/add-workspace-active.svg rename to cinnamon/assets/misc/add-workspace-active.svg diff --git a/cinnamon/common-assets/misc/add-workspace-hover.svg b/cinnamon/assets/misc/add-workspace-hover.svg similarity index 100% rename from cinnamon/common-assets/misc/add-workspace-hover.svg rename to cinnamon/assets/misc/add-workspace-hover.svg diff --git a/cinnamon/common-assets/misc/add-workspace.svg b/cinnamon/assets/misc/add-workspace.svg similarity index 100% rename from cinnamon/common-assets/misc/add-workspace.svg rename to cinnamon/assets/misc/add-workspace.svg diff --git a/cinnamon/common-assets/misc/bg.svg b/cinnamon/assets/misc/bg.svg similarity index 100% rename from cinnamon/common-assets/misc/bg.svg rename to cinnamon/assets/misc/bg.svg diff --git a/cinnamon/dark-assets/misc/button-box.svg b/cinnamon/assets/misc/button-box.svg similarity index 100% rename from cinnamon/dark-assets/misc/button-box.svg rename to cinnamon/assets/misc/button-box.svg diff --git a/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg b/cinnamon/assets/misc/calendar-arrow-left-hover.svg similarity index 100% rename from cinnamon/common-assets/misc/calendar-arrow-left-hover.svg rename to cinnamon/assets/misc/calendar-arrow-left-hover.svg diff --git a/cinnamon/common-assets/misc/calendar-arrow-left.svg b/cinnamon/assets/misc/calendar-arrow-left.svg similarity index 100% rename from cinnamon/common-assets/misc/calendar-arrow-left.svg rename to cinnamon/assets/misc/calendar-arrow-left.svg diff --git a/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg b/cinnamon/assets/misc/calendar-arrow-right-hover.svg similarity index 100% rename from cinnamon/common-assets/misc/calendar-arrow-right-hover.svg rename to cinnamon/assets/misc/calendar-arrow-right-hover.svg diff --git a/cinnamon/common-assets/misc/calendar-arrow-right.svg b/cinnamon/assets/misc/calendar-arrow-right.svg similarity index 100% rename from cinnamon/common-assets/misc/calendar-arrow-right.svg rename to cinnamon/assets/misc/calendar-arrow-right.svg diff --git a/cinnamon/common-assets/misc/close-active.svg b/cinnamon/assets/misc/close-active.svg similarity index 100% rename from cinnamon/common-assets/misc/close-active.svg rename to cinnamon/assets/misc/close-active.svg diff --git a/cinnamon/common-assets/misc/close-hover.svg b/cinnamon/assets/misc/close-hover.svg similarity index 100% rename from cinnamon/common-assets/misc/close-hover.svg rename to cinnamon/assets/misc/close-hover.svg diff --git a/cinnamon/common-assets/misc/close.svg b/cinnamon/assets/misc/close.svg similarity index 100% rename from cinnamon/common-assets/misc/close.svg rename to cinnamon/assets/misc/close.svg diff --git a/cinnamon/common-assets/misc/corner-ripple.svg b/cinnamon/assets/misc/corner-ripple.svg similarity index 100% rename from cinnamon/common-assets/misc/corner-ripple.svg rename to cinnamon/assets/misc/corner-ripple.svg diff --git a/cinnamon/common-assets/misc/desklet-header.svg b/cinnamon/assets/misc/desklet-header.svg similarity index 100% rename from cinnamon/common-assets/misc/desklet-header.svg rename to cinnamon/assets/misc/desklet-header.svg diff --git a/cinnamon/common-assets/misc/desklet.svg b/cinnamon/assets/misc/desklet.svg similarity index 100% rename from cinnamon/common-assets/misc/desklet.svg rename to cinnamon/assets/misc/desklet.svg diff --git a/cinnamon/dark-assets/misc/message.svg b/cinnamon/assets/misc/message.svg similarity index 100% rename from cinnamon/dark-assets/misc/message.svg rename to cinnamon/assets/misc/message.svg diff --git a/cinnamon/dark-assets/misc/modal.svg b/cinnamon/assets/misc/modal.svg similarity index 100% rename from cinnamon/dark-assets/misc/modal.svg rename to cinnamon/assets/misc/modal.svg diff --git a/cinnamon/common-assets/misc/osd.svg b/cinnamon/assets/misc/osd.svg similarity index 100% rename from cinnamon/common-assets/misc/osd.svg rename to cinnamon/assets/misc/osd.svg diff --git a/cinnamon/common-assets/misc/overview-hover.png b/cinnamon/assets/misc/overview-hover.png similarity index 100% rename from cinnamon/common-assets/misc/overview-hover.png rename to cinnamon/assets/misc/overview-hover.png diff --git a/cinnamon/common-assets/misc/overview.png b/cinnamon/assets/misc/overview.png similarity index 100% rename from cinnamon/common-assets/misc/overview.png rename to cinnamon/assets/misc/overview.png diff --git a/cinnamon/common-assets/misc/trash-icon.svg b/cinnamon/assets/misc/trash-icon.svg similarity index 100% rename from cinnamon/common-assets/misc/trash-icon.svg rename to cinnamon/assets/misc/trash-icon.svg diff --git a/cinnamon/common-assets/panel/activities-active.svg b/cinnamon/assets/panel/activities-active.svg similarity index 100% rename from cinnamon/common-assets/panel/activities-active.svg rename to cinnamon/assets/panel/activities-active.svg diff --git a/cinnamon/common-assets/panel/activities.svg b/cinnamon/assets/panel/activities.svg similarity index 100% rename from cinnamon/common-assets/panel/activities.svg rename to cinnamon/assets/panel/activities.svg diff --git a/cinnamon/common-assets/panel/window-list-active-bottom.svg b/cinnamon/assets/panel/window-list-active-bottom.svg similarity index 100% rename from cinnamon/common-assets/panel/window-list-active-bottom.svg rename to cinnamon/assets/panel/window-list-active-bottom.svg diff --git a/cinnamon/common-assets/panel/window-list-active-top.svg b/cinnamon/assets/panel/window-list-active-top.svg similarity index 100% rename from cinnamon/common-assets/panel/window-list-active-top.svg rename to cinnamon/assets/panel/window-list-active-top.svg diff --git a/cinnamon/dark-assets/switch/switch-off.svg b/cinnamon/assets/switch/switch-off.svg similarity index 100% rename from cinnamon/dark-assets/switch/switch-off.svg rename to cinnamon/assets/switch/switch-off.svg diff --git a/cinnamon/dark-assets/switch/switch-on.svg b/cinnamon/assets/switch/switch-on.svg similarity index 100% rename from cinnamon/dark-assets/switch/switch-on.svg rename to cinnamon/assets/switch/switch-on.svg diff --git a/cinnamon/cinnamon.css b/cinnamon/cinnamon.css index d8b6f64..db2f252 100644 --- a/cinnamon/cinnamon.css +++ b/cinnamon/cinnamon.css @@ -175,16 +175,16 @@ StScrollBar StButton#hhandle:active { .check-box StBin { width: 16px; height: 16px; - background-image: url("dark-assets/checkbox/checkbox-unchecked.svg"); + background-image: url("assets/checkbox/checkbox-unchecked.svg"); } .check-box:focus StBin { - background-image: url("dark-assets/checkbox/checkbox-unchecked-focused.svg"); + background-image: url("assets/checkbox/checkbox-unchecked-focused.svg"); } .check-box:checked StBin { - background-image: url("dark-assets/checkbox/checkbox-checked.svg"); + background-image: url("assets/checkbox/checkbox-checked.svg"); } .check-box:focus:checked StBin { - background-image: url("dark-assets/checkbox/checkbox-checked-focused.svg"); + background-image: url("assets/checkbox/checkbox-checked-focused.svg"); } .radiobutton CinnamonGenericContainer { @@ -200,16 +200,16 @@ StScrollBar StButton#hhandle:active { .radiobutton StBin { width: 16px; height: 16px; - background-image: url("dark-assets/checkbox/checkbox-unchecked.svg"); + background-image: url("assets/checkbox/checkbox-unchecked.svg"); } .radiobutton:focus StBin { - background-image: url("dark-assets/checkbox/checkbox-unchecked-focused.svg"); + background-image: url("assets/checkbox/checkbox-unchecked-focused.svg"); } .radiobutton:checked StBin { - background-image: url("dark-assets/checkbox/checkbox-checked.svg"); + background-image: url("assets/checkbox/checkbox-checked.svg"); } .radiobutton:focus:checked StBin { - background-image: url("dark-assets/checkbox/checkbox-checked-focused.svg"); + background-image: url("assets/checkbox/checkbox-checked-focused.svg"); } .toggle-switch { @@ -218,10 +218,10 @@ StScrollBar StButton#hhandle:active { background-size: contain; } .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); + background-image: url("assets/switch/switch-off.svg"); } .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); + background-image: url("assets/switch/switch-on.svg"); } .cinnamon-link { @@ -571,41 +571,41 @@ StScrollBar StButton#hhandle:active { } .calendar-change-month-back { - background-image: url("common-assets/misc/calendar-arrow-left.svg"); + background-image: url("assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:focus, .calendar-change-month-back:hover { - background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); + background-image: url("assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-back:active { - background-image: url("common-assets/misc/calendar-arrow-left.svg"); + background-image: url("assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:rtl { - background-image: url("common-assets/misc/calendar-arrow-right.svg"); + background-image: url("assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { - background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); + background-image: url("assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-back:rtl:active { - background-image: url("common-assets/misc/calendar-arrow-right.svg"); + background-image: url("assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward { - background-image: url("common-assets/misc/calendar-arrow-right.svg"); + background-image: url("assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:focus, .calendar-change-month-forward:hover { - background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); + background-image: url("assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-forward:active { - background-image: url("common-assets/misc/calendar-arrow-right.svg"); + background-image: url("assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:rtl { - background-image: url("common-assets/misc/calendar-arrow-left.svg"); + background-image: url("assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { - background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); + background-image: url("assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-forward:rtl:active { - background-image: url("common-assets/misc/calendar-arrow-left.svg"); + background-image: url("assets/misc/calendar-arrow-left.svg"); } .calendar-day-event-dot-box { @@ -631,16 +631,14 @@ StScrollBar StButton#hhandle:active { } .calendar-day-base:hover { color: #f2f5fc; - background-color: rgba(100, 181, 246, 0.35); - background-color: rgba(100, 181, 246, 0.15); + border-color: rgba(100, 181, 246, 0.35); } .calendar-day-heading { color: #f2f5fc; margin-top: 16px; margin-bottom: 0; - font-size: 1.2em; - font-weight: bold; + font-size: 1.1em; } .calendar-today { @@ -895,7 +893,7 @@ StScrollBar StButton#hhandle:active { } .popup-menu #notification { color: #ced6e0; - border-image: url("dark-assets/misc/message.svg") 9 9 9 9; + border-image: url("assets/misc/message.svg") 9 9 9 9; } .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { @@ -1006,11 +1004,11 @@ StScrollBar StButton#hhandle:active { .ripple-box { width: 104px; height: 104px; - background-image: url("common-assets/misc/corner-ripple.svg"); + background-image: url("assets/misc/corner-ripple.svg"); background-size: contain; } .ripple-box:rtl { - background-image: url("common-assets/misc/corner-ripple.svg"); + background-image: url("assets/misc/corner-ripple.svg"); } .lightbox { @@ -1234,7 +1232,7 @@ StScrollBar StButton#hhandle:active { color: #ced6e0; border: 0; border-radius: 12px; - background-color: rgba(87, 96, 111, 0.9); + background-color: rgba(87, 96, 111, 0.95); } .popup-sub-menu { @@ -1336,8 +1334,8 @@ StScrollBar StButton#hhandle:active { .menu-favorites-box { padding: 10px; transition-duration: 300; - background-color: rgba(60, 77, 94, 0.3); - border: 0; + background-color: rgba(60, 77, 94, 0.5); + border: 1px solid rgba(134, 144, 155, 0.5); border-radius: 6px; } .menu-favorites-button { @@ -1434,14 +1432,16 @@ StScrollBar StButton#hhandle:active { #menu-search-entry { width: 220px; min-height: 16px; + margin-right: 10px; font-weight: normal; - border: 0; + border: 1px solid #86909b; border-radius: 6px; caret-color: #ced6e0; - background-color: rgba(134, 144, 155, 0.65); + background-color: #3c4d5e; } .menu-search-entry-icon { icon-size: 1em; + margin-right: 6px; color: #ced6e0; } @@ -1668,10 +1668,10 @@ StScrollBar StButton#hhandle:active { } #overview-corner { - background-image: url("common-assets/misc/overview.png"); + background-image: url("assets/misc/overview.png"); } #overview-corner:hover { - background-image: url("common-assets/misc/overview-hover.png"); + background-image: url("assets/misc/overview-hover.png"); } .applet-separator { diff --git a/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg b/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg deleted file mode 100644 index 9c7563a..0000000 --- a/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/checkbox/checkbox-checked.svg b/cinnamon/light-assets/checkbox/checkbox-checked.svg deleted file mode 100644 index 27e5562..0000000 --- a/cinnamon/light-assets/checkbox/checkbox-checked.svg +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg b/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg deleted file mode 100644 index b49bc74..0000000 --- a/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/checkbox/checkbox-unchecked.svg b/cinnamon/light-assets/checkbox/checkbox-unchecked.svg deleted file mode 100644 index 765e877..0000000 --- a/cinnamon/light-assets/checkbox/checkbox-unchecked.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/menu/menu-hover.svg b/cinnamon/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/cinnamon/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/menu/menu.svg b/cinnamon/light-assets/menu/menu.svg deleted file mode 100644 index 5ae7466..0000000 --- a/cinnamon/light-assets/menu/menu.svg +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/menu/submenu.svg b/cinnamon/light-assets/menu/submenu.svg deleted file mode 100644 index 378f29b..0000000 --- a/cinnamon/light-assets/menu/submenu.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/misc/button-box.svg b/cinnamon/light-assets/misc/button-box.svg deleted file mode 100644 index 036f0d1..0000000 --- a/cinnamon/light-assets/misc/button-box.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/cinnamon/light-assets/misc/message.svg b/cinnamon/light-assets/misc/message.svg deleted file mode 100644 index 54803d9..0000000 --- a/cinnamon/light-assets/misc/message.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/cinnamon/light-assets/misc/modal.svg b/cinnamon/light-assets/misc/modal.svg deleted file mode 100644 index b61f537..0000000 --- a/cinnamon/light-assets/misc/modal.svg +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/switch/switch-off.svg b/cinnamon/light-assets/switch/switch-off.svg deleted file mode 100644 index 7c4ad4d..0000000 --- a/cinnamon/light-assets/switch/switch-off.svg +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/cinnamon/light-assets/switch/switch-on.svg b/cinnamon/light-assets/switch/switch-on.svg deleted file mode 100644 index 3d26aa0..0000000 --- a/cinnamon/light-assets/switch/switch-on.svg +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cinnamon/sass/cinnamon.css b/cinnamon/sass/cinnamon.css deleted file mode 100644 index a492ded..0000000 --- a/cinnamon/sass/cinnamon.css +++ /dev/null @@ -1 +0,0 @@ -stage{color:#ced6e0}.label-shadow{color:rgba(0,0,0,0)}.modal-dialog-button-box .modal-dialog-button,.notification-button,.notification-icon-button,.popup-menu #notification .notification-button,.popup-menu #notification .notification-icon-button{min-height:20px;padding:5px 32px;transition-duration:0;color:#ced6e0;background-color:#405264;border:1px solid #4a515e;box-shadow:inset 0 2px 4px rgba(64,82,100,.05)}.modal-dialog-button-box .modal-dialog-button,.notification-button,.notification-icon-button,.popup-menu #notification .notification-button,.popup-menu #notification .notification-icon-button{border-radius:2px}.modal-dialog-button-box .modal-dialog-button:focus,.notification-button:focus,.notification-icon-button:focus,.popup-menu #notification .notification-button:focus,.popup-menu #notification .notification-icon-button:focus{color:#ced6e0;background-color:#405264;border:1px solid rgba(100,181,246,.35);box-shadow:inset 0 2px 4px rgba(64,82,100,.05)}.modal-dialog-button-box .modal-dialog-button:hover,.notification-button:hover,.notification-icon-button:hover,.popup-menu #notification .notification-button:hover,.popup-menu #notification .notification-icon-button:hover{color:#ced6e0;background-color:#4a5f74;border:1px solid #4a515e;box-shadow:inset 0 2px 4px rgba(74,95,116,.05)}.modal-dialog-button-box .modal-dialog-button:hover:focus,.notification-button:hover:focus,.notification-icon-button:hover:focus,.popup-menu #notification .notification-button:hover:focus,.popup-menu #notification .notification-icon-button:hover:focus{color:#ced6e0;background-color:#4a5f74;border:1px solid rgba(100,181,246,.35);box-shadow:inset 0 2px 4px rgba(64,82,100,.05)}.modal-dialog-button-box .modal-dialog-button:active,.notification-button:active,.notification-icon-button:active,.popup-menu #notification .notification-button:active,.popup-menu #notification .notification-icon-button:active{color:#f2f5fc;background-color:rgba(100,181,246,.35);border:1px solid rgba(100,181,246,.35);box-shadow:inset 0 2px 4px rgba(100,181,246,.35)}.modal-dialog-button-box .modal-dialog-button:insensitive,.notification-button:insensitive,.notification-icon-button:insensitive,.popup-menu #notification .notification-button:insensitive,.popup-menu #notification .notification-icon-button:insensitive{color:rgba(206,214,224,.45);border:1px solid rgba(74,81,94,.55);background-color:rgba(64,82,100,.55);box-shadow:inset 0 2px 4px rgba(64,82,100,.05)}#menu-search-entry,.popup-menu #notification StEntry{padding:7px;caret-size:1px;selection-background-color:rgba(100,181,246,.35);selected-color:#f2f5fc;transition-duration:300ms}#menu-search-entry:insensitive,.popup-menu #notification StEntry:insensitive{color:rgba(206,214,224,.45);background-color:#485666;border-color:1px solid #505866;box-shadow:inset 0 2px 4px rgba(72,86,102,.05)}#menu-search-entry StIcon.capslock-warning,.popup-menu #notification StEntry StIcon.capslock-warning{icon-size:16px;warning-color:#f27835;padding:0 4px}.notification StEntry{padding:7px;caret-size:1px;caret-color:#c3c3c3;selection-background-color:rgba(100,181,246,.35);selected-color:#f2f5fc;transition-duration:300ms;border-radius:3px;color:#c3c3c3;background-color:rgba(109,109,109,.4);border:1px solid rgba(22,22,22,.4);box-shadow:inset 0 2px 4px rgba(0,0,0,.05)}.notification StEntry:focus{color:#f2f5fc;background-color:rgba(100,181,246,.35);border:1px solid rgba(100,181,246,.35);box-shadow:inset 0 2px 4px rgba(0,0,0,.05)}.notification StEntry:insensitive{color:rgba(195,195,195,.55);background-color:rgba(109,109,109,.25);border:1px solid rgba(22,22,22,.4);box-shadow:inset 0 2px 4px rgba(0,0,0,.05)}StScrollView.vfade{-st-vfade-offset:68px}StScrollView.hfade{-st-hfade-offset:68px}StScrollBar{padding:8px}StScrollView StScrollBar{min-width:5px;min-height:5px}StScrollBar StBin#trough{background-color:rgba(60,77,94,.1);border-radius:8px}StScrollBar StButton#vhandle,StScrollBar StButton#hhandle{border-radius:2px;background-color:#878f9c;border:0px solid;margin:0px}StScrollBar StButton#vhandle:hover,StScrollBar StButton#hhandle:hover{background-color:#7b8391}StScrollBar StButton#vhandle:active,StScrollBar StButton#hhandle:active{background-color:rgba(100,181,246,.35)}.separator{-gradient-height:1px;-gradient-start:rgba(0,0,0,0);-gradient-end:rgba(0,0,0,0);-margin-horizontal:1.5em;height:1em}.popup-slider-menu-item,.slider{-slider-height:.3em;-slider-background-color:#4a515e;-slider-border-color:rgba(87,96,111,.3);-slider-active-background-color:rgba(100,181,246,.35);-slider-active-border-color:rgba(87,96,111,.3);-slider-border-width:1px;-slider-handle-radius:.5em;height:1em;min-width:15em;border:0 solid transparent;border-right-width:1px;border-left-width:5px}.check-box CinnamonGenericContainer{spacing:.2em;min-height:30px;padding-top:2px}.check-box StLabel{font-weight:normal}.check-box StBin{width:16px;height:16px;background-image:url("dark-assets/checkbox/checkbox-unchecked.svg")}.check-box:focus StBin{background-image:url("dark-assets/checkbox/checkbox-unchecked-focused.svg")}.check-box:checked StBin{background-image:url("dark-assets/checkbox/checkbox-checked.svg")}.check-box:focus:checked StBin{background-image:url("dark-assets/checkbox/checkbox-checked-focused.svg")}.radiobutton CinnamonGenericContainer{spacing:.2em;height:26px;padding-top:2px}.radiobutton StLabel{padding-top:4px;font-size:.9em;box-shadow:none}.radiobutton StBin{width:16px;height:16px;background-image:url("dark-assets/checkbox/checkbox-unchecked.svg")}.radiobutton:focus StBin{background-image:url("dark-assets/checkbox/checkbox-unchecked-focused.svg")}.radiobutton:checked StBin{background-image:url("dark-assets/checkbox/checkbox-checked.svg")}.radiobutton:focus:checked StBin{background-image:url("dark-assets/checkbox/checkbox-checked-focused.svg")}.toggle-switch{width:50px;height:20px;background-size:contain}.toggle-switch-us,.toggle-switch-intl{background-image:url("dark-assets/switch/switch-off.svg")}.toggle-switch-us:checked,.toggle-switch-intl:checked{background-image:url("dark-assets/switch/switch-on.svg")}.cinnamon-link{color:rgba(196,227,252,.35);text-decoration:underline}.cinnamon-link:hover{color:rgba(245,250,254,.35)}#Tooltip{border:1px solid #d0d0d0;border-radius:3px;padding:5px 12px;background-color:#fbeaa0;color:#4a4a4a;font-size:1em;font-weight:normal;text-align:center}#LookingGlassDialog{color:#ced6e0;border:1px solid #4a515e;border-radius:3px;background-color:#57606f;spacing:4px;padding:8px}#panel{font-weight:bold;height:40px;width:32px;color:#ced6e0;background-color:rgba(16,16,16,.1)}#panelLeft{spacing:4px}#panelLeft:dnd{background-gradient-direction:vertical;background-gradient-start:rgba(255,0,0,.05);background-gradient-end:rgba(255,0,0,.2)}#panelLeft:ltr{padding-right:4px}#panelLeft:rtl{padding-left:4px}#panelLeft.vertical{padding:0px}#panelLeft.vertical:ltr{padding-right:0px}#panelLeft.vertical:rtl{padding-left:0px}#panelRight:dnd{background-gradient-direction:vertical;background-gradient-start:rgba(0,0,255,.05);background-gradient-end:rgba(0,0,255,.2)}#panelRight:ltr{padding-left:4px;spacing:0px}#panelRight:rtl{padding-right:4px;spacing:0px}#panelRight.vertical{padding:0px}#panelRight.vertical:ltr{padding-right:0px}#panelRight.vertical:rtl{padding-left:0px}#panelCenter{spacing:4px}#panelCenter:dnd{background-gradient-direction:vertical;background-gradient-start:rgba(0,255,0,.05);background-gradient-end:rgba(0,255,0,.2)}#panel:highlight{-o-border-image:none;border-image:none;background-color:rgba(252,118,97,.5)}.panelLeft{spacing:4px}.panelLeft:dnd{background-gradient-direction:vertical;background-gradient-start:rgba(255,0,0,.05);background-gradient-end:rgba(255,0,0,.2)}.panelLeft:ltr{padding-right:4px}.panelLeft:rtl{padding-left:4px}.panelLeft.vertical{padding:0px}.panelLeft.vertical:ltr{padding-right:0px}.panelLeft.vertical:rtl{padding-left:0px}.panelRight:dnd{background-gradient-direction:vertical;background-gradient-start:rgba(0,0,255,.05);background-gradient-end:rgba(0,0,255,.2)}.panelRight:ltr{padding-left:4px;spacing:0px}.panelRight:rtl{padding-right:4px;spacing:0px}.panelRight.vertical{padding:0px}.panelRight.vertical:ltr{padding-left:0px;spacing:0px}.panelRight.vertical:rtl{padding-right:0px;spacing:0px}.panelCenter{spacing:4px}.panelCenter.vertical{padding-left:0px;padding-right:0px}.panelCenter:dnd{background-gradient-direction:vertical;background-gradient-start:rgba(0,255,0,.05);background-gradient-end:rgba(0,255,0,.2)}.panel-top,.panel-bottom,.panel-left,.panel-right{color:#f2f5fc;border:none;background-color:rgba(87,96,111,.99);font-size:1em;padding:0px}.panel-top{box-shadow:0 1px #4a515e}.panel-bottom{box-shadow:0 -1px #4a515e}.panel-left{box-shadow:1px 0 #4a515e}.panel-right{box-shadow:-1px 0 #4a515e}.panel-dummy{background-color:rgba(252,118,97,.5)}.panel-dummy:entered{background-color:rgba(252,118,97,.6)}.panel-status-button{border-width:0;-natural-hpadding:3px;-minimum-hpadding:3px;font-weight:bold;color:#ced6e0}.panel-button{-natural-hpadding:6px;-minimum-hpadding:2px;font-weight:bold;color:green;transition-duration:100}.system-status-icon{icon-size:16px;padding:0 1px}.system-status-icon.warning{color:#f27835}.system-status-icon.error{color:#fc7661}.panel-launchers{padding-left:7px;spacing:2px}.panel-launchers .launcher{padding-left:2px;padding-right:2px;padding-bottom:2px;transition-duration:200}.panel-launchers .launcher:hover{background-color:rgba(100,181,246,.35)}.panel-launchers.vertical{padding-top:2px;padding-bottom:2px;padding-left:0px;padding-right:0px;spacing:1px}.panel-launchers.vertical .launcher{padding-top:2px;padding-bottom:2px}.calendar{spacing-rows:0;spacing-columns:0}.calendar-main-box{margin:0 16px 8px}.calendar-events-main-box{height:300px;margin-right:.5em;padding:.5em;min-width:350px;border:0;border-radius:6px;background-color:rgba(60,77,94,.3)}.calendar-events-no-events-button{margin:6px 0 6px 0;padding:6px}.calendar-events-no-events-button:hover{background-color:rgba(100,181,246,.35)}.calendar-events-no-events-button:hover .calendar-events-no-events-icon,.calendar-events-no-events-button:hover .calendar-events-no-events-label{color:#f2f5fc}.calendar-events-no-events-icon,.calendar-events-no-events-label{font-weight:bold;color:#ced6e0;text-align:center}.calendar-events-date-label{padding:.1em .1em .5em .1em;color:#ced6e0;font-weight:bold;text-align:center}.calendar-events-event-container{padding:0}.calendar-event-button{border:1px solid rgba(0,0,0,0)}.calendar-event-button .calendar-event-time-past{color:rgba(206,214,224,.4);font-weight:bold;text-align:left;margin-bottom:.2em}.calendar-event-button .calendar-event-time-present{color:#ced6e0;font-weight:bold;text-align:left;margin-bottom:.2em}.calendar-event-button .calendar-event-time-present:all-day{color:rgba(100,181,246,.35)}.calendar-event-button .calendar-event-time-future{color:#ced6e0;font-weight:bold;text-align:left;margin-bottom:.2em}.calendar-event-button .calendar-event-summary{color:#ced6e0;text-align:left;width:200px}.calendar-event-button .calendar-event-countdown{text-align:right;margin-bottom:.6em;color:#ced6e0}.calendar-event-button .calendar-event-countdown:soon{font-weight:bold}.calendar-event-button .calendar-event-countdown:imminent{font-weight:bold;color:#f27835}.calendar-event-button .calendar-event-countdown:current{font-weight:bold;color:rgba(100,181,246,.35)}.calendar-event-button:hover{background-color:rgba(100,181,246,.35);border:1px solid #4a515e}.calendar-event-button:hover .calendar-event-time-past,.calendar-event-button:hover .calendar-event-time-present,.calendar-event-button:hover .calendar-event-time-future,.calendar-event-button:hover .calendar-event-summary{color:#f2f5fc}.calendar-event-button:hover .calendar-event-countdown{text-align:right;margin-bottom:.6em;color:#f2f5fc}.calendar-event-button:hover .calendar-event-countdown:soon{font-weight:bold}.calendar-event-button:hover .calendar-event-countdown:imminent{font-weight:bold}.calendar-event-button:hover .calendar-event-countdown:current{font-weight:bold}.calendar-event-color-strip{width:2px}.calendar-today-home-button{padding:0}.calendar-today-day-label{font-size:1.75em;color:#ced6e0;font-weight:bold;text-align:center}.calendar-today-date-label{font-size:1.1em;color:#ced6e0;font-weight:bold;text-align:center}.calendar-today-home-button-enabled{padding:0}.calendar-today-home-button-enabled:hover{color:#64b5f6}.calendar-today-home-button-enabled:hover .calendar-today-day-label,.calendar-today-home-button-enabled:hover .calendar-today-date-label{color:inherit}.calendar-month-label{color:#ced6e0;font-weight:bold;padding:8px 0;font-size:1.2em}.calendar-change-month-back,.calendar-change-month-forward{width:32px;height:32px;background-size:32px}.calendar-change-month-back{background-image:url("common-assets/misc/calendar-arrow-left.svg")}.calendar-change-month-back:focus,.calendar-change-month-back:hover{background-image:url("common-assets/misc/calendar-arrow-left-hover.svg")}.calendar-change-month-back:active{background-image:url("common-assets/misc/calendar-arrow-left.svg")}.calendar-change-month-back:rtl{background-image:url("common-assets/misc/calendar-arrow-right.svg")}.calendar-change-month-back:rtl:focus,.calendar-change-month-back:rtl:hover{background-image:url("common-assets/misc/calendar-arrow-right-hover.svg")}.calendar-change-month-back:rtl:active{background-image:url("common-assets/misc/calendar-arrow-right.svg")}.calendar-change-month-forward{background-image:url("common-assets/misc/calendar-arrow-right.svg")}.calendar-change-month-forward:focus,.calendar-change-month-forward:hover{background-image:url("common-assets/misc/calendar-arrow-right-hover.svg")}.calendar-change-month-forward:active{background-image:url("common-assets/misc/calendar-arrow-right.svg")}.calendar-change-month-forward:rtl{background-image:url("common-assets/misc/calendar-arrow-left.svg")}.calendar-change-month-forward:rtl:focus,.calendar-change-month-forward:rtl:hover{background-image:url("common-assets/misc/calendar-arrow-left-hover.svg")}.calendar-change-month-forward:rtl:active{background-image:url("common-assets/misc/calendar-arrow-left.svg")}.calendar-day-event-dot-box{margin-top:17px;max-rows:1}.calendar-day-event-dot{margin:1px;border-radius:2px;width:4px;height:4px}.calendar-day-base{font-size:1.1em;text-align:center;width:48px;height:48px;margin:0 8px;border-radius:24px;border:1px solid transparent}.calendar-day-base:hover{color:#f2f5fc;background-color:rgba(100,181,246,.35);background-color:rgba(100,181,246,.15)}.calendar-day-heading{color:#f2f5fc;margin-top:16px;margin-bottom:0;font-size:1.2em;font-weight:bold}.calendar-today{font-weight:bold;color:#f2f5fc;background-color:rgba(100,181,246,.35);border-width:0}.calendar-today:selected{background-color:rgba(100,181,246,.35)}.calendar-not-today{color:#ced6e0}.calendar-not-today:selected{font-weight:bold;background-color:transparent;border:1px solid rgba(100,181,246,.35)}.calendar-nonwork-day{color:#fc7661;background-color:transparent;font-weight:bold}.calendar-nonwork-day:hover{color:#fc7661}.calendar-other-month-day{color:rgba(206,214,224,.3)}.calendar-other-month-day:hover{color:inherit}.calendar-week-number{margin-top:14px;color:rgba(206,214,224,.85);font-size:1em}#overview{spacing:12px}.window-caption{background-color:#353535;border:1px solid #353535;color:#c3c3c3;spacing:8px;border-radius:2px;font-size:.9em;padding:5px 8px;-cinnamon-caption-spacing:8px}.window-caption:focus{background-color:rgba(100,181,246,.35);color:#f2f5fc;border:1px solid rgba(100,181,246,.35)}.window-border{border:3px rgba(100,181,246,.35);border-radius:2px;background-color:rgba(255,255,255,.05);box-shadow:0 0 0 1px rgba(100,181,246,.35) inset}.overview-empty-placeholder{color:#fff;font-size:2em}.expo-workspaces-name-entry,.expo-workspaces-name-entry#selected{height:1.5em;border-radius:2px;font-size:1em;padding:5px 8px;-cinnamon-caption-spacing:4px;color:#c3c3c3;background-color:rgba(109,109,109,.4);border:1px solid rgba(22,22,22,.4);box-shadow:inset 0 2px 4px rgba(0,0,0,.05)}.expo-workspaces-name-entry:focus,.expo-workspaces-name-entry#selected:focus{border:1px solid rgba(100,181,246,.35);background-color:rgba(100,181,246,.35);color:#f2f5fc;font-style:italic;transition-duration:300;selection-background-color:#f2f5fc;selected-color:rgba(100,181,246,.35)}.expo-workspace-thumbnail-frame{border:4px solid rgba(255,255,255,0);background-color:rgba(255,255,255,0);border-radius:2px}.expo-workspace-thumbnail-frame#active{border:4px solid rgba(100,181,246,.35);background-color:#000;border-radius:2px}.expo-background{background-color:#353535}.workspace-thumbnails{spacing:26px}.workspace-thumbnails-background,.workspace-thumbnails-background:rtl{padding:8px}.workspace-add-button{background-image:url("common-assets/misc/add-workspace.svg");height:200px;width:35px;transition-duration:100}.workspace-add-button:hover{background-image:url("common-assets/misc/add-workspace-hover.svg");transition-duration:100}.workspace-add-button:active{background-image:url("common-assets/misc/add-workspace-active.svg");transition-duration:100}.workspace-overview-background-shade{background-color:rgba(0,0,0,.5)}.workspace-close-button,.window-close{background-image:url("common-assets/misc/close.svg");background-size:26px;height:26px;width:26px;-cinnamon-close-overlap:12px}.workspace-close-button:hover,.window-close:hover{background-image:url("common-assets/misc/close-hover.svg");background-size:26px;height:26px;width:26px}.workspace-close-button:active,.window-close:active{background-image:url("common-assets/misc/close-active.svg");background-size:26px;height:26px;width:26px}.window-close-area{background-image:url("common-assets/misc/trash-icon.svg");height:120px;width:400px}#workspaceSwitcher{spacing:0px;padding:3px}.workspace-switcher{padding-left:3px;padding-right:3px}.panel-left .workspace-switcher,.panel-right .workspace-switcher{padding:0}.workspace-button{border:1px solid rgba(0,0,0,.4);background-color:rgba(0,0,0,.2);width:20px;height:14px;color:rgba(242,245,252,.45);padding:3px;padding-top:4px;transition-duration:200}.workspace-button.vertical{height:1.5em;width:24px;padding:0;padding-top:3px;padding-bottom:3px}.workspace-button:outlined{background-color:rgba(100,181,246,.35);color:#f2f5fc}.workspace-button:outlined:hover{background-color:rgba(100,181,246,.05);color:#f2f5fc}.workspace-button:hover{background-color:rgba(206,214,224,.2);color:#f2f5fc}.workspace-graph{padding:3px;spacing:6px}.workspace-graph .workspace{border:1px solid rgba(0,0,0,.4);background-color:rgba(0,0,0,.2)}.workspace-graph .workspace:active{border:1px solid rgba(100,181,246,.35)}.workspace-graph .workspace .windows{-active-window-background:#7b8698;-active-window-border:rgba(0,0,0,.8);-inactive-window-background:#7b8698;-inactive-window-border:rgba(0,0,0,.8)}.workspace-graph .workspace:active .windows{-active-window-background:#98a0ae;-active-window-border:rgba(0,0,0,.8);-inactive-window-background:#626c7d;-inactive-window-border:rgba(0,0,0,.8)}#notification{border:1px solid #4a515e;border-radius:3px;background-color:#57606f;padding:13px;spacing-rows:10px;spacing-columns:10px;margin-from-right-edge-of-screen:20px;width:34em;color:#ced6e0}.popup-menu #notification{color:#ced6e0;-o-border-image:url("dark-assets/misc/message.svg") 9 9 9 9;border-image:url("dark-assets/misc/message.svg") 9 9 9 9}.popup-menu #notification .notification-button,.popup-menu #notification .notification-icon-button{padding:5px}#notification.multi-line-notification{padding-bottom:13px;color:#ced6e0}#notification-scrollview{max-height:10em}#notification-scrollview>.top-shadow,#notification-scrollview>.bottom-shadow{height:1em}#notification-scrollview:ltr>StScrollBar{padding-left:6px}#notification-scrollview:rtl>StScrollBar{padding-right:6px}#notification-body{spacing:5px}#notification-actions{spacing:10px}.notification-with-image{min-height:159px;color:#ced6e0}.notification-button,.notification-icon-button{padding:5px}.notification-icon-button>StIcon{icon-size:32px}#altTabPopup{padding:8px;spacing:16px}.switcher-list{color:#ced6e0;border:1px solid #4a515e;background-color:#57606f;border-radius:3px;padding:20px}.switcher-list>StBoxLayout{padding:4px}.switcher-list-item-container{spacing:8px}.switcher-list .item-box{padding:8px;border-radius:2px}.switcher-list .item-box:outlined{padding:8px;border:1px solid rgba(100,181,246,.35)}.switcher-list .item-box:selected{color:#f2f5fc;background-color:rgba(100,181,246,.35);border:0px solid rgba(100,181,246,.35)}.switcher-list .thumbnail{width:256px}.switcher-list .thumbnail-box{padding:2px;spacing:4px}.switcher-list .separator{width:1px;background:rgba(255,255,255,.2)}.switcher-arrow{border-color:rgba(0,0,0,0);color:#ced6e0}.switcher-arrow:highlighted{border-color:rgba(0,0,0,0);color:#f2f5fc}.thumbnail-scroll-gradient-left{background-color:rgba(0,0,0,0);border-radius:24px;border-radius-topright:0px;border-radius-bottomright:0px;width:60px}.thumbnail-scroll-gradient-right{background-color:rgba(0,0,0,0);border-radius:24px;border-radius-topleft:0px;border-radius-bottomleft:0px;width:60px}.ripple-box{width:104px;height:104px;background-image:url("common-assets/misc/corner-ripple.svg");background-size:contain}.ripple-box:rtl{background-image:url("common-assets/misc/corner-ripple.svg")}.lightbox{background-color:rgba(0,0,0,.4)}.flashspot{background-color:#fff}.modal-dialog{background-color:#57606f;border:1px solid #4a515e;border-radius:3px;padding:5px 10px}.modal-dialog>StBoxLayout:first-child{padding:10px}.modal-dialog-button-box{spacing:0;margin:0px;padding:10px;border:none;background-color:#57606f}.modal-dialog-button-box .modal-dialog-button{padding-top:0;padding-bottom:0;height:30px}.modal-dialog .confirm-dialog-title{text-align:center;font-weight:bold;font-size:1.3em;padding-bottom:12px}.run-dialog{padding:10px 15px 10px 15px;border:1px solid #4a515e;border-radius:3px;background-color:#57606f}.run-dialog>*{padding:0}.run-dialog-label{font-size:1.3em;font-weight:bold;color:#ced6e0;padding-bottom:15px;text-align:center}.run-dialog-description{color:#ced6e0;padding-top:15px;text-align:center}.run-dialog-description.error{color:#fc7661}.run-dialog-completion-box{padding-top:5px;padding-left:15px;font-size:1em}.run-dialog-entry{width:21em;height:1.2em;padding:7px;border-radius:3px;caret-color:#c3c3c3;selected-color:#f2f5fc;selection-background-color:rgba(100,181,246,.35);color:#c3c3c3;background-color:rgba(109,109,109,.4);border:1px solid rgba(22,22,22,.4);box-shadow:inset 0 2px 4px rgba(0,0,0,.05)}.run-dialog-entry:focus{color:#dae1e9;background-color:#86909b;box-shadow:inset 0 2px 4px rgba(60,77,94,.05)}.run-dialog .modal-dialog-button-box{border:none;box-shadow:none;background:none}.cinnamon-mount-operation-icon{icon-size:48px}.mount-password-reask{color:#f27835}.show-processes-dialog,.mount-question-dialog{spacing:24px}.show-processes-dialog-subject,.mount-question-dialog-subject{padding-top:10px;padding-left:17px;padding-bottom:6px}.show-processes-dialog-subject:rtl,.mount-question-dialog-subject:rtl{padding-left:0px;padding-right:17px}.show-processes-dialog-description,.mount-question-dialog-description{padding-left:17px;width:28em}.show-processes-dialog-description:rtl,.mount-question-dialog-description:rtl{padding-right:17px}.show-processes-dialog-app-list{max-height:200px;padding-top:24px;padding-left:49px;padding-right:32px}.show-processes-dialog-app-list:rtl{padding-right:49px;padding-left:32px}.show-processes-dialog-app-list-item{color:#ccc}.show-processes-dialog-app-list-item:hover{color:#fff}.show-processes-dialog-app-list-item:ltr{padding-right:1em}.show-processes-dialog-app-list-item:rtl{padding-left:1em}.show-processes-dialog-app-list-item-icon:ltr{padding-right:17px}.show-processes-dialog-app-list-item-icon:rtl{padding-left:17px}.show-processes-dialog-app-list-item-name{font-size:1.1em}.magnifier-zoom-region{border:2px solid maroon}.magnifier-zoom-region .full-screen{border-width:0px}#keyboard{background-color:#353535;border-width:0;border-top-width:1px;border-color:rgba(0,0,0,.4)}.keyboard-layout{spacing:10px;padding:10px}.keyboard-row{spacing:15px}.keyboard-key{min-height:2em;min-width:2em;font-size:1.4em;font-weight:bold;border-radius:3px;box-shadow:none;color:#c3c3c3;border:1px solid #4a515e;background-color:rgba(109,109,109,.4)}.keyboard-key:hover{color:#c3c3c3;border:1px solid rgba(2,2,2,.4);background-color:rgba(127,127,127,.5)}.keyboard-key:active,.keyboard-key:checked{color:#f2f5fc;border:1px solid rgba(100,181,246,.35);background-color:rgba(100,181,246,.35)}.keyboard-key:grayed{color:#606060;border:1px solid rgba(2,2,2,.4);background-color:rgba(109,109,109,.25)}.keyboard-subkeys{color:#c3c3c3;padding:5px;-arrow-border-radius:2px;-arrow-background-color:#353535;-arrow-border-width:1px;-arrow-border-color:rgba(0,0,0,.4);-arrow-base:20px;-arrow-rise:10px;-boxpointer-gap:5px}.menu{color:#ced6e0;border:0;border-radius:12px;background-color:rgba(87,96,111,.9)}.popup-sub-menu{background-color:#3c4d5e;box-shadow:none}.popup-sub-menu .popup-menu-item:ltr{padding-right:1.75em}.popup-sub-menu .popup-menu-item:rtl{padding-left:1.75em}.popup-sub-menu StScrollBar{padding:4px}.popup-sub-menu StScrollBar StBin#trough,.popup-sub-menu StScrollBar StBin#vhandle{border-width:0}.popup-menu-content{padding:1em 0em 1em 0em}.popup-menu-item{padding:.4em 1.75em;spacing:1em;border-left-width:0;border-right-width:0}.popup-menu-item:active{color:#f2f5fc;background-color:rgba(100,181,246,.35)}.popup-menu-item:insensitive{color:rgba(206,214,224,.5);background:none}.popup-inactive-menu-item{color:#ced6e0}.popup-inactive-menu-item:insensitive{color:rgba(206,214,224,.45)}.popup-menu-boxpointer{-arrow-border-radius:3px;-arrow-background-color:#57606f;-arrow-border-width:1px;-arrow-border-color:#4a515e;-arrow-base:21px;-arrow-rise:9px;-boxpointer-gap:2px}.popup-combo-menu{color:#ced6e0;border:1px solid #4a515e;border-radius:3px;background-color:#3c4d5e;box-shadow:none;padding:1em 0em 1em 0em}.popup-combobox-item{spacing:1em;padding:.4em 1.75em;border:1px solid transparent;border-left-width:0;border-right-width:0}.popup-separator-menu-item{-gradient-height:1px;-gradient-start:#4a515e;-gradient-end:#4a515e;-margin-horizontal:0;height:1px}.popup-alternating-menu-item:alternate{font-weight:normal}.popup-device-menu-item{spacing:.5em}.popup-subtitle-menu-item{font-weight:normal}.nm-menu-item-icons{spacing:.5em}.menu-favorites-box{padding:10px;transition-duration:300;background-color:rgba(60,77,94,.3);border:0;border-radius:6px}.menu-favorites-button{padding:.9em 1em;border:0;border-radius:6px}.menu-favorites-button:hover{background-color:rgba(100,181,246,.35)}.menu-places-box{padding:10px;border:0px solid red}.menu-places-button{padding:10px}.menu-categories-box{padding:10px 30px 10px 30px}.menu-applications-inner-box,.menu-applications-outer-box{padding:10px 10px 0 10px}.menu-application-button{padding:7px;border:0}.menu-application-button:highlighted{font-weight:bold}.menu-application-button-selected{padding:7px;color:#f2f5fc;background-color:rgba(100,181,246,.35);border-radius:6px}.menu-application-button-selected:highlighted{font-weight:bold}.menu-application-button-label:ltr{padding-left:5px}.menu-application-button-label:rtl{padding-right:5px}.menu-category-button{padding:7px;border:0}.menu-category-button-selected{padding:7px;color:#f2f5fc;background-color:rgba(100,181,246,.35);border-radius:6px}.menu-category-button-hover{background-color:red;border-radius:2px}.menu-category-button-greyed{padding:7px;color:rgba(206,214,224,.45);border-radius:6px}.menu-category-button-label:ltr{padding-left:5px}.menu-category-button-label:rtl{padding-right:5px}.menu-selected-app-box{padding-right:30px;padding-left:28px;text-align:right;height:2.2em}.menu-selected-app-box:rtl{padding-top:10px;height:2.2em}.menu-selected-app-title{font-weight:bold}.menu-selected-app-description{max-width:150px}.menu-search-box:ltr{padding-left:30px}.menu-search-box-rtl{padding-right:30px}#menu-search-entry{width:220px;min-height:16px;font-weight:normal;border:0;border-radius:6px;caret-color:#ced6e0;background-color:rgba(134,144,155,.65)}.menu-search-entry-icon{icon-size:1em;color:#ced6e0}.info-osd{text-align:center;font-weight:bold;spacing:1em;padding:16px;color:#ced6e0;border:1px solid #4a515e;border-radius:5px;background-color:#57606f}.restart-osd{font-size:1.6em}.workspace-osd{font-size:4em}.osd-window{text-align:center;font-weight:bold;spacing:1em;padding:20px;color:#ced6e0;background-color:#57606f;border:1px solid #4a515e;border-radius:5px}.osd-window .osd-monitor-label{font-size:3em}.osd-window .level{padding:0;height:.7em;background-color:rgba(0,0,0,.5);border-radius:2px}.osd-window .level-bar{border-radius:2px;background-color:rgba(100,181,246,.35)}.window-list-box{spacing:6px;padding-left:10px;padding-top:1px}.window-list-box.vertical{spacing:2px;padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px}.window-list-box:highlight{background-color:rgba(252,118,97,.5)}.window-list-item-label{font-weight:bold;width:15em;min-width:5px}.window-list-item-box{font-weight:bold;background-image:none;padding-top:0;padding-left:8px;padding-right:8px;transition-duration:100;color:rgba(206,214,224,.8)}.window-list-item-box.top,.window-list-item-box.bottom{border-bottom-width:2px}.window-list-item-box.top StLabel,.window-list-item-box.bottom StLabel{padding-left:2px}.window-list-item-box.right{padding-left:0px;padding-right:0px;border-right-width:2px}.window-list-item-box.right StBin{padding-right:0}.window-list-item-box.left{padding-left:0px;padding-right:0px;border-left-width:2px}.window-list-item-box.left StBin{padding-left:1px}.window-list-item-box:hover,.window-list-item-box:groupfocus{color:#ced6e0;background-color:rgba(206,214,224,.2)}.window-list-item-box:active,.window-list-item-box:checked,.window-list-item-box:focus,.window-list-item-box:running{color:#ced6e0;border-color:rgba(100,181,246,.35);background-color:rgba(206,214,224,.2)}.window-list-item-box .progress{background-color:rgba(100,181,246,.15)}.window-list-item-demands-attention{background-gradient-direction:vertical;background-gradient-start:#ff5f45;background-gradient-end:#ff5f45}.window-list-preview{spacing:6px;color:#ced6e0;border:1px solid #4a515e;background-color:#57606f;border-radius:3px;padding:6px 12px 12px 12px;font-size:1em}.grouped-window-list-item-label{font-weight:bold;width:15em;min-width:5px}.grouped-window-list-item-box{text-align:left;font-weight:bold;background-image:none;padding-top:0;padding-left:8px;padding-right:8px;transition-duration:100;color:rgba(206,214,224,.8)}.grouped-window-list-item-box.top,.grouped-window-list-item-box.bottom{border-bottom-width:2px}.grouped-window-list-item-box.top StLabel,.grouped-window-list-item-box.bottom StLabel{padding-left:2px}.grouped-window-list-item-box.right{padding-left:0px;padding-right:0px;border-right-width:2px}.grouped-window-list-item-box.right StBin{padding-right:0}.grouped-window-list-item-box.left{padding-left:0px;padding-right:0px;border-left-width:2px}.grouped-window-list-item-box.left StBin{padding-left:1px}.grouped-window-list-item-box:hover,.grouped-window-list-item-box:focus{color:#ced6e0;background-color:rgba(206,214,224,.3)}.grouped-window-list-item-box:active,.grouped-window-list-item-box:checked{color:#ced6e0;border-color:rgba(100,181,246,.35)}.grouped-window-list-item-box .progress{background-color:rgba(100,181,246,.15)}.grouped-window-list-item-demands-attention{background-gradient-direction:vertical;background-gradient-start:#ff5f45;background-gradient-end:#ff5f45}.grouped-window-list-thumbnail-label{padding-left:4px}.grouped-window-list-number-label{z-index:99;color:#d0d0d0}.grouped-window-list-badge{border-radius:256px;background-color:#4a4a4a}.grouped-window-list-button-label{padding-left:4px}.grouped-window-list-thumbnail-alert{background:rgba(255,52,52,.3)}.grouped-window-list-thumbnail-menu{color:#ced6e0;border:1px solid #4a515e;background-color:#57606f;border-radius:3px;padding:0px}.grouped-window-list-thumbnail-menu>StBoxLayout{padding:4px}.grouped-window-list-thumbnail-menu .item-box{padding:10px;border-radius:2px;spacing:4px}.grouped-window-list-thumbnail-menu .item-box:outlined{padding:8px;border:1px solid rgba(100,181,246,.35)}.grouped-window-list-thumbnail-menu .item-box:selected{border:1px solid rgba(100,181,246,.35)}.grouped-window-list-thumbnail-menu .thumbnail{width:256px}.grouped-window-list-thumbnail-menu .separator{width:1px;background:rgba(255,255,255,.2)}#overview-corner{background-image:url("common-assets/misc/overview.png")}#overview-corner:hover{background-image:url("common-assets/misc/overview-hover.png")}.applet-separator{padding:1px 4px}.applet-separator.vertical{padding:4px 1px}.applet-separator-line{width:1px;background:rgba(255,255,255,.12)}.applet-separator-line-vertical{height:1px;background:rgba(255,255,255,.12)}.applet-box{padding-left:4px;padding-right:4px;spacing:4px;color:#ced6e0;text-shadow:none;transition-duration:100;text-align:center}.applet-box.vertical{padding-left:0px;padding-right:0px;padding-top:3px;padding-bottom:3px}.applet-box:hover,.applet-box:checked{color:#f2f5fc;background-color:rgba(100,181,246,.35)}.applet-box:highlight{background-image:none;-o-border-image:none;border-image:none;background-color:rgba(252,118,97,.5)}.applet-label{font-weight:bold;color:#ced6e0}.applet-label:hover,.applet-label:checked,.applet-box:hover .applet-label,.applet-box:checked .applet-label{color:#f2f5fc;text-shadow:none}.applet-icon{color:#f2f5fc;icon-size:22px}.applet-icon:hover,.applet-icon:checked,.applet-box:hover>.applet-icon,.applet-box:checked>.applet-icon{color:#f2f5fc;text-shadow:none}.user-icon{width:32px;height:32px;background-color:transparent;border:none;border-radius:0}.user-label{color:#ced6e0;font-size:1em;font-weight:bold;margin:0px}.desklet{color:#ced6e0}.desklet:highlight{background-color:rgba(252,118,97,.5)}.desklet-with-borders{border:1px solid #4a515e;border-radius:5px;background-color:#57606f;color:#ced6e0;padding:12px;padding-bottom:16px}.desklet-with-borders:highlight{background-color:rgba(252,118,97,.5)}.desklet-with-borders-and-header{border:1px solid #4a515e;border-top-width:0;border-radius:0 0 5px 5px;background-color:#57606f;color:#ced6e0;border-radius:0;border-radius-topleft:0;border-radius-topright:0;padding:12px;padding-bottom:17px}.desklet-with-borders-and-header:highlight{background-color:rgba(252,118,97,.5)}.desklet-header{border:1px solid #4a515e;border-radius:5px 5px 0 0;background-color:#505966;color:#ced6e0;font-size:1em;padding:12px;padding-bottom:6px}.desklet-drag-placeholder{border:2px solid rgba(100,181,246,.35);background-color:rgba(100,181,246,0)}.photoframe-box{border:1px solid #4a515e;border-radius:5px;background-color:#57606f;color:#ced6e0;padding:12px;padding-bottom:16px}.notification-applet-padding{padding:.5em 1em}.notification-applet-container{max-height:100px}.tile-preview{background-color:rgba(100,181,246,0);border:1px solid rgba(100,181,246,.35)}.tile-preview.snap{background-color:rgba(100,181,246,0)}.tile-hud{background-color:rgba(100,181,246,0);border:1px solid rgba(100,181,246,.35)}.tile-hud.snap{background-color:rgba(100,181,246,0)}.tile-hud:top{border-top-width:0px}.tile-hud:bottom{border-bottom-width:0px}.tile-hud:left{border-left-width:0px}.tile-hud:right{border-right-width:0px}.tile-hud:top-left{border-top-width:0px;border-left-width:0px}.tile-hud:top-right{border-top-width:0px;border-right-width:0px}.tile-hud:bottom-left{border-bottom-width:0px;border-left-width:0px}.tile-hud:bottom-right{border-bottom-width:0px;border-right-width:0px}.xkcd-box{padding:6px;border:0px;background-color:rgba(0,0,0,0);border-radius:0px} \ No newline at end of file diff --git a/cinnamon/sass/cinnamon.scss b/cinnamon/sass/cinnamon.scss index 10abd7a..d09a2e6 100644 --- a/cinnamon/sass/cinnamon.scss +++ b/cinnamon/sass/cinnamon.scss @@ -288,11 +288,11 @@ StScrollBar { .ripple-box { width: 104px; height: 104px; - background-image: url('common-assets/misc/corner-ripple.svg'); + background-image: url('assets/misc/corner-ripple.svg'); background-size: contain; &:rtl { - background-image: url('common-assets/misc/corner-ripple.svg'); + background-image: url('assets/misc/corner-ripple.svg'); } } diff --git a/cinnamon/sass/ui/calendar.scss b/cinnamon/sass/ui/calendar.scss index 9b87654..8fc649d 100644 --- a/cinnamon/sass/ui/calendar.scss +++ b/cinnamon/sass/ui/calendar.scss @@ -187,54 +187,54 @@ //arrow back .calendar-change-month-back { - background-image: url('common-assets/misc/calendar-arrow-left.svg'); + background-image: url('assets/misc/calendar-arrow-left.svg'); &:focus, &:hover { - background-image: url('common-assets/misc/calendar-arrow-left-hover.svg'); + background-image: url('assets/misc/calendar-arrow-left-hover.svg'); } &:active { - background-image: url('common-assets/misc/calendar-arrow-left.svg'); + background-image: url('assets/misc/calendar-arrow-left.svg'); } &:rtl { - background-image: url('common-assets/misc/calendar-arrow-right.svg'); + background-image: url('assets/misc/calendar-arrow-right.svg'); &:focus, &:hover { - background-image: url('common-assets/misc/calendar-arrow-right-hover.svg'); + background-image: url('assets/misc/calendar-arrow-right-hover.svg'); } &:active { - background-image: url('common-assets/misc/calendar-arrow-right.svg'); + background-image: url('assets/misc/calendar-arrow-right.svg'); } } } //arrow forward .calendar-change-month-forward { - background-image: url('common-assets/misc/calendar-arrow-right.svg'); + background-image: url('assets/misc/calendar-arrow-right.svg'); &:focus, &:hover { - background-image: url('common-assets/misc/calendar-arrow-right-hover.svg'); + background-image: url('assets/misc/calendar-arrow-right-hover.svg'); } &:active { - background-image: url('common-assets/misc/calendar-arrow-right.svg'); + background-image: url('assets/misc/calendar-arrow-right.svg'); } &:rtl { - background-image: url('common-assets/misc/calendar-arrow-left.svg'); + background-image: url('assets/misc/calendar-arrow-left.svg'); &:focus, &:hover { - background-image: url('common-assets/misc/calendar-arrow-left-hover.svg'); + background-image: url('assets/misc/calendar-arrow-left-hover.svg'); } &:active { - background-image: url('common-assets/misc/calendar-arrow-left.svg'); + background-image: url('assets/misc/calendar-arrow-left.svg'); } } } @@ -262,8 +262,7 @@ &:hover { color: $selected_fg_color; - background-color: $selected_bg_color; - background-color: transparentize($selected_bg_color, 0.2); + border-color: $selected_bg_color; } } @@ -271,8 +270,7 @@ color: $selected_fg_color; margin-top: 16px; margin-bottom: 0; - font-size: 1.2em; - font-weight: bold; + font-size: 1.1em; } // .calendar-day { diff --git a/cinnamon/sass/ui/form.scss b/cinnamon/sass/ui/form.scss index 2665ae4..d060ef9 100644 --- a/cinnamon/sass/ui/form.scss +++ b/cinnamon/sass/ui/form.scss @@ -34,19 +34,19 @@ StBin { width: 16px; height: 16px; - background-image: url('#{$asset_path}/checkbox/checkbox-unchecked.svg'); + background-image: url('assets/checkbox/checkbox-unchecked.svg'); } &:focus StBin { - background-image: url('#{$asset_path}/checkbox/checkbox-unchecked-focused.svg'); + background-image: url('assets/checkbox/checkbox-unchecked-focused.svg'); } &:checked StBin { - background-image: url('#{$asset_path}/checkbox/checkbox-checked.svg'); + background-image: url('assets/checkbox/checkbox-checked.svg'); } &:focus:checked StBin { - background-image: url('#{$asset_path}/checkbox/checkbox-checked-focused.svg'); + background-image: url('assets/checkbox/checkbox-checked-focused.svg'); } } @@ -69,19 +69,19 @@ StBin { width: 16px; height: 16px; - background-image: url('#{$asset_path}/checkbox/checkbox-unchecked.svg'); + background-image: url('assets/checkbox/checkbox-unchecked.svg'); } &:focus StBin { - background-image: url('#{$asset_path}/checkbox/checkbox-unchecked-focused.svg'); + background-image: url('assets/checkbox/checkbox-unchecked-focused.svg'); } &:checked StBin { - background-image: url('#{$asset_path}/checkbox/checkbox-checked.svg'); + background-image: url('assets/checkbox/checkbox-checked.svg'); } &:focus:checked StBin { - background-image: url('#{$asset_path}/checkbox/checkbox-checked-focused.svg'); + background-image: url('assets/checkbox/checkbox-checked-focused.svg'); } } @@ -95,10 +95,10 @@ &-us, &-intl { - background-image: url('#{$asset_path}/switch/switch-off.svg'); + background-image: url('assets/switch/switch-off.svg'); &:checked { - background-image: url('#{$asset_path}/switch/switch-on.svg'); + background-image: url('assets/switch/switch-on.svg'); } } } diff --git a/cinnamon/sass/ui/menu.scss b/cinnamon/sass/ui/menu.scss index a7cbc46..ce5d555 100644 --- a/cinnamon/sass/ui/menu.scss +++ b/cinnamon/sass/ui/menu.scss @@ -5,7 +5,7 @@ color: $fg_color; border: 0; border-radius: 12px; - background-color: transparentize($bg_color, 0.1); + background-color: transparentize($bg_color, 0.05); } .popup-sub-menu { @@ -120,8 +120,8 @@ &-favorites-box { padding: 10px; transition-duration: 300; - background-color: transparentize($base_color, 0.7); - border: 0; + background-color: transparentize($base_color, 0.5); + border: 1px solid transparentize($grey_color, .5); border-radius: 6px; } @@ -244,11 +244,12 @@ #menu-search-entry { width: 220px; min-height: 16px; + margin-right:10px; font-weight: normal; - border: 0; + border: 1px solid $grey_color; border-radius: 6px; caret-color: $fg_color; - background-color: transparentize($grey_color, 0.35); + background-color: $base_color; @extend %entry; &:focus, @@ -259,6 +260,7 @@ .menu-search-entry-icon { icon-size: 1em; + margin-right:6px; color: $fg_color; } diff --git a/cinnamon/sass/ui/notify.scss b/cinnamon/sass/ui/notify.scss index b815144..eba8814 100644 --- a/cinnamon/sass/ui/notify.scss +++ b/cinnamon/sass/ui/notify.scss @@ -14,7 +14,7 @@ .popup-menu & { color: $fg_color; - border-image: url('#{$asset_path}/misc/message.svg') 9 9 9 9; + border-image: url('assets/misc/message.svg') 9 9 9 9; .notification-button, .notification-icon-button { diff --git a/cinnamon/sass/ui/win.scss b/cinnamon/sass/ui/win.scss index d252846..01ecec8 100644 --- a/cinnamon/sass/ui/win.scss +++ b/cinnamon/sass/ui/win.scss @@ -287,9 +287,9 @@ // Overview corner // #overview-corner { - background-image: url('common-assets/misc/overview.png'); + background-image: url('assets/misc/overview.png'); &:hover { - background-image: url('common-assets/misc/overview-hover.png'); + background-image: url('assets/misc/overview-hover.png'); } } diff --git a/cinnamon/sass/var/var.scss b/cinnamon/sass/var/var.scss index 22accef..db59ea5 100644 --- a/cinnamon/sass/var/var.scss +++ b/cinnamon/sass/var/var.scss @@ -4,9 +4,9 @@ * @date 2022/05/05 14:02:55 */ -$asset_path: dark-assets; - $selected_bg_color: rgba(100, 181, 246, 0.35); +$selected_fg_color: #f2f5fc; + $highlight_color: #64b5f6; $base_color: #3c4d5e; @@ -15,8 +15,6 @@ $bg_color: #57606f; $fg_color: #ced6e0; $grey_color: #86909b; -$selected_fg_color: #f2f5fc; - $borders_color: darken($bg_color, 6%); $separator_color: darken($grey_color, 6%); diff --git a/gtk-2.0/assets-dark.svg b/gtk-2.0/assets-dark.svg deleted file mode 100644 index ecac130..0000000 --- a/gtk-2.0/assets-dark.svg +++ /dev/null @@ -1,5288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gtk-2.0/assets-dark/arrow-down-insens.png b/gtk-2.0/assets-dark/arrow-down-insens.png deleted file mode 100644 index 39049a2..0000000 Binary files a/gtk-2.0/assets-dark/arrow-down-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-down-prelight.png b/gtk-2.0/assets-dark/arrow-down-prelight.png deleted file mode 100644 index a7ca38d..0000000 Binary files a/gtk-2.0/assets-dark/arrow-down-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-down-small-insens.png b/gtk-2.0/assets-dark/arrow-down-small-insens.png deleted file mode 100644 index d876205..0000000 Binary files a/gtk-2.0/assets-dark/arrow-down-small-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-down-small-prelight.png b/gtk-2.0/assets-dark/arrow-down-small-prelight.png deleted file mode 100644 index 70297cf..0000000 Binary files a/gtk-2.0/assets-dark/arrow-down-small-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-down-small.png b/gtk-2.0/assets-dark/arrow-down-small.png deleted file mode 100644 index 45eb1cb..0000000 Binary files a/gtk-2.0/assets-dark/arrow-down-small.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-down.png b/gtk-2.0/assets-dark/arrow-down.png deleted file mode 100644 index 004cf94..0000000 Binary files a/gtk-2.0/assets-dark/arrow-down.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-left-insens.png b/gtk-2.0/assets-dark/arrow-left-insens.png deleted file mode 100644 index 7653f87..0000000 Binary files a/gtk-2.0/assets-dark/arrow-left-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-left-prelight.png b/gtk-2.0/assets-dark/arrow-left-prelight.png deleted file mode 100644 index 8e71a13..0000000 Binary files a/gtk-2.0/assets-dark/arrow-left-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-left.png b/gtk-2.0/assets-dark/arrow-left.png deleted file mode 100644 index 03af616..0000000 Binary files a/gtk-2.0/assets-dark/arrow-left.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-right-insens.png b/gtk-2.0/assets-dark/arrow-right-insens.png deleted file mode 100644 index a2b04ba..0000000 Binary files a/gtk-2.0/assets-dark/arrow-right-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-right-prelight.png b/gtk-2.0/assets-dark/arrow-right-prelight.png deleted file mode 100644 index 47ef3c8..0000000 Binary files a/gtk-2.0/assets-dark/arrow-right-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-right.png b/gtk-2.0/assets-dark/arrow-right.png deleted file mode 100644 index 0d3982e..0000000 Binary files a/gtk-2.0/assets-dark/arrow-right.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-up-insens.png b/gtk-2.0/assets-dark/arrow-up-insens.png deleted file mode 100644 index 0723570..0000000 Binary files a/gtk-2.0/assets-dark/arrow-up-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-up-prelight.png b/gtk-2.0/assets-dark/arrow-up-prelight.png deleted file mode 100644 index abf473e..0000000 Binary files a/gtk-2.0/assets-dark/arrow-up-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-up-small-insens.png b/gtk-2.0/assets-dark/arrow-up-small-insens.png deleted file mode 100644 index 3872524..0000000 Binary files a/gtk-2.0/assets-dark/arrow-up-small-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-up-small-prelight.png b/gtk-2.0/assets-dark/arrow-up-small-prelight.png deleted file mode 100644 index b013b5d..0000000 Binary files a/gtk-2.0/assets-dark/arrow-up-small-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-up-small.png b/gtk-2.0/assets-dark/arrow-up-small.png deleted file mode 100644 index 3197e55..0000000 Binary files a/gtk-2.0/assets-dark/arrow-up-small.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/arrow-up.png b/gtk-2.0/assets-dark/arrow-up.png deleted file mode 100644 index d2b02e5..0000000 Binary files a/gtk-2.0/assets-dark/arrow-up.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/button-active.png b/gtk-2.0/assets-dark/button-active.png deleted file mode 100644 index 2d92fb9..0000000 Binary files a/gtk-2.0/assets-dark/button-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/button-hover.png b/gtk-2.0/assets-dark/button-hover.png deleted file mode 100644 index 822be9a..0000000 Binary files a/gtk-2.0/assets-dark/button-hover.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/button-insensitive.png b/gtk-2.0/assets-dark/button-insensitive.png deleted file mode 100644 index 1f872c3..0000000 Binary files a/gtk-2.0/assets-dark/button-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/button.png b/gtk-2.0/assets-dark/button.png deleted file mode 100644 index 5a3e7d0..0000000 Binary files a/gtk-2.0/assets-dark/button.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/checkbox-checked-insensitive.png b/gtk-2.0/assets-dark/checkbox-checked-insensitive.png deleted file mode 100644 index 487c5c9..0000000 Binary files a/gtk-2.0/assets-dark/checkbox-checked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/checkbox-checked.png b/gtk-2.0/assets-dark/checkbox-checked.png deleted file mode 100644 index 9f6799a..0000000 Binary files a/gtk-2.0/assets-dark/checkbox-checked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/checkbox-unchecked-insensitive.png b/gtk-2.0/assets-dark/checkbox-unchecked-insensitive.png deleted file mode 100644 index af6c77d..0000000 Binary files a/gtk-2.0/assets-dark/checkbox-unchecked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/checkbox-unchecked.png b/gtk-2.0/assets-dark/checkbox-unchecked.png deleted file mode 100644 index 8d38389..0000000 Binary files a/gtk-2.0/assets-dark/checkbox-unchecked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png b/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png deleted file mode 100644 index 0883c55..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-button-active-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-button-active.png b/gtk-2.0/assets-dark/combo-entry-button-active.png deleted file mode 100644 index 164af5f..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-button-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-button-insensitive-rtl.png b/gtk-2.0/assets-dark/combo-entry-button-insensitive-rtl.png deleted file mode 100644 index 294edc4..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-button-insensitive-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-button-insensitive.png b/gtk-2.0/assets-dark/combo-entry-button-insensitive.png deleted file mode 100644 index 996f9c3..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-button-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-button-rtl.png b/gtk-2.0/assets-dark/combo-entry-button-rtl.png deleted file mode 100644 index 86de7a3..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-button-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-button.png b/gtk-2.0/assets-dark/combo-entry-button.png deleted file mode 100644 index d7dd2bf..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-button.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png b/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png deleted file mode 100644 index ed48c6b..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-focus-notebook-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-focus-notebook.png b/gtk-2.0/assets-dark/combo-entry-focus-notebook.png deleted file mode 100644 index a4128f6..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-focus-notebook.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-focus-rtl.png b/gtk-2.0/assets-dark/combo-entry-focus-rtl.png deleted file mode 100644 index 648ca67..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-focus-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-focus.png b/gtk-2.0/assets-dark/combo-entry-focus.png deleted file mode 100644 index 243696a..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-focus.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png b/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png deleted file mode 100644 index b1e058c..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-insensitive-notebook-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png b/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png deleted file mode 100644 index 5030f75..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-insensitive-notebook.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png b/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png deleted file mode 100644 index 52c6097..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-insensitive-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-insensitive.png b/gtk-2.0/assets-dark/combo-entry-insensitive.png deleted file mode 100644 index e103c4a..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png b/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png deleted file mode 100644 index 9499e0c..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-notebook-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-notebook.png b/gtk-2.0/assets-dark/combo-entry-notebook.png deleted file mode 100644 index 6160331..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-notebook.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry-rtl.png b/gtk-2.0/assets-dark/combo-entry-rtl.png deleted file mode 100644 index e236ab3..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/combo-entry.png b/gtk-2.0/assets-dark/combo-entry.png deleted file mode 100644 index ca4318d..0000000 Binary files a/gtk-2.0/assets-dark/combo-entry.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/down-background-disable-rtl.png b/gtk-2.0/assets-dark/down-background-disable-rtl.png deleted file mode 100644 index 3cfdd57..0000000 Binary files a/gtk-2.0/assets-dark/down-background-disable-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/down-background-disable.png b/gtk-2.0/assets-dark/down-background-disable.png deleted file mode 100644 index ff532eb..0000000 Binary files a/gtk-2.0/assets-dark/down-background-disable.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/down-background-rtl.png b/gtk-2.0/assets-dark/down-background-rtl.png deleted file mode 100644 index 6eb7bbd..0000000 Binary files a/gtk-2.0/assets-dark/down-background-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/down-background.png b/gtk-2.0/assets-dark/down-background.png deleted file mode 100644 index 134101a..0000000 Binary files a/gtk-2.0/assets-dark/down-background.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/entry-border-active-bg-solid.png b/gtk-2.0/assets-dark/entry-border-active-bg-solid.png deleted file mode 100644 index 79e8c32..0000000 Binary files a/gtk-2.0/assets-dark/entry-border-active-bg-solid.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/entry-border-active-bg.png b/gtk-2.0/assets-dark/entry-border-active-bg.png deleted file mode 100644 index bf9f268..0000000 Binary files a/gtk-2.0/assets-dark/entry-border-active-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/entry-border-bg-solid.png b/gtk-2.0/assets-dark/entry-border-bg-solid.png deleted file mode 100644 index a9d669e..0000000 Binary files a/gtk-2.0/assets-dark/entry-border-bg-solid.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/entry-border-bg.png b/gtk-2.0/assets-dark/entry-border-bg.png deleted file mode 100644 index 8aa5f4d..0000000 Binary files a/gtk-2.0/assets-dark/entry-border-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/entry-border-disabled-bg.png b/gtk-2.0/assets-dark/entry-border-disabled-bg.png deleted file mode 100644 index 42d6894..0000000 Binary files a/gtk-2.0/assets-dark/entry-border-disabled-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/entry-border-fill.png b/gtk-2.0/assets-dark/entry-border-fill.png deleted file mode 100644 index 15d83a1..0000000 Binary files a/gtk-2.0/assets-dark/entry-border-fill.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/focus-line.png b/gtk-2.0/assets-dark/focus-line.png deleted file mode 100644 index a6f1fe0..0000000 Binary files a/gtk-2.0/assets-dark/focus-line.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/frame-gap-end.png b/gtk-2.0/assets-dark/frame-gap-end.png deleted file mode 100644 index 99645fc..0000000 Binary files a/gtk-2.0/assets-dark/frame-gap-end.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/frame-gap-start.png b/gtk-2.0/assets-dark/frame-gap-start.png deleted file mode 100644 index 99645fc..0000000 Binary files a/gtk-2.0/assets-dark/frame-gap-start.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/frame.png b/gtk-2.0/assets-dark/frame.png deleted file mode 100644 index 53f4b6e..0000000 Binary files a/gtk-2.0/assets-dark/frame.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/handle-h.png b/gtk-2.0/assets-dark/handle-h.png deleted file mode 100644 index 7d9ccf3..0000000 Binary files a/gtk-2.0/assets-dark/handle-h.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/handle-v.png b/gtk-2.0/assets-dark/handle-v.png deleted file mode 100644 index 878ed87..0000000 Binary files a/gtk-2.0/assets-dark/handle-v.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/inline-toolbar.png b/gtk-2.0/assets-dark/inline-toolbar.png deleted file mode 100644 index c7c8df0..0000000 Binary files a/gtk-2.0/assets-dark/inline-toolbar.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/line-h.png b/gtk-2.0/assets-dark/line-h.png deleted file mode 100644 index a0987d4..0000000 Binary files a/gtk-2.0/assets-dark/line-h.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/line-v.png b/gtk-2.0/assets-dark/line-v.png deleted file mode 100644 index efca285..0000000 Binary files a/gtk-2.0/assets-dark/line-v.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-arrow-prelight.png b/gtk-2.0/assets-dark/menu-arrow-prelight.png deleted file mode 100644 index 1c6589b..0000000 Binary files a/gtk-2.0/assets-dark/menu-arrow-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-arrow.png b/gtk-2.0/assets-dark/menu-arrow.png deleted file mode 100644 index 7a8b544..0000000 Binary files a/gtk-2.0/assets-dark/menu-arrow.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png b/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png deleted file mode 100644 index fe6c65f..0000000 Binary files a/gtk-2.0/assets-dark/menu-checkbox-checked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-checkbox-checked.png b/gtk-2.0/assets-dark/menu-checkbox-checked.png deleted file mode 100644 index ce30142..0000000 Binary files a/gtk-2.0/assets-dark/menu-checkbox-checked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-checkbox-unchecked-insensitive.png b/gtk-2.0/assets-dark/menu-checkbox-unchecked-insensitive.png deleted file mode 100644 index 7a0e4ae..0000000 Binary files a/gtk-2.0/assets-dark/menu-checkbox-unchecked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-checkbox-unchecked.png b/gtk-2.0/assets-dark/menu-checkbox-unchecked.png deleted file mode 100644 index 09d6c31..0000000 Binary files a/gtk-2.0/assets-dark/menu-checkbox-unchecked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png b/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png deleted file mode 100644 index 08c24da..0000000 Binary files a/gtk-2.0/assets-dark/menu-radio-checked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-radio-checked.png b/gtk-2.0/assets-dark/menu-radio-checked.png deleted file mode 100644 index 7fce21e..0000000 Binary files a/gtk-2.0/assets-dark/menu-radio-checked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-radio-unchecked-insensitive.png b/gtk-2.0/assets-dark/menu-radio-unchecked-insensitive.png deleted file mode 100644 index c005a94..0000000 Binary files a/gtk-2.0/assets-dark/menu-radio-unchecked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menu-radio-unchecked.png b/gtk-2.0/assets-dark/menu-radio-unchecked.png deleted file mode 100644 index e3c1cac..0000000 Binary files a/gtk-2.0/assets-dark/menu-radio-unchecked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menubar.png b/gtk-2.0/assets-dark/menubar.png deleted file mode 100644 index 054e05c..0000000 Binary files a/gtk-2.0/assets-dark/menubar.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menubar_button.png b/gtk-2.0/assets-dark/menubar_button.png deleted file mode 100644 index a9b0953..0000000 Binary files a/gtk-2.0/assets-dark/menubar_button.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/menuitem.png b/gtk-2.0/assets-dark/menuitem.png deleted file mode 100644 index c1f1aab..0000000 Binary files a/gtk-2.0/assets-dark/menuitem.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/minus.png b/gtk-2.0/assets-dark/minus.png deleted file mode 100644 index 95503c5..0000000 Binary files a/gtk-2.0/assets-dark/minus.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png b/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png deleted file mode 100644 index e279914..0000000 Binary files a/gtk-2.0/assets-dark/notebook-entry-border-active-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/notebook-entry-border-bg.png b/gtk-2.0/assets-dark/notebook-entry-border-bg.png deleted file mode 100644 index c5402bf..0000000 Binary files a/gtk-2.0/assets-dark/notebook-entry-border-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png b/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png deleted file mode 100644 index a3b73bf..0000000 Binary files a/gtk-2.0/assets-dark/notebook-entry-border-disabled-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/notebook-gap-horiz.png b/gtk-2.0/assets-dark/notebook-gap-horiz.png deleted file mode 100644 index b217162..0000000 Binary files a/gtk-2.0/assets-dark/notebook-gap-horiz.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/notebook-gap-vert.png b/gtk-2.0/assets-dark/notebook-gap-vert.png deleted file mode 100644 index c123ea3..0000000 Binary files a/gtk-2.0/assets-dark/notebook-gap-vert.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/notebook.png b/gtk-2.0/assets-dark/notebook.png deleted file mode 100644 index 53f4b6e..0000000 Binary files a/gtk-2.0/assets-dark/notebook.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/null.png b/gtk-2.0/assets-dark/null.png deleted file mode 100644 index d82fb34..0000000 Binary files a/gtk-2.0/assets-dark/null.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/plus.png b/gtk-2.0/assets-dark/plus.png deleted file mode 100644 index 9a6b567..0000000 Binary files a/gtk-2.0/assets-dark/plus.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/progressbar.png b/gtk-2.0/assets-dark/progressbar.png deleted file mode 100644 index 8137c0d..0000000 Binary files a/gtk-2.0/assets-dark/progressbar.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/progressbar_v.png b/gtk-2.0/assets-dark/progressbar_v.png deleted file mode 100644 index 2fb74bd..0000000 Binary files a/gtk-2.0/assets-dark/progressbar_v.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/radio-checked-insensitive.png b/gtk-2.0/assets-dark/radio-checked-insensitive.png deleted file mode 100644 index 059ab03..0000000 Binary files a/gtk-2.0/assets-dark/radio-checked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/radio-checked.png b/gtk-2.0/assets-dark/radio-checked.png deleted file mode 100644 index 7d034fc..0000000 Binary files a/gtk-2.0/assets-dark/radio-checked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/radio-unchecked-insensitive.png b/gtk-2.0/assets-dark/radio-unchecked-insensitive.png deleted file mode 100644 index dfbba95..0000000 Binary files a/gtk-2.0/assets-dark/radio-unchecked-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/radio-unchecked.png b/gtk-2.0/assets-dark/radio-unchecked.png deleted file mode 100644 index b307bf1..0000000 Binary files a/gtk-2.0/assets-dark/radio-unchecked.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-horiz-active.png b/gtk-2.0/assets-dark/slider-horiz-active.png deleted file mode 100644 index 6c13323..0000000 Binary files a/gtk-2.0/assets-dark/slider-horiz-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-horiz-insens.png b/gtk-2.0/assets-dark/slider-horiz-insens.png deleted file mode 100644 index 5f74682..0000000 Binary files a/gtk-2.0/assets-dark/slider-horiz-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-horiz-prelight.png b/gtk-2.0/assets-dark/slider-horiz-prelight.png deleted file mode 100644 index 08e46a5..0000000 Binary files a/gtk-2.0/assets-dark/slider-horiz-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-horiz.png b/gtk-2.0/assets-dark/slider-horiz.png deleted file mode 100644 index 8ab3ec9..0000000 Binary files a/gtk-2.0/assets-dark/slider-horiz.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-insensitive.png b/gtk-2.0/assets-dark/slider-insensitive.png deleted file mode 100644 index 1bb7162..0000000 Binary files a/gtk-2.0/assets-dark/slider-insensitive.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-prelight.png b/gtk-2.0/assets-dark/slider-prelight.png deleted file mode 100644 index 1bf48ed..0000000 Binary files a/gtk-2.0/assets-dark/slider-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-vert-active.png b/gtk-2.0/assets-dark/slider-vert-active.png deleted file mode 100644 index 98c2d2c..0000000 Binary files a/gtk-2.0/assets-dark/slider-vert-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-vert-insens.png b/gtk-2.0/assets-dark/slider-vert-insens.png deleted file mode 100644 index 70c8ca8..0000000 Binary files a/gtk-2.0/assets-dark/slider-vert-insens.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-vert-prelight.png b/gtk-2.0/assets-dark/slider-vert-prelight.png deleted file mode 100644 index d388402..0000000 Binary files a/gtk-2.0/assets-dark/slider-vert-prelight.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider-vert.png b/gtk-2.0/assets-dark/slider-vert.png deleted file mode 100644 index 653154c..0000000 Binary files a/gtk-2.0/assets-dark/slider-vert.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/slider.png b/gtk-2.0/assets-dark/slider.png deleted file mode 100644 index b1f8d19..0000000 Binary files a/gtk-2.0/assets-dark/slider.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/tab-bottom-active.png b/gtk-2.0/assets-dark/tab-bottom-active.png deleted file mode 100644 index a5c3df7..0000000 Binary files a/gtk-2.0/assets-dark/tab-bottom-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/tab-left-active.png b/gtk-2.0/assets-dark/tab-left-active.png deleted file mode 100644 index a1278db..0000000 Binary files a/gtk-2.0/assets-dark/tab-left-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/tab-right-active.png b/gtk-2.0/assets-dark/tab-right-active.png deleted file mode 100644 index c8be1d5..0000000 Binary files a/gtk-2.0/assets-dark/tab-right-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/tab-top-active.png b/gtk-2.0/assets-dark/tab-top-active.png deleted file mode 100644 index 26949a8..0000000 Binary files a/gtk-2.0/assets-dark/tab-top-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png b/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png deleted file mode 100644 index 0ecfbd0..0000000 Binary files a/gtk-2.0/assets-dark/toolbar-entry-border-active-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/toolbar-entry-border-bg.png b/gtk-2.0/assets-dark/toolbar-entry-border-bg.png deleted file mode 100644 index c62ebd5..0000000 Binary files a/gtk-2.0/assets-dark/toolbar-entry-border-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png b/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png deleted file mode 100644 index 267d30b..0000000 Binary files a/gtk-2.0/assets-dark/toolbar-entry-border-disabled-bg.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/toolbar.png b/gtk-2.0/assets-dark/toolbar.png deleted file mode 100644 index 27e7dec..0000000 Binary files a/gtk-2.0/assets-dark/toolbar.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/tree_header.png b/gtk-2.0/assets-dark/tree_header.png deleted file mode 100644 index c6e7fa7..0000000 Binary files a/gtk-2.0/assets-dark/tree_header.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-horizontal-active.png b/gtk-2.0/assets-dark/trough-horizontal-active.png deleted file mode 100644 index bd95fce..0000000 Binary files a/gtk-2.0/assets-dark/trough-horizontal-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-horizontal.png b/gtk-2.0/assets-dark/trough-horizontal.png deleted file mode 100644 index d7904e6..0000000 Binary files a/gtk-2.0/assets-dark/trough-horizontal.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-progressbar.png b/gtk-2.0/assets-dark/trough-progressbar.png deleted file mode 100644 index ac062a5..0000000 Binary files a/gtk-2.0/assets-dark/trough-progressbar.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-progressbar_v.png b/gtk-2.0/assets-dark/trough-progressbar_v.png deleted file mode 100644 index bcb8fcd..0000000 Binary files a/gtk-2.0/assets-dark/trough-progressbar_v.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-scrollbar-horiz.png b/gtk-2.0/assets-dark/trough-scrollbar-horiz.png deleted file mode 100644 index cf2a482..0000000 Binary files a/gtk-2.0/assets-dark/trough-scrollbar-horiz.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-scrollbar-vert.png b/gtk-2.0/assets-dark/trough-scrollbar-vert.png deleted file mode 100644 index 6c56642..0000000 Binary files a/gtk-2.0/assets-dark/trough-scrollbar-vert.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-vertical-active.png b/gtk-2.0/assets-dark/trough-vertical-active.png deleted file mode 100644 index 638ff7a..0000000 Binary files a/gtk-2.0/assets-dark/trough-vertical-active.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/trough-vertical.png b/gtk-2.0/assets-dark/trough-vertical.png deleted file mode 100644 index 3ba143f..0000000 Binary files a/gtk-2.0/assets-dark/trough-vertical.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/up-background-disable-rtl.png b/gtk-2.0/assets-dark/up-background-disable-rtl.png deleted file mode 100644 index 6d31221..0000000 Binary files a/gtk-2.0/assets-dark/up-background-disable-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/up-background-disable.png b/gtk-2.0/assets-dark/up-background-disable.png deleted file mode 100644 index b67bf80..0000000 Binary files a/gtk-2.0/assets-dark/up-background-disable.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/up-background-rtl.png b/gtk-2.0/assets-dark/up-background-rtl.png deleted file mode 100644 index 2944a0c..0000000 Binary files a/gtk-2.0/assets-dark/up-background-rtl.png and /dev/null differ diff --git a/gtk-2.0/assets-dark/up-background.png b/gtk-2.0/assets-dark/up-background.png deleted file mode 100644 index 1a9fa30..0000000 Binary files a/gtk-2.0/assets-dark/up-background.png and /dev/null differ diff --git a/gtk-2.0/assets.svg b/gtk-2.0/assets.svg index 4df15b7..b2be803 100644 --- a/gtk-2.0/assets.svg +++ b/gtk-2.0/assets.svg @@ -1,5254 +1,2183 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - + + - - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - + + + + + + - - - - - + + + + + d="M11.632 1027.283v6.01H8.627v1.989h3.005l2.01.022-.021-2.011.022-5.988-2.011-.023z" + id="rect3977-39-1-0" opacity="1" fill="#2b2b2b" fill-opacity="1" + stroke="none" /> - + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - + d="M20 1.375c-1.108 0-2 .892-2 2v10c0 1.108.892 2 2 2h10c1.108 0 2-.892 2-2v-10c0-1.108-.892-2-2-2H20zm0 1h10c.554 0 1 .446 1 1v10c0 .554-.446 1-1 1H20c-.554 0-1-.446-1-1v-10c0-.554.446-1 1-1z" + id="rect21848-4-4" opacity="1" fill="#262626" fill-opacity="1" + stroke="#000" stroke-width="0" stroke-linecap="butt" + stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" + stroke-dashoffset="0" stroke-opacity="1" /> + + + + - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - + + - - - - - - - - - + d="M20 1.375c-1.108 0-2 .892-2 2v10c0 1.108.892 2 2 2h10c1.108 0 2-.892 2-2v-10c0-1.108-.892-2-2-2H20zm0 1h10c.554 0 1 .446 1 1v10c0 .554-.446 1-1 1H20c-.554 0-1-.446-1-1v-10c0-.554.446-1 1-1z" + id="rect21848-8-5" opacity="1" fill="#262626" fill-opacity="1" + stroke="#000" stroke-width="0" stroke-linecap="butt" + stroke-linejoin="miter" stroke-miterlimit="4" stroke-dasharray="none" + stroke-dashoffset="0" stroke-opacity="1" /> + + + + - - - - - - - - - - - - + + + + + + + - - - - - + + + + + d="M47.281 64.781l-4.25 4.25-2.125-2.125-1.406 1.406 2.125 2.126 1.406 1.437 1.407-1.438 4.25-4.218-1.407-1.438z" + transform="rotate(-45 1191.065 589.868)" id="rect3977-39-1-5-5" + opacity="1" fill="#2b2b2b" fill-opacity="1" stroke="none" /> - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + - - - - + + + + - - - - - + + + + + - + - + d="M3 98v24h26V98H3zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-6 -377.638)" id="rect9321-6" opacity="1" + fill="#404040" stroke="none" /> + - + - + d="M37 98v24h26V98H37zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-6 -377.638)" id="rect9321-0-0" display="inline" + opacity="1" fill="#404040" stroke="none" /> + - - - - - + + + + + - - + + - + d="M3 173v24h26v-24H3zm3 1h20c.296 0 .554.134.736.338A2.483 2.483 0 0128 176.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 0126 196H6a.985.985 0 01-.736-.338A2.484 2.484 0 014 193.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 016 174z" + transform="translate(-6 -452.638)" id="rect9321-4" opacity="1" + fill="#383838" stroke="none" /> + - + - + d="M28 173v24h26v-24H28zm3 1h20c.296 0 .554.134.736.338A2.483 2.483 0 0153 176.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 0151 196H31a.985.985 0 01-.736-.338A2.483 2.483 0 0129 193.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 0131 174z" + transform="translate(3 -452.638)" id="rect9321-0-5" display="inline" + opacity="1" fill="#383838" stroke="none" /> + - - - - - + + + + + - + - + d="M3 203v24h26v-24H3zm3 1h20c.296 0 .554.134.736.338A2.483 2.483 0 0128 206.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 0126 226H6a.985.985 0 01-.736-.338A2.484 2.484 0 014 223.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 016 204z" + transform="translate(-6 -482.638)" id="rect9321-4-9" opacity="1" + fill="#404040" stroke="none" /> + - + - + d="M28 203v24h26v-24H28zm3 1h20c.296 0 .554.134.736.338A2.483 2.483 0 0153 206.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 0151 226H31a.985.985 0 01-.736-.338A2.483 2.483 0 0129 223.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 0131 204z" + transform="translate(3 -482.638)" id="rect9321-0-5-3" display="inline" + opacity="1" fill="#404040" stroke="none" /> + - - - - - + + + + + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - + - + d="M130 173v24h26v-24h-26zm3 1h20c.296 0 .554.134.736.338A2.484 2.484 0 01155 176.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 01153 196h-20a.985.985 0 01-.736-.338A2.484 2.484 0 01131 193.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 01133 174z" + transform="matrix(-1 0 0 1 153 -452.638)" id="rect9321-4-5" opacity="1" + fill="#383838" stroke="none" /> + - + - + d="M105 173v24h26v-24h-26zm3 1h20c.296 0 .554.134.736.338A2.484 2.484 0 01130 176.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 01128 196h-20a.985.985 0 01-.736-.338A2.484 2.484 0 01106 193.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 01108 174z" + transform="matrix(-1 0 0 1 162 -452.638)" id="rect9321-0-5-4" + display="inline" opacity="1" fill="#383838" stroke="none" /> + - - - - - + + + + + - + - + d="M130 203v24h26v-24h-26zm3 1h20c.296 0 .554.134.736.338A2.484 2.484 0 01155 206.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 01153 226h-20a.985.985 0 01-.736-.338A2.484 2.484 0 01131 223.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 01133 204z" + transform="matrix(-1 0 0 1 153 -482.638)" id="rect9321-4-9-9" + opacity="1" fill="#404040" stroke="none" /> + - + - + d="M105 203v24h26v-24h-26zm3 1h20c.296 0 .554.134.736.338A2.484 2.484 0 01130 206.5v17c0 .932-.511 1.732-1.264 2.162A.985.985 0 01128 226h-20a.985.985 0 01-.736-.338A2.484 2.484 0 01106 223.5v-17c0-.932.511-1.732 1.264-2.162A.985.985 0 01108 204z" + transform="matrix(-1 0 0 1 162 -482.638)" id="rect9321-0-5-3-7" + display="inline" opacity="1" fill="#404040" stroke="none" /> + - - - - - + + + + + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + - - + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + id="path8393" + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M14.777 290a.747.808 0 00-.164.02.747.808 0 00-.092.025.337.337 0 00-.117-.026c-.206 0-.375.181-.375.405 0 .037.011.07.02.105a.747.808 0 00.191.88l3.733 4.036.537.555.535-.555 3.732-4.037a.759.82 0 00.184-.84.424.424 0 00.027-.144c0-.224-.166-.404-.373-.404a.35.35 0 00-.136.029.759.82 0 00-.774.197l-3.195 3.457-3.198-3.457a.747.808 0 00-.535-.246z" + transform="matrix(1.33965 0 0 1.23839 164.205 391.843)" + id="path8393-9" color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" opacity="1" fill="#5c5c5c" + fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M25.777 290a.747.808 0 00-.164.02.747.808 0 00-.092.025.337.337 0 00-.117-.026c-.206 0-.375.181-.375.405 0 .037.011.07.02.105a.747.808 0 00.191.88l3.733 4.036.537.555.535-.555 3.732-4.037a.759.82 0 00.184-.84.424.424 0 00.027-.144c0-.224-.166-.404-.373-.404a.35.35 0 00-.136.029.759.82 0 00-.774.197l-3.195 3.457-3.198-3.457a.747.808 0 00-.535-.246z" + transform="matrix(1.33965 0 0 1.23839 149.468 391.843)" + id="path8393-0" color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#d0d0d0" + fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + - - + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + id="path8393-09" + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M20.18 298a.808.747 0 00-.588.24l-4.037 3.733-.555.537.555.535 4.037 3.732a.82.759 0 00.84.184.422.422 0 00.144.027c.224 0 .404-.166.404-.373a.352.352 0 00-.029-.137.82.759 0 00-.197-.773l-3.457-3.195 3.457-3.198a.808.747 0 00.226-.699.808.747 0 00-.025-.092.339.339 0 00.025-.117c0-.207-.18-.375-.404-.375-.038 0-.07.011-.105.02a.808.747 0 00-.291-.049z" + transform="matrix(0 -1.23839 1.33965 0 -216.256 776.982)" + id="path8393-09-9" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#5c5c5c" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M31.18 298a.808.747 0 00-.588.24l-4.037 3.733-.555.537.555.535 4.037 3.732a.82.759 0 00.84.184.422.422 0 00.144.027c.224 0 .404-.166.404-.373a.352.352 0 00-.029-.137.82.759 0 00-.197-.773l-3.457-3.195 3.457-3.198a.808.747 0 00.226-.699.808.747 0 00-.025-.092.339.339 0 00.025-.117c0-.207-.18-.375-.404-.375-.038 0-.07.011-.105.02a.808.747 0 00-.291-.049z" + transform="matrix(0 -1.23839 1.33965 0 -216.256 790.604)" + id="path8393-09-9-4" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#d0d0d0" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M26.82 309a.808.747 0 00-.29.049c-.035-.01-.068-.02-.106-.02-.224 0-.404.169-.404.375 0 .042.011.08.025.117a.808.747 0 00-.025.092.808.747 0 00.226.7l3.457 3.197-3.457 3.195a.82.759 0 00-.197.774.352.352 0 00-.03.136c0 .207.181.373.405.373.052 0 .099-.01.144-.027a.82.759 0 00.84-.184l4.037-3.732.555-.535-.555-.537-4.037-3.733a.808.747 0 00-.588-.24z" + transform="matrix(0 1.23839 1.33965 0 -230.992 718.778)" + id="path8393-09-3" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#d0d0d0" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M15.82 309a.808.747 0 00-.29.049c-.035-.01-.068-.02-.106-.02-.224 0-.404.169-.404.375 0 .042.011.08.025.117a.808.747 0 00-.025.092.808.747 0 00.226.7l3.457 3.197-3.457 3.195a.82.759 0 00-.197.774.352.352 0 00-.03.136c0 .207.181.373.405.373.052 0 .099-.01.144-.027a.82.759 0 00.84-.184l4.037-3.732.555-.535-.555-.537-4.037-3.733a.808.747 0 00-.588-.24z" + transform="matrix(0 1.23839 1.33965 0 -230.992 732.4)" + id="path8393-09-9-8" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#5c5c5c" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + - - + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + id="path8393-09-9-4-3" + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - - + + - - + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + id="path8393-05" + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M18.51 320l-.537.555-3.733 4.037a.747.808 0 00-.191.879c-.01.034-.02.067-.02.105 0 .224.169.404.375.404.042 0 .08-.011.117-.025a.747.808 0 00.092.025.747.808 0 00.7-.226l3.197-3.457 3.195 3.457a.759.82 0 00.774.197.35.35 0 00.136.03c.207 0 .373-.181.373-.405 0-.052-.01-.099-.027-.144a.759.82 0 00-.184-.84l-3.732-4.037-.535-.555z" + transform="matrix(1.33965 0 0 -1.23839 164.205 1154.69)" + id="path8393-9-7" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" opacity="1" + fill="#5c5c5c" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M29.51 320l-.537.555-3.733 4.037a.747.808 0 00-.191.879c-.01.034-.02.067-.02.105 0 .224.169.404.375.404.042 0 .08-.011.117-.025a.747.808 0 00.092.025.747.808 0 00.7-.226l3.197-3.457 3.195 3.457a.759.82 0 00.774.197.35.35 0 00.136.03c.207 0 .373-.181.373-.405 0-.052-.01-.099-.027-.144a.759.82 0 00-.184-.84l-3.732-4.037-.535-.555z" + transform="matrix(1.33965 0 0 -1.23839 149.468 1154.69)" + id="path8393-0-4" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#d0d0d0" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - - - + + + + - - + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + id="path8393-9-9" + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - - - - + + + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M51.605 291a.58.673 0 00-.128.016.58.673 0 00-.073.021.253.253 0 00-.09-.021c-.16 0-.29.151-.29.337 0 .025.017.04.02.063a.58.673 0 00.143.756l2.903 3.365.418.463.416-.463 2.902-3.365a.59.684 0 00.133-.73c.008-.032.031-.054.031-.089 0-.186-.128-.337-.289-.337a.256.256 0 00-.105.025.59.684 0 00-.604.164l-2.484 2.88-2.487-2.88a.58.673 0 00-.416-.205z" + transform="matrix(1.7224 0 0 1.48607 95.117 318.53)" + id="path8393-9-9-9" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" opacity="1" + fill="#5c5c5c" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - - - + + + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M61.605 291a.58.673 0 00-.128.016.58.673 0 00-.073.021.253.253 0 00-.09-.021c-.16 0-.29.151-.29.337 0 .025.017.04.02.063a.58.673 0 00.143.756l2.903 3.365.418.463.416-.463 2.902-3.365a.59.684 0 00.133-.73c.008-.032.031-.054.031-.089 0-.186-.128-.337-.289-.337a.256.256 0 00-.105.025.59.684 0 00-.604.164l-2.484 2.88-2.487-2.88a.58.673 0 00-.416-.205z" + transform="matrix(1.7224 0 0 1.48607 77.893 318.53)" + id="path8393-9-9-0" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#c7c7c7" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - - - + + + + - - + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + id="path8393-9-9-5" + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - - - - + + + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M54.508 298l-.418.463-2.903 3.365a.58.673 0 00-.142.756c-.004.023-.022.038-.022.062 0 .187.13.338.291.338.032 0 .062-.01.09-.021a.58.673 0 00.073.021.58.673 0 00.544-.19l2.487-2.88 2.484 2.88a.59.684 0 00.604.165.256.256 0 00.105.025c.161 0 .29-.151.29-.338 0-.034-.024-.056-.032-.087a.59.684 0 00-.133-.73l-2.902-3.366-.416-.463z" + transform="matrix(1.7224 0 0 -1.48607 95.117 1201.254)" + id="path8393-9-9-9-7" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" opacity="1" + fill="#5c5c5c" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - - - + + + + + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + d="M64.508 298l-.418.463-2.903 3.365a.58.673 0 00-.142.756c-.004.023-.022.038-.022.062 0 .187.13.338.291.338.032 0 .062-.01.09-.021a.58.673 0 00.073.021.58.673 0 00.544-.19l2.487-2.88 2.484 2.88a.59.684 0 00.604.165.256.256 0 00.105.025c.161 0 .29-.151.29-.338 0-.034-.024-.056-.032-.087a.59.684 0 00-.133-.73l-2.902-3.366-.416-.463z" + transform="matrix(1.7224 0 0 -1.48607 77.893 1201.254)" + id="path8393-9-9-0-4" color="#000" font-style="normal" + font-variant="normal" font-weight="400" font-stretch="normal" + font-size="medium" font-family="Sans" text-decoration="none" + letter-spacing="normal" word-spacing="normal" direction="ltr" + writing-mode="lr-tb" baseline-shift="baseline" text-anchor="start" + display="inline" overflow="visible" visibility="visible" + fill="#c7c7c7" fill-opacity="1" stroke="none" stroke-width="2" + enable-background="accumulate" /> - - - - - - - - - - + + - - + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + id="path8393-09-3-1" + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + color="#000" font-style="normal" font-variant="normal" + font-weight="400" font-stretch="normal" font-size="medium" + font-family="Sans" text-decoration="none" letter-spacing="normal" + word-spacing="normal" direction="ltr" writing-mode="lr-tb" + baseline-shift="baseline" text-anchor="start" display="inline" + overflow="visible" visibility="visible" fill="#939393" + stroke-width="2" enable-background="accumulate" /> + + - - - - - - - - - + - - + d="M183.781 751a1 1 0 00-.5 1.719l5 5 .719.687.719-.687 5-5a1.016 1.016 0 10-1.438-1.438L189 755.563l-4.281-4.282a1 1 0 00-.938-.281z" + id="path8393-09-3-1-4" + style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;block-progression:tb;marker:none" + color="#000" font-style="normal" font-variant="normal" font-weight="400" + font-stretch="normal" font-size="medium" font-family="Sans" + text-decoration="none" letter-spacing="normal" word-spacing="normal" + direction="ltr" writing-mode="lr-tb" baseline-shift="baseline" + text-anchor="start" display="inline" overflow="visible" + visibility="visible" stroke-width="2" enable-background="accumulate" /> + + - - - - + + + + - - - - - + + + + + - - - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - - + + + - - - - - - + + + - - - - - + - + d="M3 130v24h26v-24H3zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-6 -409.638)" id="rect9321-6-7" opacity="1" + fill="#2b2b2b" stroke="none" /> + - + - + d="M37 130v24h26v-24H37zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-6 -409.638)" id="rect9321-0-0-1" display="inline" + opacity="1" fill="#2b2b2b" stroke="none" /> + - - - - - + + + + + - + - + d="M110 66v24h26V66h-26zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-113 -345.638)" id="rect9321-3-7" opacity="1" + fill="#383838" stroke="none" /> + - + - + d="M144 66v24h26V66h-26zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-113 -345.638)" id="rect9321-0-2-2" + display="inline" opacity="1" fill="#383838" stroke="none" /> + - + - + d="M115 130v24h26v-24h-26zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="matrix(-1 0 0 1 138 -409.638)" id="rect9321-6-7-4" + opacity="1" fill="#383838" stroke="none" /> + - + - + d="M141 130v24h26v-24h-26zm3.5 1h19c1.385 0 2.5 1.115 2.5 2.5v17c0 1.385-1.115 2.5-2.5 2.5h-19a2.495 2.495 0 01-2.5-2.5v-17c0-1.385 1.115-2.5 2.5-2.5z" + transform="translate(-110 -409.638)" id="rect9321-0-0-1-3" + display="inline" opacity="1" fill="#383838" stroke="none" /> + - - - + + + - - - - + + + + - - - + + + - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/gtk-2.0/assets/arrow-down-insens.png b/gtk-2.0/assets/arrow-down-insens.png index 7345432..3bb4dd3 100644 Binary files a/gtk-2.0/assets/arrow-down-insens.png and b/gtk-2.0/assets/arrow-down-insens.png differ diff --git a/gtk-2.0/assets/arrow-down-prelight.png b/gtk-2.0/assets/arrow-down-prelight.png index 3642477..baa0487 100644 Binary files a/gtk-2.0/assets/arrow-down-prelight.png and b/gtk-2.0/assets/arrow-down-prelight.png differ diff --git a/gtk-2.0/assets/arrow-down-small-insens.png b/gtk-2.0/assets/arrow-down-small-insens.png index 87e7b2f..d5cf603 100644 Binary files a/gtk-2.0/assets/arrow-down-small-insens.png and b/gtk-2.0/assets/arrow-down-small-insens.png differ diff --git a/gtk-2.0/assets/arrow-down-small-prelight.png b/gtk-2.0/assets/arrow-down-small-prelight.png index ecfe8e6..b5dab84 100644 Binary files a/gtk-2.0/assets/arrow-down-small-prelight.png and b/gtk-2.0/assets/arrow-down-small-prelight.png differ diff --git a/gtk-2.0/assets/arrow-down-small.png b/gtk-2.0/assets/arrow-down-small.png index 4d5bdb2..3aca181 100644 Binary files a/gtk-2.0/assets/arrow-down-small.png and b/gtk-2.0/assets/arrow-down-small.png differ diff --git a/gtk-2.0/assets/arrow-down.png b/gtk-2.0/assets/arrow-down.png index 491b2dc..ce4ac0e 100644 Binary files a/gtk-2.0/assets/arrow-down.png and b/gtk-2.0/assets/arrow-down.png differ diff --git a/gtk-2.0/assets/arrow-left-insens.png b/gtk-2.0/assets/arrow-left-insens.png index fec4db9..39059b7 100644 Binary files a/gtk-2.0/assets/arrow-left-insens.png and b/gtk-2.0/assets/arrow-left-insens.png differ diff --git a/gtk-2.0/assets/arrow-left-prelight.png b/gtk-2.0/assets/arrow-left-prelight.png index 5d02a7a..5ce5b0e 100644 Binary files a/gtk-2.0/assets/arrow-left-prelight.png and b/gtk-2.0/assets/arrow-left-prelight.png differ diff --git a/gtk-2.0/assets/arrow-left.png b/gtk-2.0/assets/arrow-left.png index 4179273..affc278 100644 Binary files a/gtk-2.0/assets/arrow-left.png and b/gtk-2.0/assets/arrow-left.png differ diff --git a/gtk-2.0/assets/arrow-right-insens.png b/gtk-2.0/assets/arrow-right-insens.png index 8b39f86..ce1d67f 100644 Binary files a/gtk-2.0/assets/arrow-right-insens.png and b/gtk-2.0/assets/arrow-right-insens.png differ diff --git a/gtk-2.0/assets/arrow-right-prelight.png b/gtk-2.0/assets/arrow-right-prelight.png index 5f5eb5a..6e454c9 100644 Binary files a/gtk-2.0/assets/arrow-right-prelight.png and b/gtk-2.0/assets/arrow-right-prelight.png differ diff --git a/gtk-2.0/assets/arrow-right.png b/gtk-2.0/assets/arrow-right.png index 96ac76c..a306026 100644 Binary files a/gtk-2.0/assets/arrow-right.png and b/gtk-2.0/assets/arrow-right.png differ diff --git a/gtk-2.0/assets/arrow-up-insens.png b/gtk-2.0/assets/arrow-up-insens.png index f6057cc..1b7f1cb 100644 Binary files a/gtk-2.0/assets/arrow-up-insens.png and b/gtk-2.0/assets/arrow-up-insens.png differ diff --git a/gtk-2.0/assets/arrow-up-prelight.png b/gtk-2.0/assets/arrow-up-prelight.png index 0723570..ff14042 100644 Binary files a/gtk-2.0/assets/arrow-up-prelight.png and b/gtk-2.0/assets/arrow-up-prelight.png differ diff --git a/gtk-2.0/assets/arrow-up-small-insens.png b/gtk-2.0/assets/arrow-up-small-insens.png index c607720..6d591c8 100644 Binary files a/gtk-2.0/assets/arrow-up-small-insens.png and b/gtk-2.0/assets/arrow-up-small-insens.png differ diff --git a/gtk-2.0/assets/arrow-up-small-prelight.png b/gtk-2.0/assets/arrow-up-small-prelight.png index 35eca2d..2ba12f4 100644 Binary files a/gtk-2.0/assets/arrow-up-small-prelight.png and b/gtk-2.0/assets/arrow-up-small-prelight.png differ diff --git a/gtk-2.0/assets/arrow-up-small.png b/gtk-2.0/assets/arrow-up-small.png index 4d2f99b..aea56dd 100644 Binary files a/gtk-2.0/assets/arrow-up-small.png and b/gtk-2.0/assets/arrow-up-small.png differ diff --git a/gtk-2.0/assets/arrow-up.png b/gtk-2.0/assets/arrow-up.png index 1e72933..9cc76a5 100644 Binary files a/gtk-2.0/assets/arrow-up.png and b/gtk-2.0/assets/arrow-up.png differ diff --git a/gtk-2.0/assets/button-active.png b/gtk-2.0/assets/button-active.png index d59f9ec..df39260 100644 Binary files a/gtk-2.0/assets/button-active.png and b/gtk-2.0/assets/button-active.png differ diff --git a/gtk-2.0/assets/button-hover.png b/gtk-2.0/assets/button-hover.png index c96c2ae..fb58d93 100644 Binary files a/gtk-2.0/assets/button-hover.png and b/gtk-2.0/assets/button-hover.png differ diff --git a/gtk-2.0/assets/button-insensitive.png b/gtk-2.0/assets/button-insensitive.png index 79eaeef..811dca2 100644 Binary files a/gtk-2.0/assets/button-insensitive.png and b/gtk-2.0/assets/button-insensitive.png differ diff --git a/gtk-2.0/assets/button.png b/gtk-2.0/assets/button.png index 8b46142..f8adda9 100644 Binary files a/gtk-2.0/assets/button.png and b/gtk-2.0/assets/button.png differ diff --git a/gtk-2.0/assets/checkbox-checked-insensitive.png b/gtk-2.0/assets/checkbox-checked-insensitive.png index 6e01a33..11ec1f8 100644 Binary files a/gtk-2.0/assets/checkbox-checked-insensitive.png and b/gtk-2.0/assets/checkbox-checked-insensitive.png differ diff --git a/gtk-2.0/assets/checkbox-checked.png b/gtk-2.0/assets/checkbox-checked.png index 49df56f..2bf254a 100644 Binary files a/gtk-2.0/assets/checkbox-checked.png and b/gtk-2.0/assets/checkbox-checked.png differ diff --git a/gtk-2.0/assets/checkbox-unchecked-insensitive.png b/gtk-2.0/assets/checkbox-unchecked-insensitive.png index b7d0d47..36ee0fb 100644 Binary files a/gtk-2.0/assets/checkbox-unchecked-insensitive.png and b/gtk-2.0/assets/checkbox-unchecked-insensitive.png differ diff --git a/gtk-2.0/assets/checkbox-unchecked.png b/gtk-2.0/assets/checkbox-unchecked.png index 82dadbf..6e8100d 100644 Binary files a/gtk-2.0/assets/checkbox-unchecked.png and b/gtk-2.0/assets/checkbox-unchecked.png differ diff --git a/gtk-2.0/assets/combo-entry-button-active-rtl.png b/gtk-2.0/assets/combo-entry-button-active-rtl.png index 1e42f73..42853ff 100644 Binary files a/gtk-2.0/assets/combo-entry-button-active-rtl.png and b/gtk-2.0/assets/combo-entry-button-active-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-button-active.png b/gtk-2.0/assets/combo-entry-button-active.png index 05c8fbe..51c7222 100644 Binary files a/gtk-2.0/assets/combo-entry-button-active.png and b/gtk-2.0/assets/combo-entry-button-active.png differ diff --git a/gtk-2.0/assets/combo-entry-button-insensitive-rtl.png b/gtk-2.0/assets/combo-entry-button-insensitive-rtl.png index e27ea79..f827ff1 100644 Binary files a/gtk-2.0/assets/combo-entry-button-insensitive-rtl.png and b/gtk-2.0/assets/combo-entry-button-insensitive-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-button-insensitive.png b/gtk-2.0/assets/combo-entry-button-insensitive.png index a24d8c6..03c23d2 100644 Binary files a/gtk-2.0/assets/combo-entry-button-insensitive.png and b/gtk-2.0/assets/combo-entry-button-insensitive.png differ diff --git a/gtk-2.0/assets/combo-entry-button-rtl.png b/gtk-2.0/assets/combo-entry-button-rtl.png index 44dcad9..1060539 100644 Binary files a/gtk-2.0/assets/combo-entry-button-rtl.png and b/gtk-2.0/assets/combo-entry-button-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-button.png b/gtk-2.0/assets/combo-entry-button.png index faa0ced..0672001 100644 Binary files a/gtk-2.0/assets/combo-entry-button.png and b/gtk-2.0/assets/combo-entry-button.png differ diff --git a/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png b/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png index 97b79eb..bf02972 100644 Binary files a/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png and b/gtk-2.0/assets/combo-entry-focus-notebook-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-focus-notebook.png b/gtk-2.0/assets/combo-entry-focus-notebook.png index bc41e2d..890fdef 100644 Binary files a/gtk-2.0/assets/combo-entry-focus-notebook.png and b/gtk-2.0/assets/combo-entry-focus-notebook.png differ diff --git a/gtk-2.0/assets/combo-entry-focus-rtl.png b/gtk-2.0/assets/combo-entry-focus-rtl.png index 113942c..20f8127 100644 Binary files a/gtk-2.0/assets/combo-entry-focus-rtl.png and b/gtk-2.0/assets/combo-entry-focus-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-focus.png b/gtk-2.0/assets/combo-entry-focus.png index 1a486c6..1f099b7 100644 Binary files a/gtk-2.0/assets/combo-entry-focus.png and b/gtk-2.0/assets/combo-entry-focus.png differ diff --git a/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png b/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png index fd34189..a65a3ae 100644 Binary files a/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png and b/gtk-2.0/assets/combo-entry-insensitive-notebook-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-insensitive-notebook.png b/gtk-2.0/assets/combo-entry-insensitive-notebook.png index 0551814..21c5197 100644 Binary files a/gtk-2.0/assets/combo-entry-insensitive-notebook.png and b/gtk-2.0/assets/combo-entry-insensitive-notebook.png differ diff --git a/gtk-2.0/assets/combo-entry-insensitive-rtl.png b/gtk-2.0/assets/combo-entry-insensitive-rtl.png index dd52498..75f265d 100644 Binary files a/gtk-2.0/assets/combo-entry-insensitive-rtl.png and b/gtk-2.0/assets/combo-entry-insensitive-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-insensitive.png b/gtk-2.0/assets/combo-entry-insensitive.png index 89279e8..147e884 100644 Binary files a/gtk-2.0/assets/combo-entry-insensitive.png and b/gtk-2.0/assets/combo-entry-insensitive.png differ diff --git a/gtk-2.0/assets/combo-entry-notebook-rtl.png b/gtk-2.0/assets/combo-entry-notebook-rtl.png index 2f2c351..79cc6b2 100644 Binary files a/gtk-2.0/assets/combo-entry-notebook-rtl.png and b/gtk-2.0/assets/combo-entry-notebook-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry-notebook.png b/gtk-2.0/assets/combo-entry-notebook.png index d819d5f..c2c6b14 100644 Binary files a/gtk-2.0/assets/combo-entry-notebook.png and b/gtk-2.0/assets/combo-entry-notebook.png differ diff --git a/gtk-2.0/assets/combo-entry-rtl.png b/gtk-2.0/assets/combo-entry-rtl.png index 6cb7d68..3a78719 100644 Binary files a/gtk-2.0/assets/combo-entry-rtl.png and b/gtk-2.0/assets/combo-entry-rtl.png differ diff --git a/gtk-2.0/assets/combo-entry.png b/gtk-2.0/assets/combo-entry.png index fe6d829..e4a2789 100644 Binary files a/gtk-2.0/assets/combo-entry.png and b/gtk-2.0/assets/combo-entry.png differ diff --git a/gtk-2.0/assets/down-background-disable-rtl.png b/gtk-2.0/assets/down-background-disable-rtl.png index 146a2d7..6086913 100644 Binary files a/gtk-2.0/assets/down-background-disable-rtl.png and b/gtk-2.0/assets/down-background-disable-rtl.png differ diff --git a/gtk-2.0/assets/down-background-disable.png b/gtk-2.0/assets/down-background-disable.png index 62f14e5..07463ef 100644 Binary files a/gtk-2.0/assets/down-background-disable.png and b/gtk-2.0/assets/down-background-disable.png differ diff --git a/gtk-2.0/assets/down-background-rtl.png b/gtk-2.0/assets/down-background-rtl.png index eded6e8..5a6361c 100644 Binary files a/gtk-2.0/assets/down-background-rtl.png and b/gtk-2.0/assets/down-background-rtl.png differ diff --git a/gtk-2.0/assets/down-background.png b/gtk-2.0/assets/down-background.png index 0602f43..40625a3 100644 Binary files a/gtk-2.0/assets/down-background.png and b/gtk-2.0/assets/down-background.png differ diff --git a/gtk-2.0/assets/entry-border-active-bg-solid.png b/gtk-2.0/assets/entry-border-active-bg-solid.png index 7ae5488..590d69f 100644 Binary files a/gtk-2.0/assets/entry-border-active-bg-solid.png and b/gtk-2.0/assets/entry-border-active-bg-solid.png differ diff --git a/gtk-2.0/assets/entry-border-active-bg.png b/gtk-2.0/assets/entry-border-active-bg.png index 58b8eb8..0c29deb 100644 Binary files a/gtk-2.0/assets/entry-border-active-bg.png and b/gtk-2.0/assets/entry-border-active-bg.png differ diff --git a/gtk-2.0/assets/entry-border-bg-solid.png b/gtk-2.0/assets/entry-border-bg-solid.png index c17fbd9..2381acc 100644 Binary files a/gtk-2.0/assets/entry-border-bg-solid.png and b/gtk-2.0/assets/entry-border-bg-solid.png differ diff --git a/gtk-2.0/assets/entry-border-bg.png b/gtk-2.0/assets/entry-border-bg.png index d0f882d..fdf4087 100644 Binary files a/gtk-2.0/assets/entry-border-bg.png and b/gtk-2.0/assets/entry-border-bg.png differ diff --git a/gtk-2.0/assets/entry-border-disabled-bg.png b/gtk-2.0/assets/entry-border-disabled-bg.png index a2d34e9..594806c 100644 Binary files a/gtk-2.0/assets/entry-border-disabled-bg.png and b/gtk-2.0/assets/entry-border-disabled-bg.png differ diff --git a/gtk-2.0/assets/entry-border-fill.png b/gtk-2.0/assets/entry-border-fill.png index f1247c1..2e15459 100644 Binary files a/gtk-2.0/assets/entry-border-fill.png and b/gtk-2.0/assets/entry-border-fill.png differ diff --git a/gtk-2.0/assets/focus-line.png b/gtk-2.0/assets/focus-line.png index bddb106..6b4fe5d 100644 Binary files a/gtk-2.0/assets/focus-line.png and b/gtk-2.0/assets/focus-line.png differ diff --git a/gtk-2.0/assets/frame-gap-end.png b/gtk-2.0/assets/frame-gap-end.png index db7cf6b..6958f62 100644 Binary files a/gtk-2.0/assets/frame-gap-end.png and b/gtk-2.0/assets/frame-gap-end.png differ diff --git a/gtk-2.0/assets/frame-gap-start.png b/gtk-2.0/assets/frame-gap-start.png index d1c200c..6958f62 100644 Binary files a/gtk-2.0/assets/frame-gap-start.png and b/gtk-2.0/assets/frame-gap-start.png differ diff --git a/gtk-2.0/assets/frame.png b/gtk-2.0/assets/frame.png index aa660b0..234168d 100644 Binary files a/gtk-2.0/assets/frame.png and b/gtk-2.0/assets/frame.png differ diff --git a/gtk-2.0/assets/handle-h.png b/gtk-2.0/assets/handle-h.png index 0a7844e..376bcbe 100644 Binary files a/gtk-2.0/assets/handle-h.png and b/gtk-2.0/assets/handle-h.png differ diff --git a/gtk-2.0/assets/handle-v.png b/gtk-2.0/assets/handle-v.png index 48c24e4..a134c7d 100644 Binary files a/gtk-2.0/assets/handle-v.png and b/gtk-2.0/assets/handle-v.png differ diff --git a/gtk-2.0/assets/inline-toolbar.png b/gtk-2.0/assets/inline-toolbar.png index e6d78a4..2255286 100644 Binary files a/gtk-2.0/assets/inline-toolbar.png and b/gtk-2.0/assets/inline-toolbar.png differ diff --git a/gtk-2.0/assets/line-h.png b/gtk-2.0/assets/line-h.png index 9d13426..092928e 100644 Binary files a/gtk-2.0/assets/line-h.png and b/gtk-2.0/assets/line-h.png differ diff --git a/gtk-2.0/assets/line-v.png b/gtk-2.0/assets/line-v.png index 335aad9..4b5e251 100644 Binary files a/gtk-2.0/assets/line-v.png and b/gtk-2.0/assets/line-v.png differ diff --git a/gtk-2.0/assets/menu-arrow-prelight.png b/gtk-2.0/assets/menu-arrow-prelight.png index 1c6589b..034cfc4 100644 Binary files a/gtk-2.0/assets/menu-arrow-prelight.png and b/gtk-2.0/assets/menu-arrow-prelight.png differ diff --git a/gtk-2.0/assets/menu-arrow.png b/gtk-2.0/assets/menu-arrow.png index 56835a8..03d578d 100644 Binary files a/gtk-2.0/assets/menu-arrow.png and b/gtk-2.0/assets/menu-arrow.png differ diff --git a/gtk-2.0/assets/menu-checkbox-checked-insensitive.png b/gtk-2.0/assets/menu-checkbox-checked-insensitive.png index bda8a1b..8f96e64 100644 Binary files a/gtk-2.0/assets/menu-checkbox-checked-insensitive.png and b/gtk-2.0/assets/menu-checkbox-checked-insensitive.png differ diff --git a/gtk-2.0/assets/menu-checkbox-checked.png b/gtk-2.0/assets/menu-checkbox-checked.png index bfba744..81420b3 100644 Binary files a/gtk-2.0/assets/menu-checkbox-checked.png and b/gtk-2.0/assets/menu-checkbox-checked.png differ diff --git a/gtk-2.0/assets/menu-checkbox-unchecked-insensitive.png b/gtk-2.0/assets/menu-checkbox-unchecked-insensitive.png index 1be7d1e..a1e11de 100644 Binary files a/gtk-2.0/assets/menu-checkbox-unchecked-insensitive.png and b/gtk-2.0/assets/menu-checkbox-unchecked-insensitive.png differ diff --git a/gtk-2.0/assets/menu-checkbox-unchecked.png b/gtk-2.0/assets/menu-checkbox-unchecked.png index e65fb40..446bdb6 100644 Binary files a/gtk-2.0/assets/menu-checkbox-unchecked.png and b/gtk-2.0/assets/menu-checkbox-unchecked.png differ diff --git a/gtk-2.0/assets/menu-radio-checked-insensitive.png b/gtk-2.0/assets/menu-radio-checked-insensitive.png index 5625859..ce4dfe9 100644 Binary files a/gtk-2.0/assets/menu-radio-checked-insensitive.png and b/gtk-2.0/assets/menu-radio-checked-insensitive.png differ diff --git a/gtk-2.0/assets/menu-radio-checked.png b/gtk-2.0/assets/menu-radio-checked.png index 7e09218..96da49b 100644 Binary files a/gtk-2.0/assets/menu-radio-checked.png and b/gtk-2.0/assets/menu-radio-checked.png differ diff --git a/gtk-2.0/assets/menu-radio-unchecked-insensitive.png b/gtk-2.0/assets/menu-radio-unchecked-insensitive.png index 69e6c28..67f7888 100644 Binary files a/gtk-2.0/assets/menu-radio-unchecked-insensitive.png and b/gtk-2.0/assets/menu-radio-unchecked-insensitive.png differ diff --git a/gtk-2.0/assets/menu-radio-unchecked.png b/gtk-2.0/assets/menu-radio-unchecked.png index 34f41f8..25c64cb 100644 Binary files a/gtk-2.0/assets/menu-radio-unchecked.png and b/gtk-2.0/assets/menu-radio-unchecked.png differ diff --git a/gtk-2.0/assets/menubar.png b/gtk-2.0/assets/menubar.png index 4b276ec..442cb9e 100644 Binary files a/gtk-2.0/assets/menubar.png and b/gtk-2.0/assets/menubar.png differ diff --git a/gtk-2.0/assets/menubar_button.png b/gtk-2.0/assets/menubar_button.png index ea78443..d150cb8 100644 Binary files a/gtk-2.0/assets/menubar_button.png and b/gtk-2.0/assets/menubar_button.png differ diff --git a/gtk-2.0/assets/menuitem.png b/gtk-2.0/assets/menuitem.png index b317d42..33b8eaf 100644 Binary files a/gtk-2.0/assets/menuitem.png and b/gtk-2.0/assets/menuitem.png differ diff --git a/gtk-2.0/assets/minus.png b/gtk-2.0/assets/minus.png index 8775ea1..fb2a95c 100644 Binary files a/gtk-2.0/assets/minus.png and b/gtk-2.0/assets/minus.png differ diff --git a/gtk-2.0/assets/notebook-entry-border-active-bg.png b/gtk-2.0/assets/notebook-entry-border-active-bg.png index 3602672..e241fe4 100644 Binary files a/gtk-2.0/assets/notebook-entry-border-active-bg.png and b/gtk-2.0/assets/notebook-entry-border-active-bg.png differ diff --git a/gtk-2.0/assets/notebook-entry-border-bg.png b/gtk-2.0/assets/notebook-entry-border-bg.png index 4d3daf4..c266637 100644 Binary files a/gtk-2.0/assets/notebook-entry-border-bg.png and b/gtk-2.0/assets/notebook-entry-border-bg.png differ diff --git a/gtk-2.0/assets/notebook-entry-border-disabled-bg.png b/gtk-2.0/assets/notebook-entry-border-disabled-bg.png index 4fb139f..286392b 100644 Binary files a/gtk-2.0/assets/notebook-entry-border-disabled-bg.png and b/gtk-2.0/assets/notebook-entry-border-disabled-bg.png differ diff --git a/gtk-2.0/assets/notebook-gap-horiz.png b/gtk-2.0/assets/notebook-gap-horiz.png index a4e0223..ccbeb76 100644 Binary files a/gtk-2.0/assets/notebook-gap-horiz.png and b/gtk-2.0/assets/notebook-gap-horiz.png differ diff --git a/gtk-2.0/assets/notebook-gap-vert.png b/gtk-2.0/assets/notebook-gap-vert.png index ddc73ff..cbd3855 100644 Binary files a/gtk-2.0/assets/notebook-gap-vert.png and b/gtk-2.0/assets/notebook-gap-vert.png differ diff --git a/gtk-2.0/assets/notebook.png b/gtk-2.0/assets/notebook.png index 720cb67..234168d 100644 Binary files a/gtk-2.0/assets/notebook.png and b/gtk-2.0/assets/notebook.png differ diff --git a/gtk-2.0/assets/null.png b/gtk-2.0/assets/null.png index d82fb34..bd8bef4 100644 Binary files a/gtk-2.0/assets/null.png and b/gtk-2.0/assets/null.png differ diff --git a/gtk-2.0/assets/plus.png b/gtk-2.0/assets/plus.png index 4363b1c..76bc743 100644 Binary files a/gtk-2.0/assets/plus.png and b/gtk-2.0/assets/plus.png differ diff --git a/gtk-2.0/assets/progressbar.png b/gtk-2.0/assets/progressbar.png index 0f9d149..c229d16 100644 Binary files a/gtk-2.0/assets/progressbar.png and b/gtk-2.0/assets/progressbar.png differ diff --git a/gtk-2.0/assets/progressbar_v.png b/gtk-2.0/assets/progressbar_v.png index 2b5db34..f77d4bc 100644 Binary files a/gtk-2.0/assets/progressbar_v.png and b/gtk-2.0/assets/progressbar_v.png differ diff --git a/gtk-2.0/assets/radio-checked-insensitive.png b/gtk-2.0/assets/radio-checked-insensitive.png index 907e882..4d25ec8 100644 Binary files a/gtk-2.0/assets/radio-checked-insensitive.png and b/gtk-2.0/assets/radio-checked-insensitive.png differ diff --git a/gtk-2.0/assets/radio-checked.png b/gtk-2.0/assets/radio-checked.png index 52a26cc..1c3dd92 100644 Binary files a/gtk-2.0/assets/radio-checked.png and b/gtk-2.0/assets/radio-checked.png differ diff --git a/gtk-2.0/assets/radio-unchecked-insensitive.png b/gtk-2.0/assets/radio-unchecked-insensitive.png index c11f6ec..9b09e3a 100644 Binary files a/gtk-2.0/assets/radio-unchecked-insensitive.png and b/gtk-2.0/assets/radio-unchecked-insensitive.png differ diff --git a/gtk-2.0/assets/radio-unchecked.png b/gtk-2.0/assets/radio-unchecked.png index de34575..b84ed48 100644 Binary files a/gtk-2.0/assets/radio-unchecked.png and b/gtk-2.0/assets/radio-unchecked.png differ diff --git a/gtk-2.0/assets/slider-horiz-active.png b/gtk-2.0/assets/slider-horiz-active.png index 8613c4a..6427d0c 100644 Binary files a/gtk-2.0/assets/slider-horiz-active.png and b/gtk-2.0/assets/slider-horiz-active.png differ diff --git a/gtk-2.0/assets/slider-horiz-insens.png b/gtk-2.0/assets/slider-horiz-insens.png index a7a4627..865292e 100644 Binary files a/gtk-2.0/assets/slider-horiz-insens.png and b/gtk-2.0/assets/slider-horiz-insens.png differ diff --git a/gtk-2.0/assets/slider-horiz-prelight.png b/gtk-2.0/assets/slider-horiz-prelight.png index 3bc5dfb..a466ea6 100644 Binary files a/gtk-2.0/assets/slider-horiz-prelight.png and b/gtk-2.0/assets/slider-horiz-prelight.png differ diff --git a/gtk-2.0/assets/slider-horiz.png b/gtk-2.0/assets/slider-horiz.png index 24b023b..a031b90 100644 Binary files a/gtk-2.0/assets/slider-horiz.png and b/gtk-2.0/assets/slider-horiz.png differ diff --git a/gtk-2.0/assets/slider-insensitive.png b/gtk-2.0/assets/slider-insensitive.png index ccfc6f6..90d2d21 100644 Binary files a/gtk-2.0/assets/slider-insensitive.png and b/gtk-2.0/assets/slider-insensitive.png differ diff --git a/gtk-2.0/assets/slider-prelight.png b/gtk-2.0/assets/slider-prelight.png index fdfa74f..7c81a41 100644 Binary files a/gtk-2.0/assets/slider-prelight.png and b/gtk-2.0/assets/slider-prelight.png differ diff --git a/gtk-2.0/assets/slider-vert-active.png b/gtk-2.0/assets/slider-vert-active.png index 2e6bb07..17f4528 100644 Binary files a/gtk-2.0/assets/slider-vert-active.png and b/gtk-2.0/assets/slider-vert-active.png differ diff --git a/gtk-2.0/assets/slider-vert-insens.png b/gtk-2.0/assets/slider-vert-insens.png index 4856576..b84f765 100644 Binary files a/gtk-2.0/assets/slider-vert-insens.png and b/gtk-2.0/assets/slider-vert-insens.png differ diff --git a/gtk-2.0/assets/slider-vert-prelight.png b/gtk-2.0/assets/slider-vert-prelight.png index a88fa8e..07496ce 100644 Binary files a/gtk-2.0/assets/slider-vert-prelight.png and b/gtk-2.0/assets/slider-vert-prelight.png differ diff --git a/gtk-2.0/assets/slider-vert.png b/gtk-2.0/assets/slider-vert.png index 6d54eb3..fae00e0 100644 Binary files a/gtk-2.0/assets/slider-vert.png and b/gtk-2.0/assets/slider-vert.png differ diff --git a/gtk-2.0/assets/slider.png b/gtk-2.0/assets/slider.png index 7727b1e..893ed49 100644 Binary files a/gtk-2.0/assets/slider.png and b/gtk-2.0/assets/slider.png differ diff --git a/gtk-2.0/assets/tab-bottom-active.png b/gtk-2.0/assets/tab-bottom-active.png index 8b467b8..43387eb 100644 Binary files a/gtk-2.0/assets/tab-bottom-active.png and b/gtk-2.0/assets/tab-bottom-active.png differ diff --git a/gtk-2.0/assets/tab-left-active.png b/gtk-2.0/assets/tab-left-active.png index 3294e7e..a0ecf94 100644 Binary files a/gtk-2.0/assets/tab-left-active.png and b/gtk-2.0/assets/tab-left-active.png differ diff --git a/gtk-2.0/assets/tab-right-active.png b/gtk-2.0/assets/tab-right-active.png index 7b61c56..1d3ccad 100644 Binary files a/gtk-2.0/assets/tab-right-active.png and b/gtk-2.0/assets/tab-right-active.png differ diff --git a/gtk-2.0/assets/tab-top-active.png b/gtk-2.0/assets/tab-top-active.png index 3e83c2d..e430653 100644 Binary files a/gtk-2.0/assets/tab-top-active.png and b/gtk-2.0/assets/tab-top-active.png differ diff --git a/gtk-2.0/assets/toolbar-entry-border-active-bg.png b/gtk-2.0/assets/toolbar-entry-border-active-bg.png index 638ae28..b5e4734 100644 Binary files a/gtk-2.0/assets/toolbar-entry-border-active-bg.png and b/gtk-2.0/assets/toolbar-entry-border-active-bg.png differ diff --git a/gtk-2.0/assets/toolbar-entry-border-bg.png b/gtk-2.0/assets/toolbar-entry-border-bg.png index babc8ff..fd3364f 100644 Binary files a/gtk-2.0/assets/toolbar-entry-border-bg.png and b/gtk-2.0/assets/toolbar-entry-border-bg.png differ diff --git a/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png b/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png index b29939c..2e78099 100644 Binary files a/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png and b/gtk-2.0/assets/toolbar-entry-border-disabled-bg.png differ diff --git a/gtk-2.0/assets/toolbar.png b/gtk-2.0/assets/toolbar.png index e118e58..a266955 100644 Binary files a/gtk-2.0/assets/toolbar.png and b/gtk-2.0/assets/toolbar.png differ diff --git a/gtk-2.0/assets/tree_header.png b/gtk-2.0/assets/tree_header.png index 2349bc7..c608607 100644 Binary files a/gtk-2.0/assets/tree_header.png and b/gtk-2.0/assets/tree_header.png differ diff --git a/gtk-2.0/assets/trough-horizontal-active.png b/gtk-2.0/assets/trough-horizontal-active.png index 3e5f3f2..fafcfeb 100644 Binary files a/gtk-2.0/assets/trough-horizontal-active.png and b/gtk-2.0/assets/trough-horizontal-active.png differ diff --git a/gtk-2.0/assets/trough-horizontal.png b/gtk-2.0/assets/trough-horizontal.png index a1eea98..b5460e2 100644 Binary files a/gtk-2.0/assets/trough-horizontal.png and b/gtk-2.0/assets/trough-horizontal.png differ diff --git a/gtk-2.0/assets/trough-progressbar.png b/gtk-2.0/assets/trough-progressbar.png index 3ebc4da..bbfb1f8 100644 Binary files a/gtk-2.0/assets/trough-progressbar.png and b/gtk-2.0/assets/trough-progressbar.png differ diff --git a/gtk-2.0/assets/trough-progressbar_v.png b/gtk-2.0/assets/trough-progressbar_v.png index 0e44eb2..694e7d4 100644 Binary files a/gtk-2.0/assets/trough-progressbar_v.png and b/gtk-2.0/assets/trough-progressbar_v.png differ diff --git a/gtk-2.0/assets/trough-scrollbar-horiz.png b/gtk-2.0/assets/trough-scrollbar-horiz.png index 6f6fe8a..4f899e5 100644 Binary files a/gtk-2.0/assets/trough-scrollbar-horiz.png and b/gtk-2.0/assets/trough-scrollbar-horiz.png differ diff --git a/gtk-2.0/assets/trough-scrollbar-vert.png b/gtk-2.0/assets/trough-scrollbar-vert.png index 01cc211..dc93cc0 100644 Binary files a/gtk-2.0/assets/trough-scrollbar-vert.png and b/gtk-2.0/assets/trough-scrollbar-vert.png differ diff --git a/gtk-2.0/assets/trough-vertical-active.png b/gtk-2.0/assets/trough-vertical-active.png index 71d592f..42b9952 100644 Binary files a/gtk-2.0/assets/trough-vertical-active.png and b/gtk-2.0/assets/trough-vertical-active.png differ diff --git a/gtk-2.0/assets/trough-vertical.png b/gtk-2.0/assets/trough-vertical.png index 98cdf70..42b25ce 100644 Binary files a/gtk-2.0/assets/trough-vertical.png and b/gtk-2.0/assets/trough-vertical.png differ diff --git a/gtk-2.0/assets/up-background-disable-rtl.png b/gtk-2.0/assets/up-background-disable-rtl.png index 08e505c..b524dc9 100644 Binary files a/gtk-2.0/assets/up-background-disable-rtl.png and b/gtk-2.0/assets/up-background-disable-rtl.png differ diff --git a/gtk-2.0/assets/up-background-disable.png b/gtk-2.0/assets/up-background-disable.png index a14f130..9cabdef 100644 Binary files a/gtk-2.0/assets/up-background-disable.png and b/gtk-2.0/assets/up-background-disable.png differ diff --git a/gtk-2.0/assets/up-background-rtl.png b/gtk-2.0/assets/up-background-rtl.png index 2ba5871..b7e693f 100644 Binary files a/gtk-2.0/assets/up-background-rtl.png and b/gtk-2.0/assets/up-background-rtl.png differ diff --git a/gtk-2.0/assets/up-background.png b/gtk-2.0/assets/up-background.png index 57a32de..fbc85b5 100644 Binary files a/gtk-2.0/assets/up-background.png and b/gtk-2.0/assets/up-background.png differ diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc index 5f8e1da..b2ee124 100644 --- a/gtk-2.0/gtkrc +++ b/gtk-2.0/gtkrc @@ -1,4 +1,4 @@ -gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#303030\ntooltip_fg_color:#303030\nselected_bg_color:#92b372\nselected_fg_color:#FFFFFF\ntext_color:#303030\nbg_color:#f0f0f0\ninsensitive_bg_color:#fbfcfc\ninsensitive_fg_color:#a9a9a9\nnotebook_bg:#ffffff\ndark_sidebar_bg:#454545\ntooltip_bg_color:#fbeaa0\nlink_color:#5294E2\nmenu_bg:#ffffff\nmenu_separator_color:#dfdfdf" +gtk-color-scheme = "base_color:#404040\nfg_color:#DADADA\ntooltip_fg_color:#4a4a4a\nselected_bg_color:#8fa876\nselected_fg_color:#FFFFFF\ntext_color:#D3D3D3\nbg_color:#383838\ninsensitive_bg_color:#3e3e3e\ninsensitive_fg_color:#7f7f7f\nnotebook_bg:#404040\ndark_sidebar_bg:#353535\ntooltip_bg_color:#fbeaa0\nlink_color:#5294E2\nmenu_bg:#383838\nmenu_separator_color:#303030" gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. gtk-auto-mnemonics = 1 diff --git a/gtk-2.0/gtkrc-dark b/gtk-2.0/gtkrc-dark deleted file mode 100644 index b2ee124..0000000 --- a/gtk-2.0/gtkrc-dark +++ /dev/null @@ -1,10 +0,0 @@ -gtk-color-scheme = "base_color:#404040\nfg_color:#DADADA\ntooltip_fg_color:#4a4a4a\nselected_bg_color:#8fa876\nselected_fg_color:#FFFFFF\ntext_color:#D3D3D3\nbg_color:#383838\ninsensitive_bg_color:#3e3e3e\ninsensitive_fg_color:#7f7f7f\nnotebook_bg:#404040\ndark_sidebar_bg:#353535\ntooltip_bg_color:#fbeaa0\nlink_color:#5294E2\nmenu_bg:#383838\nmenu_separator_color:#303030" - -gtk-icon-sizes = "gtk-button=16,16" # This makes button icons smaller. -gtk-auto-mnemonics = 1 -gtk-primary-button-warps-slider = 1 - -include "main.rc" -include "apps.rc" -include "panel.rc" -include "menubar-toolbar.rc" diff --git a/gtk-2.0/menubar-toolbar-dark.rc b/gtk-2.0/menubar-toolbar-dark.rc deleted file mode 100644 index 229a985..0000000 --- a/gtk-2.0/menubar-toolbar-dark.rc +++ /dev/null @@ -1,222 +0,0 @@ -style "menubar" { - - bg[NORMAL] = "#2b2b2b" - fg[NORMAL] = "#dadada" - fg[PRELIGHT] = "#dadada" - fg[ACTIVE] = "#dadada" - fg[SELECTED] = @fg_color - fg[INSENSITIVE] = shade(0.7, "#dadada") - - xthickness = 0 - ythickness = 0 - - engine "pixmap" { - - image { - function = BOX - file = "assets/menubar.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - } -} - -style "menubar-borderless" { - - bg[NORMAL] = "#2b2b2b" - fg[NORMAL] = "#dadada" - fg[SELECTED] = @fg_color - fg[INSENSITIVE] = shade(0.7, "#dadada") - - xthickness = 0 - ythickness = 0 - - engine "pixmap" { - - image { - function = BOX - file = "assets/null.png" - stretch = TRUE - border = { 1, 1, 1, 1 } - } - } -} - -style "menubar_item" { - - xthickness = 2 - ythickness = 4 - - fg[PRELIGHT] = @fg_color - - engine "pixmap" { - - image { - function = BOX - state = PRELIGHT - file = "assets/menubar_button.png" - border = { 2, 2, 2, 2 } - stretch = TRUE - } - } -} - -# Text Style Menubar -style "menubar-text" { - - engine "murrine" { - text_shade = 0.0 - textstyle = 0 - } -} - - -style "toolbar_text" { - fg[NORMAL] = "#dadada" - fg[PRELIGHT] = "#dadada" - fg[INSENSITIVE] = shade(0.7, "#dadada") - fg[ACTIVE] = "#dadada" - - text[NORMAL] = "#dadada" - text[PRELIGHT] = "#dadada" - text[INSENSITIVE] = shade(0.7, "#dadada") - text[ACTIVE] = "#dadada" - -} - -style "toolbar_button" { - - xthickness = 4 - ythickness = 4 - - engine "pixmap" { - - image { - function = BOX - state = NORMAL - file = "assets/button.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image { - function = BOX - state = PRELIGHT - file = "assets/button-hover.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image { - function = BOX - state = ACTIVE - file = "assets/button-active.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - - image { - function = BOX - state = INSENSITIVE - file = "assets/button-insensitive.png" - border = { 4, 4, 4, 4 } - stretch = TRUE - } - } -} - -style "toolbar_entry" { - xthickness = 6 - - base[NORMAL] = "#414141" - base[INSENSITIVE] = "#393939" - - text[NORMAL] = "#dadada" - - engine "pixmap" { - - image { - function = SHADOW - detail = "entry" - state = NORMAL - shadow = IN - file = "assets/toolbar-entry-border-bg.png" - border = { 12, 12, 12, 12 } - stretch = TRUE - } - - image { - function = SHADOW - detail = "entry" - state = INSENSITIVE - shadow = IN - file = "assets/toolbar-entry-border-disabled-bg.png" - border = { 12, 12, 12, 12 } - stretch = TRUE - } - - image { - function = SHADOW - detail = "entry" - state = ACTIVE - file = "assets/toolbar-entry-border-active-bg.png" - border = { 12, 12, 12, 12 } - stretch = TRUE - } - - image { - function = FLAT_BOX - detail = "entry_bg" - state = NORMAL - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - - image { - function = FLAT_BOX - detail = "entry_bg" - state = ACTIVE - overlay_file = "assets/null.png" - overlay_border = { 0, 0, 0, 0 } - overlay_stretch = TRUE - } - } -} - -#Chromium -style "chrome-gtk-frame" { - - ChromeGtkFrame::frame-color = "#2b2b2b" - ChromeGtkFrame::inactive-frame-color = "#2b2b2b" - - ChromeGtkFrame::frame-gradient-size = 0 - ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color) - - ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color) - ChromeGtkFrame::incognito-inactive-frame-color = @bg_color - - ChromeGtkFrame::incognito-frame-gradient-color = @bg_color - - ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color) - ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color) - ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color - -} - -widget_class "**" style "menubar" -widget_class "*.*" style "menubar_item" - -widget_class "*ThunarWindow*" style "menubar" - -class "ChromeGtkFrame" style "chrome-gtk-frame" - -widget_class "***" style "menubar-text" - -# Whitelist for dark toolbars -widget_class "*ThunarWindow*" style "menubar-borderless" -widget_class "*ThunarWindow**" style "toolbar_entry" -widget_class "*ThunarWindow**" style "toolbar_button" -widget_class "*ThunarWindow**" style "toolbar_text" -widget_class "*ThunarWindow***" style "menubar-text" - diff --git a/gtk-2.0/menubar-toolbar.rc b/gtk-2.0/menubar-toolbar.rc index 2974c84..229a985 100644 --- a/gtk-2.0/menubar-toolbar.rc +++ b/gtk-2.0/menubar-toolbar.rc @@ -1,11 +1,11 @@ style "menubar" { - bg[NORMAL] = "#e8e8e8" - fg[NORMAL] = "#404040" - fg[PRELIGHT] = "#404040" - fg[ACTIVE] = "#404040" + bg[NORMAL] = "#2b2b2b" + fg[NORMAL] = "#dadada" + fg[PRELIGHT] = "#dadada" + fg[ACTIVE] = "#dadada" fg[SELECTED] = @fg_color - fg[INSENSITIVE] = shade(1.3, "#404040") + fg[INSENSITIVE] = shade(0.7, "#dadada") xthickness = 0 ythickness = 0 @@ -23,10 +23,10 @@ style "menubar" { style "menubar-borderless" { - bg[NORMAL] = "#e8e8e8" - fg[NORMAL] = "#404040" + bg[NORMAL] = "#2b2b2b" + fg[NORMAL] = "#dadada" fg[SELECTED] = @fg_color - fg[INSENSITIVE] = shade(1.3, "#404040") + fg[INSENSITIVE] = shade(0.7, "#dadada") xthickness = 0 ythickness = 0 @@ -70,13 +70,68 @@ style "menubar-text" { } } + +style "toolbar_text" { + fg[NORMAL] = "#dadada" + fg[PRELIGHT] = "#dadada" + fg[INSENSITIVE] = shade(0.7, "#dadada") + fg[ACTIVE] = "#dadada" + + text[NORMAL] = "#dadada" + text[PRELIGHT] = "#dadada" + text[INSENSITIVE] = shade(0.7, "#dadada") + text[ACTIVE] = "#dadada" + +} + +style "toolbar_button" { + + xthickness = 4 + ythickness = 4 + + engine "pixmap" { + + image { + function = BOX + state = NORMAL + file = "assets/button.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + image { + function = BOX + state = PRELIGHT + file = "assets/button-hover.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + image { + function = BOX + state = ACTIVE + file = "assets/button-active.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + + image { + function = BOX + state = INSENSITIVE + file = "assets/button-insensitive.png" + border = { 4, 4, 4, 4 } + stretch = TRUE + } + } +} + style "toolbar_entry" { xthickness = 6 - base[NORMAL] = "#fdfdfd" - base[INSENSITIVE] = "#f4f4f4" + base[NORMAL] = "#414141" + base[INSENSITIVE] = "#393939" - text[NORMAL] = "#404040" + text[NORMAL] = "#dadada" engine "pixmap" { @@ -132,8 +187,8 @@ style "toolbar_entry" { #Chromium style "chrome-gtk-frame" { - ChromeGtkFrame::frame-color = "#e8e8e8" - ChromeGtkFrame::inactive-frame-color = "#e8e8e8" + ChromeGtkFrame::frame-color = "#2b2b2b" + ChromeGtkFrame::inactive-frame-color = "#2b2b2b" ChromeGtkFrame::frame-gradient-size = 0 ChromeGtkFrame::frame-gradient-color = shade(0.5, @bg_color) @@ -153,14 +208,15 @@ widget_class "**" style "menub widget_class "*.*" style "menubar_item" widget_class "*ThunarWindow*" style "menubar" -widget_class "*CajaNavigationWindow*" style "menubar" class "ChromeGtkFrame" style "chrome-gtk-frame" widget_class "***" style "menubar-text" # Whitelist for dark toolbars -widget_class "*ThunarWindow*" style "menubar-borderless" -widget_class "*CajaNavigationWindow*" style "menubar-borderless" -widget_class "*ThunarWindow**" style "toolbar_entry" -widget_class "*CajaNavigationWindow**" style "toolbar_entry" +widget_class "*ThunarWindow*" style "menubar-borderless" +widget_class "*ThunarWindow**" style "toolbar_entry" +widget_class "*ThunarWindow**" style "toolbar_button" +widget_class "*ThunarWindow**" style "toolbar_text" +widget_class "*ThunarWindow***" style "menubar-text" + diff --git a/gtk-2.0/render-assets.sh b/gtk-2.0/render-assets.sh old mode 100644 new mode 100755 index 43861c7..56441fc --- a/gtk-2.0/render-assets.sh +++ b/gtk-2.0/render-assets.sh @@ -9,15 +9,12 @@ INDEX="assets.txt" for i in `cat $INDEX` do -if [ -f $ASSETS_DIR/$i.png ]; then - echo $ASSETS_DIR/$i.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ - && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi + echo + echo Rendering $ASSETS_DIR/$i.png + $INKSCAPE --export-id=$i \ + --export-id-only \ + --export-type=png \ + -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ + && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png done exit 0 diff --git a/gtk-2.0/render-dark-assets.sh b/gtk-2.0/render-dark-assets.sh deleted file mode 100644 index fd2c80b..0000000 --- a/gtk-2.0/render-dark-assets.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/bash - -INKSCAPE="/usr/bin/inkscape" -OPTIPNG="/usr/bin/optipng" - -SRC_FILE="assets-dark.svg" -ASSETS_DIR="assets-dark" -INDEX="assets.txt" - -for i in `cat $INDEX` -do -if [ -f $ASSETS_DIR/$i.png ]; then - echo $ASSETS_DIR/$i.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ - && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi -done -exit 0 diff --git a/gtk-3.0/assets.svg b/gtk-3.0/assets.svg index f69feea..bb0fdb4 100644 --- a/gtk-3.0/assets.svg +++ b/gtk-3.0/assets.svg @@ -1,220 +1,128 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - + + + + + - + - - + + - - - - - - - + - - + - + - + - - + + - - + - - + @@ -222,333 +130,243 @@ - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - - - + + + + - + - + - + transform="matrix(.93617 0 0 .93566 -96.783 -244.76)"> + + transform="matrix(.50892 0 0 .5174 181.793 197.564)"> - + - - - - - - - - - - + + + + + - + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - + + + + + - + - - + + - - - - - - - + - - + - + - + - - + + - - + - - + @@ -556,333 +374,241 @@ - + - - - - - - - - - + + + + - + - + - + transform="matrix(.93617 0 0 .93566 -96.783 -244.76)"> + + transform="matrix(.50892 0 0 .5174 181.793 197.564)"> - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - + + + + + - + - - + + - - - - - - - + - - + - + - + - - + + - - + - - + @@ -890,224 +616,170 @@ - + - - - - - - - - - + + + + - + - + - + transform="matrix(.93617 0 0 .93566 -96.783 -244.76)"> + + transform="matrix(.50892 0 0 .5174 181.793 197.564)"> - + - - - - - - - - - - + + + + + - + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - + + + + + - + - - + + - - - - - - - + - - + - + - + - - + + - - + - - + @@ -1115,54 +787,46 @@ - + - - - - - - - - - + + + + - + - + - + transform="matrix(.93617 0 0 .93566 -96.783 -244.76)"> + + transform="matrix(.50892 0 0 .5174 181.793 197.564)"> - + @@ -1170,702 +834,449 @@ - - - - - - - + + + + - + - - - - - - + + + + + - - - - + + + + - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - + + + + + d="M172 58a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm-3 3.922h.773a.78.78 0 01.516.234L172 63.867l1.734-1.71c.2-.174.335-.23.516-.235h.75v.75c0 .215-.026.413-.188.562l-1.71 1.711 1.687 1.688c.141.14.211.34.211.539v.75h-.75a.761.761 0 01-.54-.211L172 66l-1.71 1.71a.76.76 0 01-.54.212H169v-.75a.76.76 0 01.21-.54l1.712-1.687-1.711-1.71a.681.681 0 01-.211-.563v-.75z" + transform="translate(1204 190)" id="path4068-7-5-9-6" + fill="#64b5f6" stroke-width="0" stroke-linecap="butt" + stroke-linejoin="miter" stroke-miterlimit="4" + stroke-dasharray="none" stroke-dashoffset="0" /> - - - - - - - - - - - - - - - + + - - - - - + + + d="M1403.8 252h3.381c.45 0 .817.368.819.819v3.382zm2.407 6.007h-3.395a.821.821 0 01-.819-.819v-3.395l4.214 4.214" + opacity="1" fill-rule="evenodd" stroke="none" /> - + - - - - + + + + + d="M172 92a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm-3 3.922h.773a.78.78 0 01.516.234L172 97.867l1.734-1.71c.2-.174.335-.23.516-.235h.75v.75c0 .215-.026.413-.188.562l-1.71 1.711 1.687 1.688c.141.14.211.34.211.539v.75h-.75a.761.761 0 01-.54-.211L172 100l-1.71 1.71a.76.76 0 01-.54.212H169v-.75a.76.76 0 01.21-.54l1.712-1.687-1.711-1.71a.681.681 0 01-.211-.563v-.75z" + transform="translate(1204 156)" id="path4068-7-5-8" + fill="#64b5f6" stroke-width="0" stroke-linecap="butt" + stroke-linejoin="miter" stroke-miterlimit="4" + stroke-dasharray="none" stroke-dashoffset="0" /> - - - - - - - - - - - - - - - + + - - - + + + - - - - - - - - - - - + d="M1302 248a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm0 1a6 6 0 016 6 6 6 0 01-6 6 6 6 0 01-6-6 6 6 0 016-6z" + id="path4068-7-5-9-6-7-2-5-78" opacity=".15" fill="#525d76" + stroke-width="0" stroke-linecap="butt" stroke-linejoin="miter" + stroke-miterlimit="4" stroke-dasharray="none" + stroke-dashoffset="0" /> + + + - + - - - + + + - - - - - - - - - - - + d="M1273 248a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm0 1a6 6 0 016 6 6 6 0 01-6 6 6 6 0 01-6-6 6 6 0 016-6z" + id="path4068-7-5-9-6-7-2-5-23" opacity=".15" fill="#525d76" + stroke-width="0" stroke-linecap="butt" stroke-linejoin="miter" + stroke-miterlimit="4" stroke-dasharray="none" + stroke-dashoffset="0" /> + + + - + - - - - - + + + + + - - - - - - - - + + + + + - - - - + - - - - - + + + + + - - - - - - - - - - - + + + - + - - - - - + + + + + - - - - - - - - - - - + + + - + - - - - - + + + d="M1403.8 252h3.381c.45 0 .817.368.819.819v3.382zm2.407 6.007h-3.395a.821.821 0 01-.819-.819v-3.395l4.214 4.214" + fill="#7a7f8b" fill-rule="evenodd" stroke="none" /> - + - - - - - - + + + - + - - - - - - - - - - - + + + + + + - + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - + + + + + - + - - + + - - - - - - - + - - + - + - + - - + + - - + - - + @@ -1873,334 +1284,246 @@ - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - - - + + + + - + - + - + transform="matrix(.93617 0 0 .93566 -96.783 -244.76)"> + + transform="matrix(.50892 0 0 .5174 181.793 197.564)"> - + - - - - - - - - - - + + + + + - + - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - + + + + + - + - - + + - - - - - - - + - - + - + - + - - + + - - + - - + @@ -2208,54 +1531,45 @@ - + - - - - - - - - - + + + + - + - + - + transform="matrix(.93617 0 0 .93566 -96.783 -244.76)"> + + transform="matrix(.50892 0 0 .5174 181.793 197.564)"> - + @@ -2263,645 +1577,393 @@ - - - + transform="translate(-228 -369)"> + + + - + - - - - + + + + - + - - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + - + - - - - - - + + + - + - - - - + + + + + d="M414 58a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm-3 3.922h.773a.78.78 0 01.516.234L414 63.867l1.734-1.71c.2-.174.335-.23.516-.235h.75v.75c0 .215-.026.413-.188.562l-1.71 1.711 1.687 1.688c.141.14.211.34.211.539v.75h-.75a.761.761 0 01-.54-.211L414 66l-1.71 1.71a.76.76 0 01-.54.212H411v-.75c0-.2.07-.398.21-.54l1.712-1.687-1.711-1.71a.681.681 0 01-.211-.563v-.75z" + transform="translate(962 190)" id="path4068-7-5-9-6-5-8" + fill="#64b5f6" stroke-width="0" stroke-linecap="butt" + stroke-linejoin="miter" stroke-miterlimit="4" + stroke-dasharray="none" stroke-dashoffset="0" /> - - - - - - - - - - - - - - + - - - - - + + + d="M1403.8 252h3.381c.45 0 .817.368.819.819v3.382zm2.407 6.007h-3.395a.821.821 0 01-.819-.819v-3.395l4.214 4.214" + opacity="1" fill="#b9bcc2" fill-rule="evenodd" stroke="none" /> - + - - - - + + + + + d="M414 92a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm-3 3.922h.773a.78.78 0 01.516.234L414 97.867l1.734-1.71c.2-.174.335-.23.516-.235h.75v.75c0 .215-.026.413-.188.562l-1.71 1.711 1.687 1.688c.141.14.211.34.211.539v.75h-.75a.761.761 0 01-.54-.211L414 100l-1.71 1.71a.76.76 0 01-.54.212H411v-.75a.76.76 0 01.21-.54l1.712-1.687-1.711-1.71a.681.681 0 01-.211-.563v-.75z" + transform="translate(962 156)" id="path4068-7-5-8-2-3" + fill="#64b5f6" stroke-width="0" stroke-linecap="butt" + stroke-linejoin="miter" stroke-miterlimit="4" + stroke-dasharray="none" stroke-dashoffset="0" /> - - - - - - - - - - - - - - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M1302 248a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm0 1a6 6 0 016 6 6 6 0 01-6 6 6 6 0 01-6-6 6 6 0 016-6z" + id="path4068-7-5-9-6-7-2-5-78-2-6" opacity=".37" fill="#15171c" + stroke-width="0" stroke-linecap="butt" stroke-linejoin="miter" + stroke-miterlimit="4" stroke-dasharray="none" + stroke-dashoffset="0" /> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="M87.8 972h3.381c.45 0 .817.368.82.819v3.382zm2.407 6.007h-3.395a.821.821 0 01-.819-.819v-3.395l4.214 4.214" + id="path4293-6-7-1" fill="#c4c7cc" fill-rule="evenodd" + stroke="none" /> - + - - - - - - - - - - - - - - - - - - + + + + + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + d="M1403.8 252h3.381c.45 0 .817.368.819.819v3.382zm2.407 6.007h-3.395a.821.821 0 01-.819-.819v-3.395l4.214 4.214" + fill="#b9bcc2" fill-rule="evenodd" stroke="none" /> - + - - - - - - + + + - + - - - - - + + + + + - - - - - - - - + + + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/gtk-3.0/assets.txt b/gtk-3.0/assets.txt index 8d67e51..34cf08c 100644 --- a/gtk-3.0/assets.txt +++ b/gtk-3.0/assets.txt @@ -36,27 +36,5 @@ switch-selected switch-active-selected switch-insensitive-selected switch-active-insensitive-selected -checkbox-checked-dark -checkbox-checked-insensitive-dark -checkbox-unchecked-dark -checkbox-unchecked-insensitive-dark -checkbox-mixed-dark -checkbox-mixed-insensitive-dark -checkbox-checked-selectionmode-dark -checkbox-selectionmode-dark pane-separator -pane-separator-vertical -radio-checked-dark -radio-checked-insensitive-dark -radio-unchecked-dark -radio-unchecked-insensitive-dark -radio-mixed-dark -radio-mixed-insensitive-dark -switch-dark -switch-active-dark -switch-insensitive-dark -switch-active-insensitive-dark -switch-header-dark -switch-active-header-dark -switch-insensitive-header-dark -switch-active-insensitive-header-dark \ No newline at end of file +pane-separator-vertical \ No newline at end of file diff --git a/gtk-3.0/assets/checkbox-checked-dark.png b/gtk-3.0/assets/checkbox-checked-dark.png deleted file mode 100644 index e79f5e8..0000000 Binary files a/gtk-3.0/assets/checkbox-checked-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-checked-dark@2.png b/gtk-3.0/assets/checkbox-checked-dark@2.png deleted file mode 100644 index 02afa22..0000000 Binary files a/gtk-3.0/assets/checkbox-checked-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.png b/gtk-3.0/assets/checkbox-checked-insensitive-dark.png deleted file mode 100644 index 2dac124..0000000 Binary files a/gtk-3.0/assets/checkbox-checked-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark@2.png b/gtk-3.0/assets/checkbox-checked-insensitive-dark@2.png deleted file mode 100644 index 92c2b6b..0000000 Binary files a/gtk-3.0/assets/checkbox-checked-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-selected@2.png b/gtk-3.0/assets/checkbox-checked-insensitive-selected@2.png index 480c3fc..4bf6f6a 100644 Binary files a/gtk-3.0/assets/checkbox-checked-insensitive-selected@2.png and b/gtk-3.0/assets/checkbox-checked-insensitive-selected@2.png differ diff --git a/gtk-3.0/assets/checkbox-checked-insensitive@2.png b/gtk-3.0/assets/checkbox-checked-insensitive@2.png index 3eda635..f934c19 100644 Binary files a/gtk-3.0/assets/checkbox-checked-insensitive@2.png and b/gtk-3.0/assets/checkbox-checked-insensitive@2.png differ diff --git a/gtk-3.0/assets/checkbox-checked-selected@2.png b/gtk-3.0/assets/checkbox-checked-selected@2.png index cf54d52..c672d65 100644 Binary files a/gtk-3.0/assets/checkbox-checked-selected@2.png and b/gtk-3.0/assets/checkbox-checked-selected@2.png differ diff --git a/gtk-3.0/assets/checkbox-checked-selectionmode-dark.png b/gtk-3.0/assets/checkbox-checked-selectionmode-dark.png deleted file mode 100644 index 2a00ec4..0000000 Binary files a/gtk-3.0/assets/checkbox-checked-selectionmode-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-checked-selectionmode-dark@2.png b/gtk-3.0/assets/checkbox-checked-selectionmode-dark@2.png deleted file mode 100644 index 525aa4f..0000000 Binary files a/gtk-3.0/assets/checkbox-checked-selectionmode-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-checked-selectionmode@2.png b/gtk-3.0/assets/checkbox-checked-selectionmode@2.png index a57df8d..3757ec6 100644 Binary files a/gtk-3.0/assets/checkbox-checked-selectionmode@2.png and b/gtk-3.0/assets/checkbox-checked-selectionmode@2.png differ diff --git a/gtk-3.0/assets/checkbox-checked@2.png b/gtk-3.0/assets/checkbox-checked@2.png index 2f02b46..b5bf873 100644 Binary files a/gtk-3.0/assets/checkbox-checked@2.png and b/gtk-3.0/assets/checkbox-checked@2.png differ diff --git a/gtk-3.0/assets/checkbox-mixed-dark.png b/gtk-3.0/assets/checkbox-mixed-dark.png deleted file mode 100644 index 40e163e..0000000 Binary files a/gtk-3.0/assets/checkbox-mixed-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-mixed-dark@2.png b/gtk-3.0/assets/checkbox-mixed-dark@2.png deleted file mode 100644 index 8674b40..0000000 Binary files a/gtk-3.0/assets/checkbox-mixed-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png deleted file mode 100644 index 96001f0..0000000 Binary files a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark@2.png b/gtk-3.0/assets/checkbox-mixed-insensitive-dark@2.png deleted file mode 100644 index 4a10092..0000000 Binary files a/gtk-3.0/assets/checkbox-mixed-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-selectionmode-dark.png b/gtk-3.0/assets/checkbox-selectionmode-dark.png deleted file mode 100644 index 2127487..0000000 Binary files a/gtk-3.0/assets/checkbox-selectionmode-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-selectionmode-dark@2.png b/gtk-3.0/assets/checkbox-selectionmode-dark@2.png deleted file mode 100644 index c6a8aaa..0000000 Binary files a/gtk-3.0/assets/checkbox-selectionmode-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-selectionmode@2.png b/gtk-3.0/assets/checkbox-selectionmode@2.png index 6ed1f39..3e6b9a7 100644 Binary files a/gtk-3.0/assets/checkbox-selectionmode@2.png and b/gtk-3.0/assets/checkbox-selectionmode@2.png differ diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.png b/gtk-3.0/assets/checkbox-unchecked-dark.png deleted file mode 100644 index ac81a2a..0000000 Binary files a/gtk-3.0/assets/checkbox-unchecked-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-unchecked-dark@2.png b/gtk-3.0/assets/checkbox-unchecked-dark@2.png deleted file mode 100644 index a272da8..0000000 Binary files a/gtk-3.0/assets/checkbox-unchecked-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png deleted file mode 100644 index 99a76d7..0000000 Binary files a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark@2.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark@2.png deleted file mode 100644 index 8fc81d0..0000000 Binary files a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-checked-dark.png b/gtk-3.0/assets/radio-checked-dark.png deleted file mode 100644 index 3cb150e..0000000 Binary files a/gtk-3.0/assets/radio-checked-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-checked-dark@2.png b/gtk-3.0/assets/radio-checked-dark@2.png deleted file mode 100644 index 5a1163f..0000000 Binary files a/gtk-3.0/assets/radio-checked-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.png b/gtk-3.0/assets/radio-checked-insensitive-dark.png deleted file mode 100644 index 5376154..0000000 Binary files a/gtk-3.0/assets/radio-checked-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark@2.png b/gtk-3.0/assets/radio-checked-insensitive-dark@2.png deleted file mode 100644 index 29c8194..0000000 Binary files a/gtk-3.0/assets/radio-checked-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-checked-insensitive-selected.png b/gtk-3.0/assets/radio-checked-insensitive-selected.png index dc7cb05..6c9d250 100644 Binary files a/gtk-3.0/assets/radio-checked-insensitive-selected.png and b/gtk-3.0/assets/radio-checked-insensitive-selected.png differ diff --git a/gtk-3.0/assets/radio-checked-insensitive-selected@2.png b/gtk-3.0/assets/radio-checked-insensitive-selected@2.png index 4e628db..f805275 100644 Binary files a/gtk-3.0/assets/radio-checked-insensitive-selected@2.png and b/gtk-3.0/assets/radio-checked-insensitive-selected@2.png differ diff --git a/gtk-3.0/assets/radio-checked-insensitive.png b/gtk-3.0/assets/radio-checked-insensitive.png index 2da0c50..b8ab92b 100644 Binary files a/gtk-3.0/assets/radio-checked-insensitive.png and b/gtk-3.0/assets/radio-checked-insensitive.png differ diff --git a/gtk-3.0/assets/radio-checked-insensitive@2.png b/gtk-3.0/assets/radio-checked-insensitive@2.png index 11b4c9b..4393d4d 100644 Binary files a/gtk-3.0/assets/radio-checked-insensitive@2.png and b/gtk-3.0/assets/radio-checked-insensitive@2.png differ diff --git a/gtk-3.0/assets/radio-checked-selected.png b/gtk-3.0/assets/radio-checked-selected.png index 192fb95..942dcb7 100644 Binary files a/gtk-3.0/assets/radio-checked-selected.png and b/gtk-3.0/assets/radio-checked-selected.png differ diff --git a/gtk-3.0/assets/radio-checked-selected@2.png b/gtk-3.0/assets/radio-checked-selected@2.png index 75ad3f5..e6c8963 100644 Binary files a/gtk-3.0/assets/radio-checked-selected@2.png and b/gtk-3.0/assets/radio-checked-selected@2.png differ diff --git a/gtk-3.0/assets/radio-checked.png b/gtk-3.0/assets/radio-checked.png index aa4111b..ef39be0 100644 Binary files a/gtk-3.0/assets/radio-checked.png and b/gtk-3.0/assets/radio-checked.png differ diff --git a/gtk-3.0/assets/radio-checked@2.png b/gtk-3.0/assets/radio-checked@2.png index 8b0b381..002e50f 100644 Binary files a/gtk-3.0/assets/radio-checked@2.png and b/gtk-3.0/assets/radio-checked@2.png differ diff --git a/gtk-3.0/assets/radio-mixed-dark.png b/gtk-3.0/assets/radio-mixed-dark.png deleted file mode 100644 index 5e71da4..0000000 Binary files a/gtk-3.0/assets/radio-mixed-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-mixed-dark@2.png b/gtk-3.0/assets/radio-mixed-dark@2.png deleted file mode 100644 index 2407096..0000000 Binary files a/gtk-3.0/assets/radio-mixed-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.png b/gtk-3.0/assets/radio-mixed-insensitive-dark.png deleted file mode 100644 index 9c360b6..0000000 Binary files a/gtk-3.0/assets/radio-mixed-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark@2.png b/gtk-3.0/assets/radio-mixed-insensitive-dark@2.png deleted file mode 100644 index bf337a5..0000000 Binary files a/gtk-3.0/assets/radio-mixed-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-mixed-insensitive-selected@2.png b/gtk-3.0/assets/radio-mixed-insensitive-selected@2.png index 8288571..ae4d79d 100644 Binary files a/gtk-3.0/assets/radio-mixed-insensitive-selected@2.png and b/gtk-3.0/assets/radio-mixed-insensitive-selected@2.png differ diff --git a/gtk-3.0/assets/radio-mixed-selected@2.png b/gtk-3.0/assets/radio-mixed-selected@2.png index 4b4b27e..29287d9 100644 Binary files a/gtk-3.0/assets/radio-mixed-selected@2.png and b/gtk-3.0/assets/radio-mixed-selected@2.png differ diff --git a/gtk-3.0/assets/radio-mixed@2.png b/gtk-3.0/assets/radio-mixed@2.png index 93b6daa..2105b0b 100644 Binary files a/gtk-3.0/assets/radio-mixed@2.png and b/gtk-3.0/assets/radio-mixed@2.png differ diff --git a/gtk-3.0/assets/radio-unchecked-dark.png b/gtk-3.0/assets/radio-unchecked-dark.png deleted file mode 100644 index 49e9785..0000000 Binary files a/gtk-3.0/assets/radio-unchecked-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-unchecked-dark@2.png b/gtk-3.0/assets/radio-unchecked-dark@2.png deleted file mode 100644 index d18c4c6..0000000 Binary files a/gtk-3.0/assets/radio-unchecked-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png deleted file mode 100644 index 025396e..0000000 Binary files a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark@2.png b/gtk-3.0/assets/radio-unchecked-insensitive-dark@2.png deleted file mode 100644 index bde9039..0000000 Binary files a/gtk-3.0/assets/radio-unchecked-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-selected.png b/gtk-3.0/assets/radio-unchecked-insensitive-selected.png index 1031d4d..959c115 100644 Binary files a/gtk-3.0/assets/radio-unchecked-insensitive-selected.png and b/gtk-3.0/assets/radio-unchecked-insensitive-selected.png differ diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-selected@2.png b/gtk-3.0/assets/radio-unchecked-insensitive-selected@2.png index 93e13d8..77888fb 100644 Binary files a/gtk-3.0/assets/radio-unchecked-insensitive-selected@2.png and b/gtk-3.0/assets/radio-unchecked-insensitive-selected@2.png differ diff --git a/gtk-3.0/assets/radio-unchecked-insensitive.png b/gtk-3.0/assets/radio-unchecked-insensitive.png index 0825874..b62d063 100644 Binary files a/gtk-3.0/assets/radio-unchecked-insensitive.png and b/gtk-3.0/assets/radio-unchecked-insensitive.png differ diff --git a/gtk-3.0/assets/radio-unchecked-insensitive@2.png b/gtk-3.0/assets/radio-unchecked-insensitive@2.png index 9036bb4..c5bfb2b 100644 Binary files a/gtk-3.0/assets/radio-unchecked-insensitive@2.png and b/gtk-3.0/assets/radio-unchecked-insensitive@2.png differ diff --git a/gtk-3.0/assets/radio-unchecked-selected.png b/gtk-3.0/assets/radio-unchecked-selected.png index d87afb9..1cd68fc 100644 Binary files a/gtk-3.0/assets/radio-unchecked-selected.png and b/gtk-3.0/assets/radio-unchecked-selected.png differ diff --git a/gtk-3.0/assets/radio-unchecked-selected@2.png b/gtk-3.0/assets/radio-unchecked-selected@2.png index 96a474b..99171ab 100644 Binary files a/gtk-3.0/assets/radio-unchecked-selected@2.png and b/gtk-3.0/assets/radio-unchecked-selected@2.png differ diff --git a/gtk-3.0/assets/radio-unchecked.png b/gtk-3.0/assets/radio-unchecked.png index 9c00114..661a41e 100644 Binary files a/gtk-3.0/assets/radio-unchecked.png and b/gtk-3.0/assets/radio-unchecked.png differ diff --git a/gtk-3.0/assets/radio-unchecked@2.png b/gtk-3.0/assets/radio-unchecked@2.png index e817a91..622aacc 100644 Binary files a/gtk-3.0/assets/radio-unchecked@2.png and b/gtk-3.0/assets/radio-unchecked@2.png differ diff --git a/gtk-3.0/assets/switch-active-dark.png b/gtk-3.0/assets/switch-active-dark.png deleted file mode 100644 index 4be1ede..0000000 Binary files a/gtk-3.0/assets/switch-active-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-dark@2.png b/gtk-3.0/assets/switch-active-dark@2.png deleted file mode 100644 index 2fcf9af..0000000 Binary files a/gtk-3.0/assets/switch-active-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-header-dark.png b/gtk-3.0/assets/switch-active-header-dark.png deleted file mode 100644 index a615ca1..0000000 Binary files a/gtk-3.0/assets/switch-active-header-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-header-dark@2.png b/gtk-3.0/assets/switch-active-header-dark@2.png deleted file mode 100644 index 3730d53..0000000 Binary files a/gtk-3.0/assets/switch-active-header-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-header.png b/gtk-3.0/assets/switch-active-header.png index b47e84b..b14280b 100644 Binary files a/gtk-3.0/assets/switch-active-header.png and b/gtk-3.0/assets/switch-active-header.png differ diff --git a/gtk-3.0/assets/switch-active-header@2.png b/gtk-3.0/assets/switch-active-header@2.png index ef18572..85089f6 100644 Binary files a/gtk-3.0/assets/switch-active-header@2.png and b/gtk-3.0/assets/switch-active-header@2.png differ diff --git a/gtk-3.0/assets/switch-active-insensitive-dark.png b/gtk-3.0/assets/switch-active-insensitive-dark.png deleted file mode 100644 index e55151c..0000000 Binary files a/gtk-3.0/assets/switch-active-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-insensitive-dark@2.png b/gtk-3.0/assets/switch-active-insensitive-dark@2.png deleted file mode 100644 index 2e16b73..0000000 Binary files a/gtk-3.0/assets/switch-active-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-insensitive-header-dark.png b/gtk-3.0/assets/switch-active-insensitive-header-dark.png deleted file mode 100644 index 2833faa..0000000 Binary files a/gtk-3.0/assets/switch-active-insensitive-header-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-insensitive-header-dark@2.png b/gtk-3.0/assets/switch-active-insensitive-header-dark@2.png deleted file mode 100644 index a5f53f9..0000000 Binary files a/gtk-3.0/assets/switch-active-insensitive-header-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-active-insensitive-header.png b/gtk-3.0/assets/switch-active-insensitive-header.png index e5ecde5..b9be8e5 100644 Binary files a/gtk-3.0/assets/switch-active-insensitive-header.png and b/gtk-3.0/assets/switch-active-insensitive-header.png differ diff --git a/gtk-3.0/assets/switch-active-insensitive-header@2.png b/gtk-3.0/assets/switch-active-insensitive-header@2.png index 818244b..5c16e6c 100644 Binary files a/gtk-3.0/assets/switch-active-insensitive-header@2.png and b/gtk-3.0/assets/switch-active-insensitive-header@2.png differ diff --git a/gtk-3.0/assets/switch-active-insensitive-selected.png b/gtk-3.0/assets/switch-active-insensitive-selected.png index 50f8b26..2476ae1 100644 Binary files a/gtk-3.0/assets/switch-active-insensitive-selected.png and b/gtk-3.0/assets/switch-active-insensitive-selected.png differ diff --git a/gtk-3.0/assets/switch-active-insensitive-selected@2.png b/gtk-3.0/assets/switch-active-insensitive-selected@2.png index b244682..02e7f75 100644 Binary files a/gtk-3.0/assets/switch-active-insensitive-selected@2.png and b/gtk-3.0/assets/switch-active-insensitive-selected@2.png differ diff --git a/gtk-3.0/assets/switch-active-insensitive.png b/gtk-3.0/assets/switch-active-insensitive.png index e5ecde5..b9be8e5 100644 Binary files a/gtk-3.0/assets/switch-active-insensitive.png and b/gtk-3.0/assets/switch-active-insensitive.png differ diff --git a/gtk-3.0/assets/switch-active-insensitive@2.png b/gtk-3.0/assets/switch-active-insensitive@2.png index 818244b..5c16e6c 100644 Binary files a/gtk-3.0/assets/switch-active-insensitive@2.png and b/gtk-3.0/assets/switch-active-insensitive@2.png differ diff --git a/gtk-3.0/assets/switch-active-selected.png b/gtk-3.0/assets/switch-active-selected.png index e4b2f5a..8076c22 100644 Binary files a/gtk-3.0/assets/switch-active-selected.png and b/gtk-3.0/assets/switch-active-selected.png differ diff --git a/gtk-3.0/assets/switch-active-selected@2.png b/gtk-3.0/assets/switch-active-selected@2.png index 4384aff..bcdcc27 100644 Binary files a/gtk-3.0/assets/switch-active-selected@2.png and b/gtk-3.0/assets/switch-active-selected@2.png differ diff --git a/gtk-3.0/assets/switch-active.png b/gtk-3.0/assets/switch-active.png index b47e84b..b14280b 100644 Binary files a/gtk-3.0/assets/switch-active.png and b/gtk-3.0/assets/switch-active.png differ diff --git a/gtk-3.0/assets/switch-active@2.png b/gtk-3.0/assets/switch-active@2.png index ef18572..85089f6 100644 Binary files a/gtk-3.0/assets/switch-active@2.png and b/gtk-3.0/assets/switch-active@2.png differ diff --git a/gtk-3.0/assets/switch-dark.png b/gtk-3.0/assets/switch-dark.png deleted file mode 100644 index 101d5cc..0000000 Binary files a/gtk-3.0/assets/switch-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-dark@2.png b/gtk-3.0/assets/switch-dark@2.png deleted file mode 100644 index 2dd21db..0000000 Binary files a/gtk-3.0/assets/switch-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-header-dark.png b/gtk-3.0/assets/switch-header-dark.png deleted file mode 100644 index b8b373c..0000000 Binary files a/gtk-3.0/assets/switch-header-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-header-dark@2.png b/gtk-3.0/assets/switch-header-dark@2.png deleted file mode 100644 index 8230b0a..0000000 Binary files a/gtk-3.0/assets/switch-header-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-header.png b/gtk-3.0/assets/switch-header.png index 2e2a712..1d56986 100644 Binary files a/gtk-3.0/assets/switch-header.png and b/gtk-3.0/assets/switch-header.png differ diff --git a/gtk-3.0/assets/switch-header@2.png b/gtk-3.0/assets/switch-header@2.png index 552d099..24b6d61 100644 Binary files a/gtk-3.0/assets/switch-header@2.png and b/gtk-3.0/assets/switch-header@2.png differ diff --git a/gtk-3.0/assets/switch-insensitive-dark.png b/gtk-3.0/assets/switch-insensitive-dark.png deleted file mode 100644 index 3f30c38..0000000 Binary files a/gtk-3.0/assets/switch-insensitive-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-insensitive-dark@2.png b/gtk-3.0/assets/switch-insensitive-dark@2.png deleted file mode 100644 index 10d97df..0000000 Binary files a/gtk-3.0/assets/switch-insensitive-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-insensitive-header-dark.png b/gtk-3.0/assets/switch-insensitive-header-dark.png deleted file mode 100644 index 134616b..0000000 Binary files a/gtk-3.0/assets/switch-insensitive-header-dark.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-insensitive-header-dark@2.png b/gtk-3.0/assets/switch-insensitive-header-dark@2.png deleted file mode 100644 index ae25ee0..0000000 Binary files a/gtk-3.0/assets/switch-insensitive-header-dark@2.png and /dev/null differ diff --git a/gtk-3.0/assets/switch-insensitive-header.png b/gtk-3.0/assets/switch-insensitive-header.png index ef091b5..955b506 100644 Binary files a/gtk-3.0/assets/switch-insensitive-header.png and b/gtk-3.0/assets/switch-insensitive-header.png differ diff --git a/gtk-3.0/assets/switch-insensitive-header@2.png b/gtk-3.0/assets/switch-insensitive-header@2.png index 92642d1..f445f99 100644 Binary files a/gtk-3.0/assets/switch-insensitive-header@2.png and b/gtk-3.0/assets/switch-insensitive-header@2.png differ diff --git a/gtk-3.0/assets/switch-insensitive-selected.png b/gtk-3.0/assets/switch-insensitive-selected.png index 8fa13aa..3315e14 100644 Binary files a/gtk-3.0/assets/switch-insensitive-selected.png and b/gtk-3.0/assets/switch-insensitive-selected.png differ diff --git a/gtk-3.0/assets/switch-insensitive-selected@2.png b/gtk-3.0/assets/switch-insensitive-selected@2.png index 729a446..51ee901 100644 Binary files a/gtk-3.0/assets/switch-insensitive-selected@2.png and b/gtk-3.0/assets/switch-insensitive-selected@2.png differ diff --git a/gtk-3.0/assets/switch-insensitive.png b/gtk-3.0/assets/switch-insensitive.png index c85841c..5802137 100644 Binary files a/gtk-3.0/assets/switch-insensitive.png and b/gtk-3.0/assets/switch-insensitive.png differ diff --git a/gtk-3.0/assets/switch-insensitive@2.png b/gtk-3.0/assets/switch-insensitive@2.png index 863bbc6..175f19b 100644 Binary files a/gtk-3.0/assets/switch-insensitive@2.png and b/gtk-3.0/assets/switch-insensitive@2.png differ diff --git a/gtk-3.0/assets/switch-selected.png b/gtk-3.0/assets/switch-selected.png index 631bb74..6e5777e 100644 Binary files a/gtk-3.0/assets/switch-selected.png and b/gtk-3.0/assets/switch-selected.png differ diff --git a/gtk-3.0/assets/switch-selected@2.png b/gtk-3.0/assets/switch-selected@2.png index 194570c..9d4d319 100644 Binary files a/gtk-3.0/assets/switch-selected@2.png and b/gtk-3.0/assets/switch-selected@2.png differ diff --git a/gtk-3.0/assets/switch.png b/gtk-3.0/assets/switch.png index 89a4a21..5b70aaa 100644 Binary files a/gtk-3.0/assets/switch.png and b/gtk-3.0/assets/switch.png differ diff --git a/gtk-3.0/assets/switch@2.png b/gtk-3.0/assets/switch@2.png index d13edd6..67687b9 100644 Binary files a/gtk-3.0/assets/switch@2.png and b/gtk-3.0/assets/switch@2.png differ diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 915046c..01b69fe 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1,14 +1,123 @@ +/** + * {} + * @authors yutent + * @date 2022/05/09 11:11:02 + */ +.primary-toolbar toolbar.selection-mode button:hover, +.selection-mode.primary-toolbar button:hover, .primary-toolbar .selection-mode.inline-toolbar button:hover, headerbar.selection-mode button:hover, infobar.info button, infobar.question button, infobar.warning button, infobar.error button, row:selected button { + color: #f2f5fc; + background-color: rgba(242, 245, 252, 0); + border-color: rgba(242, 245, 252, 0.5); +} + +infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat, row:selected button.flat { + border-color: transparent; + background-color: transparent; + background-image: none; + color: #f2f5fc; + background-color: rgba(242, 245, 252, 0); +} +.primary-toolbar toolbar.selection-mode button:disabled, +.selection-mode.primary-toolbar button:disabled, .primary-toolbar .selection-mode.inline-toolbar button:disabled, headerbar.selection-mode button:disabled, +.primary-toolbar toolbar.selection-mode button:disabled label, +.selection-mode.primary-toolbar button:disabled label, +.primary-toolbar .selection-mode.inline-toolbar button:disabled label, +headerbar.selection-mode button:disabled label, infobar.info button.flat:disabled, infobar.question button.flat:disabled, infobar.warning button.flat:disabled, infobar.error button.flat:disabled, row:selected button.flat:disabled, +infobar.info button.flat:disabled label, +infobar.question button.flat:disabled label, +infobar.warning button.flat:disabled label, +infobar.error button.flat:disabled label, +row:selected button.flat:disabled label { + color: rgba(242, 245, 252, 0.4); +} + +infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover, row:selected button:hover { + color: #f2f5fc; + background-color: rgba(242, 245, 252, 0.2); + border-color: rgba(242, 245, 252, 0.8); +} +.primary-toolbar toolbar.selection-mode button:active, +.selection-mode.primary-toolbar button:active, .primary-toolbar .selection-mode.inline-toolbar button:active, headerbar.selection-mode button:active, .primary-toolbar toolbar.selection-mode button:checked, +.selection-mode.primary-toolbar button:checked, .primary-toolbar .selection-mode.inline-toolbar button:checked, headerbar.selection-mode button:checked, infobar.info button:active, infobar.question button:active, infobar.warning button:active, infobar.error button:active, row:selected button:active, infobar.info button:checked, infobar.question button:checked, infobar.warning button:checked, infobar.error button:checked, row:selected button:checked { + color: rgba(100, 181, 246, 0.35); + background-color: #f2f5fc; + border-color: #f2f5fc; +} + +infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled, row:selected button:disabled { + background-color: rgba(242, 245, 252, 0); + border-color: rgba(242, 245, 252, 0.4); +} +infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled, row:selected button:disabled, +infobar.info button:disabled label, +infobar.question button:disabled label, +infobar.warning button:disabled label, +infobar.error button:disabled label, +row:selected button:disabled label { + color: rgba(242, 245, 252, 0.5); +} +.primary-toolbar toolbar.selection-mode button:disabled:checked, +.selection-mode.primary-toolbar button:disabled:checked, .primary-toolbar .selection-mode.inline-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .primary-toolbar toolbar.selection-mode button:disabled:active, +.selection-mode.primary-toolbar button:disabled:active, .primary-toolbar .selection-mode.inline-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, infobar.info button:disabled:active, infobar.question button:disabled:active, infobar.warning button:disabled:active, infobar.error button:disabled:active, row:selected button:disabled:active, infobar.info button:disabled:checked, infobar.question button:disabled:checked, infobar.warning button:disabled:checked, infobar.error button:disabled:checked, row:selected button:disabled:checked { + color: rgba(100, 181, 246, 0.35); + background-color: rgba(242, 245, 252, 0.5); + border-color: rgba(242, 245, 252, 0.4); +} + +.caja-navigation-window .view .cell:selected, .caja-navigation-window iconview .cell:selected, .caja-navigation-window .view .cell:selected:focus, .nemo-window .nemo-inactive-pane .view:selected:focus, .nemo-window .nemo-inactive-pane iconview:selected:focus, .nemo-window .nemo-inactive-pane .view:selected, .nemo-window .nemo-inactive-pane iconview:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar list row.sidebar-row:active:hover, +filechooser placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, +filechooser placessidebar.sidebar list row.sidebar-row:selected, +filechooser placessidebar.sidebar list row.sidebar-row:selected:hover, +filechooser placessidebar.sidebar list row.sidebar-row:active:hover, row:selected, treeview.view:selected, treeview.view:selected:focus, entry selection:focus, entry selection, flowbox flowboxchild:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, +textview text selection:focus, +textview text selection, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, +.view text:selected, +iconview text:selected, +textview text:selected, +.view text:selected:focus, +iconview text:selected:focus, +textview text:selected:focus { + background-color: rgba(100, 181, 246, 0.35); +} +row:selected label, label:selected, .caja-navigation-window .view .cell:selected, .caja-navigation-window iconview .cell:selected, .caja-navigation-window .view .cell:selected:focus, .nemo-window .nemo-inactive-pane .view:selected:focus, .nemo-window .nemo-inactive-pane iconview:selected:focus, .nemo-window .nemo-inactive-pane .view:selected, .nemo-window .nemo-inactive-pane iconview:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar list row.sidebar-row:active:hover, +filechooser placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, +filechooser placessidebar.sidebar list row.sidebar-row:selected, +filechooser placessidebar.sidebar list row.sidebar-row:selected:hover, +filechooser placessidebar.sidebar list row.sidebar-row:active:hover, row:selected, treeview.view:selected, treeview.view:selected:focus, entry selection:focus, entry selection, flowbox flowboxchild:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, +textview text selection:focus, +textview text selection, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, +.view text:selected, +iconview text:selected, +textview text:selected, +.view text:selected:focus, +iconview text:selected:focus, +textview text:selected:focus { + color: #f2f5fc; +} +label:disabled selection, row:selected label:disabled, label:disabled:selected, .caja-navigation-window .view .cell:disabled:selected, .caja-navigation-window iconview .cell:disabled:selected, .nemo-window .nemo-inactive-pane .view:disabled:selected:focus, .nemo-window .nemo-inactive-pane iconview:disabled:selected:focus, .nemo-window .nemo-inactive-pane .view:disabled:selected, .nemo-window .nemo-inactive-pane iconview:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:disabled:active:hover, +filechooser placessidebar.sidebar list row.sidebar-row.has-open-popup:disabled:selected, +filechooser placessidebar.sidebar list row.sidebar-row:disabled:selected, +filechooser placessidebar.sidebar list row.sidebar-row:disabled:selected:hover, +filechooser placessidebar.sidebar list row.sidebar-row:disabled:active:hover, row:disabled:selected, entry selection:disabled, flowbox flowboxchild:disabled:selected, .view text selection:disabled, iconview text selection:disabled, +textview text selection:disabled:focus, +textview text selection:disabled, .view:disabled:selected, iconview:disabled:selected, +.view text:disabled:selected, +iconview text:disabled:selected, +textview text:disabled:selected { + color: rgba(217, 234, 251, 0.675); +} + * { background-clip: padding-box; -GtkToolButton-icon-spacing: 4; - -GtkTextView-error-underline-color: #FC4138; + -GtkTextView-error-underline-color: #fc7661; -GtkScrolledWindow-scrollbar-spacing: 0; -GtkToolItemGroup-expander-size: 11; -GtkWidget-text-handle-width: 20; -GtkWidget-text-handle-height: 20; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 6; - outline-color: rgba(255, 255, 255, 0.17); + outline-color: rgba(206, 214, 224, 0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; @@ -16,8 +125,8 @@ } .background { - color: rgba(255, 255, 255, 0.87); - background-color: rgba(56, 56, 56, 0.999); + color: #ced6e0; + background-color: #57606f; } *:disabled { @@ -25,32 +134,32 @@ } .gtkstyle-fallback { - background-color: #383838; - color: rgba(255, 255, 255, 0.87); + background-color: #57606f; + color: #ced6e0; } .gtkstyle-fallback:hover { - background-color: #525252; - color: rgba(255, 255, 255, 0.87); + background-color: #6d798c; + color: #ced6e0; } .gtkstyle-fallback:active { - background-color: #1f1f1f; - color: rgba(255, 255, 255, 0.87); + background-color: #414752; + color: #ced6e0; } .gtkstyle-fallback:disabled { - background-color: #3d3d3d; - color: rgba(255, 255, 255, 0.42); + background-color: #5b6575; + color: #86909b; } .gtkstyle-fallback:selected { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } .view, iconview, .view text, iconview text, textview text { - color: #DADADA; - background-color: #404040; + color: #dae1e9; + background-color: #57606f; } .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, @@ -63,13 +172,13 @@ textview text:selected:focus { } textview border { - background-color: #3c3c3c; + background-color: #4a5767; } rubberband, .content-view rubberband, treeview.view rubberband, flowbox rubberband, .rubberband { - border: 1px solid #76905b; - background-color: rgba(118, 144, 91, 0.2); + border: 1px solid rgba(52, 158, 243, 0.35); + background-colo: #f30; } flowbox flowboxchild { @@ -81,29 +190,29 @@ flowbox flowboxchild:selected { } label.separator { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } label selection { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); } label:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } .dim-label, popover label.separator, popover.background label.separator, label.separator { - color: rgba(255, 255, 255, 0.52); + color: rgba(206, 214, 224, 0.65); } assistant .sidebar { - background-color: #404040; - border-top: 1px solid #292929; + background-color: #3c4d5e; + border-top: 1px solid #86909b; } assistant .sidebar:dir(ltr) { - border-right: 1px solid #292929; + border-right: 1px solid #86909b; } assistant .sidebar:dir(rtl) { - border-left: 1px solid #292929; + border-left: 1px solid #86909b; } assistant.csd .sidebar { border-top-style: none; @@ -112,23 +221,24 @@ assistant .sidebar label { padding: 6px 12px; } assistant .sidebar label.highlight { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } textview { - background-color: #3c3c3c; - color: #DADADA; + background-color: #4a5767; + color: #dae1e9; } .osd .scale-popup, popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier, popover.background.osd, popover.background.magnifier, .csd popover.background.osd, -.csd popover.background.magnifier, .osd { - color: #dbdbdb; +.csd popover.background.magnifier, +.osd { + color: #f2f5fc; border: none; - background-color: #353535; + background-color: #3c4d5e; background-clip: padding-box; box-shadow: none; } @@ -157,15 +267,15 @@ entry { caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); - color: #DADADA; - border-color: #292929; - background-color: #404040; + color: #dae1e9; + border-color: #86909b; + background-color: #3c4d5e; } entry.search { border-radius: 4px; } entry image { - color: rgba(208, 208, 208, 0.896); + color: #b1bbc6; } entry image.left { padding-left: 0; @@ -177,28 +287,28 @@ entry image.right { } entry.flat, entry.flat:focus { padding: 2px; - color: #DADADA; - border-color: #292929; - background-color: #404040; + color: #dae1e9; + border-color: #86909b; + background-color: #3c4d5e; border: none; border-radius: 0; } entry:focus { background-clip: border-box; - color: #DADADA; - border-color: #292929; - background-color: #404040; - box-shadow: inset 1px 0 #8fa876, inset -1px 0 #8fa876, inset 0 1px #8fa876, inset 0 -1px #8fa876; + color: #dae1e9; + border-color: #86909b; + background-color: #3c4d5e; + box-shadow: inset 1px 0 rgba(100, 181, 246, 0.35), inset -1px 0 rgba(100, 181, 246, 0.35), inset 0 1px rgba(100, 181, 246, 0.35), inset 0 -1px rgba(100, 181, 246, 0.35); } entry:disabled { - color: rgba(255, 255, 255, 0.42); - border-color: rgba(41, 41, 41, 0.55); - background-color: rgba(64, 64, 64, 0.55); + color: #86909b; + border-color: rgba(134, 144, 155, 0.55); + background-color: rgba(60, 77, 94, 0.55); } entry.warning { color: white; - border-color: #292929; - background-color: #ab6239; + border-color: #86909b; + background-color: #a96745; } entry.warning image { color: white; @@ -208,74 +318,78 @@ entry.warning:focus { background-color: #f27835; box-shadow: none; } -entry.warning selection, entry.warning selection:focus { +entry.warning selection, +entry.warning selection:focus { background-color: white; color: #f27835; } entry.error { color: white; - border-color: #292929; - background-color: #b1413b; + border-color: #86909b; + background-color: #af6660; } entry.error image { color: white; } entry.error:focus { color: white; - background-color: #FC4138; + background-color: #fc7661; box-shadow: none; } -entry.error selection, entry.error selection:focus { +entry.error selection, +entry.error selection:focus { background-color: white; - color: #FC4138; + color: #fc7661; } entry.search-missing { color: white; - border-color: #292929; - background-color: #b1413b; + border-color: #86909b; + background-color: #af6660; } entry.search-missing image { color: white; } entry.search-missing:focus { color: white; - background-color: #FC4138; + background-color: #fc7661; box-shadow: none; } -entry.search-missing selection, entry.search-missing selection:focus { +entry.search-missing selection, +entry.search-missing selection:focus { background-color: white; - color: #FC4138; + color: #fc7661; } entry:drop(active):focus, entry:drop(active) { - border-color: #8fa876; + border-color: rgba(100, 181, 246, 0.35); box-shadow: none; } .osd entry { - color: #dbdbdb; - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.4); + color: #f2f5fc; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.4); } -.osd entry image, .osd entry image:hover { +.osd entry image, +.osd entry image:hover { color: inherit; } .osd entry:focus { - color: #ffffff; - border-color: rgba(22, 22, 22, 0.4); - background-color: #8fa876; + color: #f2f5fc; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(100, 181, 246, 0.35); } .osd entry:disabled { - color: rgba(219, 219, 219, 0.55); - background-color: rgba(109, 109, 109, 0.25); + color: rgba(242, 245, 252, 0.55); + background-color: rgba(106, 133, 160, 0.25); } .osd entry selection:focus, .osd entry selection { - color: #8fa876; - background-color: #ffffff; + color: rgba(100, 181, 246, 0.35); + background-color: #f2f5fc; } entry progress { margin: 0 -6px; border-radius: 0; border-width: 0 0 2px; - border-color: #8fa876; + border-color: rgba(100, 181, 246, 0.35); border-style: solid; background-image: none; background-color: transparent; @@ -284,18 +398,18 @@ entry progress { treeview entry.flat, treeview entry { border-radius: 0; background-image: none; - background-color: #404040; + background-color: #3c4d5e; } treeview entry.flat:focus, treeview entry:focus { - border-color: #8fa876; + border-color: rgba(100, 181, 246, 0.35); } @keyframes needs_attention { from { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(#8fa876), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.01, to(rgba(100, 181, 246, 0.35)), to(transparent)); } to { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#8fa876), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(100, 181, 246, 0.35)), to(transparent)); } } button { @@ -305,10 +419,10 @@ button { border: 1px solid; border-radius: 3px; padding: 5px 8px; - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #454545; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #405264; } button separator { margin: 4px 1px; @@ -328,16 +442,16 @@ button.sidebar-button:hover:active, button.flat:hover:active { } button:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #525252; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #4a5f74; -gtk-icon-effect: highlight; } button:active, button:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #0f0f0f; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #6c7682; background-color: rgba(0, 0, 0, 0.15); background-clip: padding-box; transition-duration: 50ms; @@ -353,16 +467,16 @@ button.sidebar-button, button.flat:disabled { } button:disabled { - color: rgba(255, 255, 255, 0.42); - border-color: rgba(41, 41, 41, 0.55); - background-color: rgba(69, 69, 69, 0.55); + color: #86909b; + border-color: rgba(134, 144, 155, 0.55); + background-color: rgba(64, 82, 100, 0.55); } button:disabled label { color: inherit; } button:disabled:active, button:disabled:checked { - color: rgba(255, 255, 255, 0.67); - border-color: rgba(15, 15, 15, 0.85); + color: rgba(206, 214, 224, 0.8); + border-color: rgba(108, 118, 130, 0.85); background-color: rgba(0, 0, 0, 0.1); opacity: 0.6; } @@ -405,16 +519,16 @@ button.text-button.image-button.popup, headerbar button.text-button.popup.titleb padding-left: 8px; } combobox:drop(active) button.combo, button:drop(active) { - color: #8fa876; - border-color: #8fa876; + color: rgba(100, 181, 246, 0.35); + border-color: rgba(100, 181, 246, 0.35); box-shadow: none; } button.osd { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - background-color: #353535; - border-color: #212121; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #3c4d5e; + border-color: #2c3945; } button.osd.image-button, headerbar button.osd.titlebutton, .titlebar button.osd.titlebutton { @@ -423,42 +537,42 @@ button.osd.image-button, headerbar button.osd.titlebutton, min-width: 36px; } button.osd:hover { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } button.osd:active, button.osd:checked { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); background-color: rgba(0, 0, 0, 0.15); } button.osd:disabled { - color: #676767; - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.25); + color: #737f8d; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.25); } .osd button { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.4); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.4); } .osd button:hover { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(127, 127, 127, 0.5); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(128, 151, 174, 0.5); } .osd button:active, .osd button:checked { background-clip: padding-box; - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); background-color: rgba(0, 0, 0, 0.15); } .osd button:disabled { - color: #676767; - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.25); + color: #737f8d; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.25); } .osd button.flat { border-color: transparent; @@ -467,21 +581,21 @@ button.osd:disabled { box-shadow: none; } .osd button.flat:hover { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(127, 127, 127, 0.5); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(128, 151, 174, 0.5); } .osd button.flat:disabled { - color: #676767; - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.25); + color: #737f8d; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.25); background-image: none; } .osd button.flat:active, .osd button.flat:checked { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); background-color: rgba(0, 0, 0, 0.15); } .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { @@ -489,84 +603,84 @@ button.osd:disabled { } button.suggested-action { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #6db442; - border-color: #6db442; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: rgb(26, 196, 88); + border-color: rgb(26, 196, 88); } button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #6db442; - outline-color: rgba(109, 180, 66, 0.3); + color: rgb(26, 196, 88); + outline-color: rgba(26, 196, 88, 0.3); } button.suggested-action:hover { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #88c663; - border-color: #88c663; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #2ee370; + border-color: #2ee370; } button.suggested-action:active, button.suggested-action:checked { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #568f34; - border-color: #568f34; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #149744; + border-color: #149744; } button.suggested-action.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; - color: rgba(255, 255, 255, 0.42); + color: #86909b; } button.suggested-action:disabled { - color: rgba(255, 255, 255, 0.42); - border-color: rgba(41, 41, 41, 0.55); - background-color: rgba(69, 69, 69, 0.55); + color: #86909b; + border-color: rgba(134, 144, 155, 0.55); + background-color: rgba(64, 82, 100, 0.55); } button.suggested-action:disabled label { color: inherit; } button.destructive-action { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #F04A50; - border-color: #F04A50; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff5f45; + border-color: #ff5f45; } button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #F04A50; - outline-color: rgba(240, 74, 80, 0.3); + color: #ff5f45; + outline-color: rgba(255, 95, 69, 0.3); } button.destructive-action:hover { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #f4797e; - border-color: #f4797e; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff8b78; + border-color: #ff8b78; } button.destructive-action:active, button.destructive-action:checked { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #ec1b22; - border-color: #ec1b22; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff3312; + border-color: #ff3312; } button.destructive-action.flat:disabled { border-color: transparent; background-color: transparent; background-image: none; - color: rgba(255, 255, 255, 0.42); + color: #86909b; } button.destructive-action:disabled { - color: rgba(255, 255, 255, 0.42); - border-color: rgba(41, 41, 41, 0.55); - background-color: rgba(69, 69, 69, 0.55); + color: #86909b; + border-color: rgba(134, 144, 155, 0.55); + background-color: rgba(64, 82, 100, 0.55); } button.destructive-action:disabled label { color: inherit; @@ -593,18 +707,22 @@ button.destructive-action:disabled label { padding-left: 2px; padding-right: 2px; } -.stack-switcher > button.needs-attention:active > label, .stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, .stack-switcher > button.needs-attention:checked > image { +.stack-switcher > button.needs-attention:active > label, +.stack-switcher > button.needs-attention:active > image, .stack-switcher > button.needs-attention:checked > label, +.stack-switcher > button.needs-attention:checked > image { animation: none; background-image: none; } -.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image { +.stack-switcher > button.needs-attention > label, +.stack-switcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#8fa876), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(100, 181, 246, 0.35)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; } -.stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl) { +.stack-switcher > button.needs-attention > label:dir(rtl), +.stack-switcher > button.needs-attention > image:dir(rtl) { background-position: left 3px, left 2px; } button.font separator, button.file separator { @@ -615,34 +733,34 @@ button.font separator, button.file separator { border-width: 1px; } .inline-toolbar toolbutton > button { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #454545; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #405264; } .inline-toolbar toolbutton > button:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #525252; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #4a5f74; } .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #0f0f0f; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #6c7682; background-color: rgba(0, 0, 0, 0.15); } .inline-toolbar toolbutton > button:disabled { - color: rgba(255, 255, 255, 0.42); - border-color: rgba(41, 41, 41, 0.55); - background-color: rgba(69, 69, 69, 0.55); + color: #86909b; + border-color: rgba(134, 144, 155, 0.55); + background-color: rgba(64, 82, 100, 0.55); } .inline-toolbar toolbutton > button:disabled label { color: inherit; } .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { - color: rgba(255, 255, 255, 0.67); - border-color: rgba(15, 15, 15, 0.85); + color: rgba(206, 214, 224, 0.8); + border-color: rgba(108, 118, 130, 0.85); background-color: rgba(0, 0, 0, 0.1); opacity: 0.6; } @@ -656,7 +774,8 @@ button.font separator, button.file separator { .primary-toolbar toolbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button, -headerbar .linked:not(.vertical).path-bar > button, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .linked:not(.vertical) > entry, .linked:not(.vertical) > entry:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button, .linked:not(.vertical) > button:hover, .linked:not(.vertical) > button:active, .linked:not(.vertical) > button:checked, toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat { +headerbar .linked:not(.vertical).path-bar > button, spinbutton:not(.vertical) button, +spinbutton:not(.vertical) entry, .linked:not(.vertical) > entry, .linked:not(.vertical) > entry:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button, .linked:not(.vertical) > button:hover, .linked:not(.vertical) > button:active, .linked:not(.vertical) > button:checked, toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat { border-radius: 0; border-right-style: none; } @@ -667,7 +786,8 @@ popover.combo scrollbar.vertical:dir(rtl), .linked:not(.vertical) > combobox:fir .primary-toolbar toolbar .linked:not(.vertical).path-bar > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:first-child, -headerbar .linked:not(.vertical).path-bar > button:first-child, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .inline-toolbar button:first-child:backdrop, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat { +headerbar .linked:not(.vertical).path-bar > button:first-child, spinbutton:not(.vertical) button:first-child, +spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .inline-toolbar button:first-child:backdrop, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat { border-top-left-radius: 3px; border-bottom-left-radius: 3px; border-top-right-radius: 0; @@ -680,7 +800,8 @@ popover.combo scrollbar.vertical:dir(ltr), .linked:not(.vertical) > combobox:las .primary-toolbar toolbar .linked:not(.vertical).path-bar > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:last-child, -headerbar .linked:not(.vertical).path-bar > button:last-child, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .inline-toolbar button:last-child:backdrop, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat { +headerbar .linked:not(.vertical).path-bar > button:last-child, spinbutton:not(.vertical) button:last-child, +spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .inline-toolbar button:last-child:backdrop, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-top-left-radius: 0; @@ -694,33 +815,45 @@ headerbar .linked:not(.vertical).path-bar > button:last-child, spinbutton:not(.v .primary-toolbar toolbar .linked:not(.vertical).path-bar > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:only-child, -headerbar .linked:not(.vertical).path-bar > button:only-child, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .inline-toolbar button:only-child:backdrop, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat { +headerbar .linked:not(.vertical).path-bar > button:only-child, spinbutton:not(.vertical) button:only-child, +spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .inline-toolbar button:only-child:backdrop, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat { border-radius: 3px; border-style: solid; } -.linked.vertical > combobox > box > button.combo, spinbutton.vertical button, spinbutton.vertical entry, .linked.vertical > entry, .linked.vertical > entry:focus, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked { +.linked.vertical > combobox > box > button.combo, spinbutton.vertical button, +spinbutton.vertical entry, .linked.vertical > entry, .linked.vertical > entry:focus, .linked.vertical > button, .linked.vertical > button:hover, .linked.vertical > button:active, .linked.vertical > button:checked { border-radius: 0; border-bottom-style: none; } -list.content > row:first-child, list.content > row.expander:first-child row.header, list.content > row.expander:checked, list.content > row.expander:checked row.header, list.content > row.expander:checked + row, list.content > row.expander:checked + row.expander row.header, popover.combo overshoot.top, popover.combo list > row:first-child, .linked.vertical > combobox:first-child > box > button.combo, spinbutton.vertical button:first-child, spinbutton.vertical entry:first-child, .linked.vertical > entry:first-child, .linked.vertical > button:first-child { +list.content > row:first-child, list.content > row.expander:first-child row.header, list.content > row.expander:checked, list.content > row.expander:checked row.header, list.content > row.expander:checked + row, list.content > row.expander:checked + row.expander row.header, popover.combo overshoot.top, popover.combo list > row:first-child, .linked.vertical > combobox:first-child > box > button.combo, spinbutton.vertical button:first-child, +spinbutton.vertical entry:first-child, .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 3px; border-top-right-radius: 3px; } -list.content > row:last-child, list.content > row.checked-expander-row-previous-sibling, list.content > row.expander:checked, list.content > row.expander:not(:checked):last-child row.header, list.content > row.expander:not(:checked).checked-expander-row-previous-sibling row.header, list.content > row.expander.empty:checked row.header, list.content > row.expander list.nested > row:last-child, popover.combo overshoot.bottom, popover.combo list > row:last-child, .linked.vertical > combobox:last-child > box > button.combo, spinbutton.vertical button:last-child, spinbutton.vertical entry:last-child, .linked.vertical > entry:last-child, .linked.vertical > button:last-child { +list.content > row:last-child, list.content > row.checked-expander-row-previous-sibling, list.content > row.expander:checked, list.content > row.expander:not(:checked):last-child row.header, list.content > row.expander:not(:checked).checked-expander-row-previous-sibling row.header, list.content > row.expander.empty:checked row.header, list.content > row.expander list.nested > row:last-child, popover.combo overshoot.bottom, popover.combo list > row:last-child, .linked.vertical > combobox:last-child > box > button.combo, spinbutton.vertical button:last-child, +spinbutton.vertical entry:last-child, .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; border-bottom-style: solid; } -.linked.vertical > combobox:only-child > box > button.combo, spinbutton.vertical button:only-child, spinbutton.vertical entry:only-child, .linked.vertical > entry:only-child, .linked.vertical > button:only-child { +.linked.vertical > combobox:only-child > box > button.combo, spinbutton.vertical button:only-child, +spinbutton.vertical entry:only-child, .linked.vertical > entry:only-child, .linked.vertical > button:only-child { border-radius: 3px; border-style: solid; } -TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active, TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .prelight-page .button:hover, TerminalWindow .notebook .active-page .button, TerminalWindow .notebook .prelight-page .button, .app-notification button.flat:disabled, .app-notification button.flat, notebook > header > tabs > tab button.flat:active, notebook > header > tabs > tab button.flat:active:hover, notebook > header > tabs > tab button.flat:hover, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link, button:visited, menuitem.button.flat, +TerminalWindow .notebook .active-page .button:active, +TerminalWindow .notebook .prelight-page .button:active, TerminalWindow .notebook .active-page .button:hover, +TerminalWindow .notebook .prelight-page .button:hover, TerminalWindow .notebook .active-page .button, +TerminalWindow .notebook .prelight-page .button, .app-notification button.flat:disabled, .app-notification button.flat, notebook > header > tabs > tab button.flat:active, notebook > header > tabs > tab button.flat:active:hover, notebook > header > tabs > tab button.flat:hover, button:link:hover, button:link:active, button:link:checked, +button:visited:hover, +button:visited:active, +button:visited:checked, button:link, +button:visited, menuitem.button.flat, modelbutton.flat { border-color: transparent; background-color: transparent; @@ -741,7 +874,9 @@ menuitem.button.flat:hover, modelbutton.flat:hover { background-color: rgba(255, 255, 255, 0.1); } -menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, +menuitem.button.flat:active, +menuitem.button.flat:active arrow, menuitem.button.flat:selected, +menuitem.button.flat:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -750,7 +885,7 @@ modelbutton.flat:selected arrow { } menuitem.button.flat:checked, modelbutton.flat:checked { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } menuitem.button.flat check:last-child, menuitem.button.flat radio:last-child, @@ -772,42 +907,50 @@ modelbutton.flat arrow.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -button:link, button:visited, +button:link, +button:visited, *:link { - color: #5294E2; + color: #64b5f6; } button:visited, *:link:visited { - color: #5294E2; + color: #2196f3; } *:selected button:visited, *:selected *:link:visited { - color: #d2dcc8; + color: rgba(224, 237, 251, 0.74); } -button:hover:link, button:hover:visited, +button:hover:link, +button:hover:visited, *:link:hover { - color: #7eafe9; + color: #94ccf9; } -*:selected button:hover:link, *:selected button:hover:visited, +*:selected button:hover:link, +*:selected button:hover:visited, *:selected *:link:hover { - color: #f4f6f1; + color: rgba(239, 244, 252, 0.935); } -button:active:link, button:active:visited, +button:active:link, +button:active:visited, *:link:active { - color: #5294E2; + color: #64b5f6; } -*:selected button:active:link, *:selected button:active:visited, +*:selected button:active:link, +*:selected button:active:visited, *:selected *:link:active { - color: #e9eee4; + color: rgba(235, 242, 252, 0.87); } infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link, headerbar.selection-mode .subtitle:link, -.selection-mode.titlebar:not(headerbar) .subtitle:link, button:selected:link, button:selected:visited, *:selected button:link, *:selected button:visited, +.selection-mode.titlebar:not(headerbar) .subtitle:link, button:selected:link, +button:selected:visited, *:selected button:link, +*:selected button:visited, *:link:selected, *:selected *:link { - color: #e9eee4; + color: rgba(235, 242, 252, 0.87); } -button:link > label, button:visited > label { +button:link > label, +button:visited > label { text-decoration-line: underline; } @@ -815,7 +958,7 @@ spinbutton:drop(active) { box-shadow: none; } spinbutton:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } spinbutton:not(.vertical) entry { min-width: 28px; @@ -829,11 +972,11 @@ spinbutton:not(.vertical) > button + button { spinbutton:not(.vertical) > button + button, spinbutton:not(.vertical) > button:hover:not(:active), spinbutton:not(.vertical) > button:hover + button { - box-shadow: inset 1px 0 #292929; + box-shadow: inset 1px 0 #86909b; } spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { - box-shadow: inset 1px 0 rgba(41, 41, 41, 0.5); + box-shadow: inset 1px 0 rgba(134, 144, 155, 0.5); } spinbutton:not(.vertical) > button:first-child:hover:not(:active), spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), @@ -841,14 +984,14 @@ spinbutton:not(.vertical) > entry + button:not(:active):hover { box-shadow: none; } spinbutton:not(.vertical) > entry:focus + button { - border-left-color: #292929; + border-left-color: #86909b; } spinbutton:not(.vertical) > entry:drop(active) + button { - border-left-color: #8fa876; + border-left-color: rgba(100, 181, 246, 0.35); } .osd spinbutton:not(.vertical) > button:hover:not(:active), .osd spinbutton:not(.vertical) > button:hover + button { - box-shadow: inset 1px 0 rgba(22, 22, 22, 0.4); + box-shadow: inset 1px 0 rgba(36, 46, 57, 0.4); } .osd spinbutton:not(.vertical) > button:first-child:hover:not(:active), .osd spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active), @@ -856,9 +999,10 @@ spinbutton:not(.vertical) > entry:drop(active) + button { box-shadow: none; } .osd spinbutton:not(.vertical) > entry:focus + button { - border-left-color: rgba(22, 22, 22, 0.4); + border-left-color: rgba(36, 46, 57, 0.4); } -spinbutton.vertical button, spinbutton.vertical entry { +spinbutton.vertical button, +spinbutton.vertical entry { padding-left: 4px; padding-right: 4px; min-width: 0; @@ -867,10 +1011,10 @@ spinbutton.vertical button.up { border-radius: 3px 3px 0 0; } spinbutton.vertical > entry:focus + button { - border-top-color: #292929; + border-top-color: #86909b; } spinbutton.vertical > entry:drop(active) + button { - border-top-color: #8fa876; + border-top-color: rgba(100, 181, 246, 0.35); } combobox button.combo { @@ -885,7 +1029,7 @@ combobox arrow { toolbar, .inline-toolbar { -GtkWidget-window-dragging: true; padding: 4px; - background-color: #383838; + background-color: #57606f; } toolbar separator, .inline-toolbar separator { background: none; @@ -903,7 +1047,7 @@ toolbar.osd, .osd.inline-toolbar { padding: 7px; border: 1px solid rgba(0, 0, 0, 0.5); border-radius: 3px; - background-color: rgba(53, 53, 53, 0.9); + background-color: rgba(60, 77, 94, 0.9); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; @@ -940,34 +1084,34 @@ toolbar:not(.inline-toolbar) .linked > entry, .primary-toolbar toolbar, .primary-toolbar .inline-toolbar, .primary-toolbar:not(.libreoffice-toolbar) { - color: rgba(255, 255, 255, 0.87); - background-color: #2b2b2b; + color: #ced6e0; + background-color: #57606f; box-shadow: none; border-width: 0 0 1px 0; border-style: solid; - border-image: linear-gradient(to bottom, #2b2b2b, #0d0d0d) 1 0 1 0; + border-image: linear-gradient(to bottom, #57606f, #3c424d) 1 0 1 0; } .inline-toolbar { - background-color: #303030; + background-color: #505966; border-style: solid; - border-color: #292929; + border-color: #86909b; border-width: 0 1px 1px; padding: 3px; border-radius: 0 0 3px 3px; } searchbar { - background-color: #383838; + background-color: #57606f; border-style: solid; - border-color: #292929; + border-color: #86909b; border-width: 0 0 1px; padding: 3px; } actionbar { padding: 6px; - border-top: 1px solid #292929; - background-color: #303030; + border-top: 1px solid #86909b; + background-color: #505966; } headerbar, @@ -977,19 +1121,19 @@ headerbar, border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: #212121; - color: rgba(255, 255, 255, 0.87); - background-color: #2b2b2b; + border-color: #4e5664; + color: #ced6e0; + background-color: #57606f; box-shadow: inset 0 1px #373737; } .csd headerbar, .csd .titlebar:not(headerbar) { - background-color: #2b2b2b; - border-color: #212121; + background-color: #57606f; + border-color: #4e5664; } headerbar:backdrop, .titlebar:backdrop:not(headerbar) { - color: rgba(255, 255, 255, 0.47); + color: rgba(206, 214, 224, 0.6); box-shadow: none; } headerbar .title, @@ -1006,58 +1150,58 @@ headerbar .subtitle, } headerbar.selection-mode, .selection-mode.titlebar:not(headerbar) { - color: #ffffff; - background-color: #8fa876; - border-color: #85a06a; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); + border-color: rgba(81, 172, 245, 0.35); box-shadow: none; } headerbar.selection-mode:backdrop, .selection-mode.titlebar:backdrop:not(headerbar) { - background-color: #8fa876; - color: rgba(255, 255, 255, 0.6); + background-color: rgba(100, 181, 246, 0.35); + color: rgba(242, 245, 252, 0.6); } headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: rgba(255, 255, 255, 0); - border-color: rgba(255, 255, 255, 0); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: rgba(242, 245, 252, 0); + border-color: rgba(242, 245, 252, 0); } headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #ffffff; - background-color: rgba(255, 255, 255, 0); + color: #f2f5fc; + background-color: rgba(242, 245, 252, 0); } headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: rgba(255, 255, 255, 0.05); - border-color: rgba(255, 255, 255, 0.5); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: rgba(242, 245, 252, 0.05); + border-color: rgba(242, 245, 252, 0.5); } headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked { - color: #8fa876; - outline-color: rgba(143, 168, 118, 0.3); - background-color: #ffffff; - border-color: #ffffff; + color: rgba(100, 181, 246, 0.35); + outline-color: rgba(100, 181, 246, 0); + background-color: #f2f5fc; + border-color: #f2f5fc; } headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled { - color: rgba(255, 255, 255, 0.4); - background-color: rgba(255, 255, 255, 0); - border-color: rgba(255, 255, 255, 0); + color: rgba(242, 245, 252, 0.4); + background-color: rgba(242, 245, 252, 0); + border-color: rgba(242, 245, 252, 0); } headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked { - color: rgba(143, 168, 118, 0.4); - background-color: rgba(255, 255, 255, 0.15); - border-color: rgba(255, 255, 255, 0.15); + color: rgba(100, 181, 246, 0); + background-color: rgba(242, 245, 252, 0.15); + border-color: rgba(242, 245, 252, 0.15); } headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu { @@ -1075,7 +1219,7 @@ headerbar.selection-mode .selection-menu .arrow, } .maximized headerbar.selection-mode, .maximized .selection-mode.titlebar:not(headerbar) { - background-color: #8fa876; + background-color: #64b5f6; } .tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop, .tiled .titlebar:not(headerbar), @@ -1084,26 +1228,28 @@ headerbar.selection-mode .selection-menu .arrow, } .maximized headerbar, .maximized .titlebar:not(headerbar) { - background-color: #2b2b2b; - border-color: #212121; + background-color: #57606f; + border-color: #4e5664; } headerbar.default-decoration, .csd headerbar.default-decoration, headerbar.default-decoration:backdrop, .csd headerbar.default-decoration:backdrop, .default-decoration.titlebar:not(headerbar) { min-height: 28px; padding: 0 7px; - background-color: #2b2b2b; + background-color: #57606f; border-bottom-width: 0; } .maximized headerbar.default-decoration, .maximized .csd headerbar.default-decoration, .maximized headerbar.default-decoration:backdrop, .maximized .csd headerbar.default-decoration:backdrop, .maximized .default-decoration.titlebar:not(headerbar) { - background-color: #2b2b2b; + background-color: #57606f; } .titlebar { border-radius: 8px 8px 0 0; } -headerbar entry, headerbar button, headerbar separator { +headerbar entry, +headerbar button, +headerbar separator { margin-top: 6px; margin-bottom: 6px; } @@ -1127,7 +1273,7 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w box-shadow: none; } .titlebar:not(headerbar) > separator { - background-image: linear-gradient(to bottom, #212121, #212121); + background-image: linear-gradient(to bottom, #4e5664, #4e5664); } .primary-toolbar toolbar separator, @@ -1135,7 +1281,7 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w min-width: 1px; min-height: 1px; border-width: 0 1px; - border-image: linear-gradient(to bottom, rgba(255, 255, 255, 0) 25%, rgba(255, 255, 255, 0.22) 25%, rgba(255, 255, 255, 0.22) 75%, rgba(255, 255, 255, 0) 75%) 0 1/0 1px stretch; + border-image: linear-gradient(to bottom, rgba(206, 214, 224, 0) 25%, rgba(206, 214, 224, 0.35) 25%, rgba(206, 214, 224, 0.35) 75%, rgba(206, 214, 224, 0) 75%) 0 1/0 1px stretch; } .primary-toolbar toolbar separator:backdrop, .primary-toolbar:not(.libreoffice-toolbar) separator:backdrop, .primary-toolbar .inline-toolbar separator:backdrop { @@ -1143,9 +1289,9 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w } .primary-toolbar entry, headerbar entry { - color: rgba(255, 255, 255, 0.87); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(60, 77, 94, 0.9); } .primary-toolbar entry image, headerbar entry image { color: inherit; @@ -1154,31 +1300,31 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus { - color: rgba(255, 255, 255, 0.87); - border-color: #8fa876; - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(100, 181, 246, 0.35); + background-color: rgba(60, 77, 94, 0.9); background-clip: padding-box; } .primary-toolbar entry:focus image, headerbar entry:focus image { - color: rgba(255, 255, 255, 0.72); + color: rgba(206, 214, 224, 0.85); } .primary-toolbar entry:disabled, headerbar entry:disabled { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(99, 99, 99, 0.25); + color: rgba(206, 214, 224, 0.55); + background-color: rgba(60, 77, 94, 0.75); } .primary-toolbar entry selection:focus, headerbar entry selection:focus { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } .primary-toolbar entry progress, headerbar entry progress { - border-color: #8fa876; + border-color: rgba(100, 181, 246, 0.35); background-image: none; background-color: transparent; } .primary-toolbar entry.warning, headerbar entry.warning { color: white; - border-color: rgba(13, 13, 13, 0.4); - background-color: #a25931; + border-color: rgba(206, 214, 224, 0.3); + background-color: #b46e4c; } .primary-toolbar entry.warning:focus, headerbar entry.warning:focus { color: white; @@ -1190,53 +1336,53 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w } .primary-toolbar entry.error, headerbar entry.error { color: white; - border-color: rgba(13, 13, 13, 0.4); - background-color: #a83833; + border-color: rgba(206, 214, 224, 0.3); + background-color: #ba6d67; } .primary-toolbar entry.error:focus, headerbar entry.error:focus { color: white; - background-color: #FC4138; + background-color: #fc7661; } .primary-toolbar entry.error selection, headerbar entry.error selection { background-color: white; - color: #FC4138; + color: #fc7661; } .primary-toolbar button, headerbar button { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); outline-offset: -3px; - background-color: rgba(43, 43, 43, 0); - border-color: rgba(43, 43, 43, 0); + background-color: rgba(87, 96, 111, 0); + border-color: rgba(87, 96, 111, 0); } .primary-toolbar button:backdrop, headerbar button:backdrop { opacity: 0.7; } .primary-toolbar button:hover, headerbar button:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(64, 82, 100, 0.9); } .primary-toolbar button:active, headerbar button:active, .primary-toolbar button:checked, headerbar button:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); background-color: rgba(0, 0, 0, 0.15); background-clip: padding-box; } .primary-toolbar button:disabled, headerbar button:disabled { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(43, 43, 43, 0); - border-color: rgba(43, 43, 43, 0); + color: rgba(206, 214, 224, 0.55); + background-color: rgba(87, 96, 111, 0); + border-color: rgba(87, 96, 111, 0); } .primary-toolbar button:disabled label, headerbar button:disabled label { color: inherit; } .primary-toolbar button:disabled:active, headerbar button:disabled:active, .primary-toolbar button:disabled:checked, headerbar button:disabled:checked { - color: rgba(255, 255, 255, 0.67); - border-color: rgba(15, 15, 15, 0.85); + color: rgba(206, 214, 224, 0.8); + border-color: rgba(108, 118, 130, 0.85); background-color: rgba(0, 0, 0, 0.1); } .primary-toolbar toolbar.selection-mode button, @@ -1244,8 +1390,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w border-color: transparent; background-color: transparent; background-image: none; - color: #ffffff; - background-color: rgba(255, 255, 255, 0); + color: #f2f5fc; + background-color: rgba(242, 245, 252, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) { margin-right: 1px; @@ -1272,10 +1418,10 @@ headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:acti .primary-toolbar .linked:not(.vertical).path-bar > button, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(64, 82, 100, 0.9); } .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, @@ -1283,7 +1429,7 @@ headerbar .linked:not(.vertical).path-bar > button { .primary-toolbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover { - background-color: rgba(138, 138, 138, 0.4); + background-color: rgba(94, 120, 147, 0.9); } .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .inline-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, @@ -1296,9 +1442,9 @@ headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); background-color: rgba(0, 0, 0, 0.15); } .primary-toolbar toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, @@ -1307,78 +1453,78 @@ headerbar .linked:not(.vertical).path-bar > button:checked { .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, .primary-toolbar .inline-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled { - color: rgba(255, 255, 255, 0.47); + color: rgba(206, 214, 224, 0.6); } .primary-toolbar .linked:not(.vertical) entry, headerbar .linked:not(.vertical) entry { box-shadow: none; } .primary-toolbar .linked:not(.vertical) entry:focus, headerbar .linked:not(.vertical) entry:focus { - color: rgba(255, 255, 255, 0.87); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(60, 77, 94, 0.9); background-clip: padding-box; } .primary-toolbar .linked:not(.vertical) entry:focus image, headerbar .linked:not(.vertical) entry:focus image { color: inherit; } .primary-toolbar .linked:not(.vertical) entry + button:last-child, headerbar .linked:not(.vertical) entry + button:last-child { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(64, 82, 100, 0.9); } .primary-toolbar .linked:not(.vertical) entry + button:last-child:hover, headerbar .linked:not(.vertical) entry + button:last-child:hover { - background-color: rgba(138, 138, 138, 0.4); + background-color: rgba(94, 120, 147, 0.9); } .primary-toolbar .linked:not(.vertical) entry + button:last-child:active, headerbar .linked:not(.vertical) entry + button:last-child:active, .primary-toolbar .linked:not(.vertical) entry + button:last-child:checked, headerbar .linked:not(.vertical) entry + button:last-child:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); background-color: rgba(0, 0, 0, 0.15); } .primary-toolbar .linked:not(.vertical) entry + button:last-child:disabled, headerbar .linked:not(.vertical) entry + button:last-child:disabled { - color: rgba(255, 255, 255, 0.47); - background-color: rgba(99, 99, 99, 0.2); - border-color: rgba(13, 13, 13, 0.4); + color: rgba(206, 214, 224, 0.6); + background-color: rgba(64, 82, 100, 0.7); + border-color: rgba(206, 214, 224, 0.3); } .primary-toolbar .linked:not(.vertical) entry + button:last-child:disabled:checked, headerbar .linked:not(.vertical) entry + button:last-child:disabled:checked { - background-color: rgba(143, 168, 118, 0.65); - color: rgba(255, 255, 255, 0.75); + background-color: rgba(100, 181, 246, 0); + color: rgba(242, 245, 252, 0.75); } .primary-toolbar button.suggested-action, headerbar button.suggested-action { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #6db442; - border-color: #6db442; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: rgb(26, 196, 88); + border-color: rgb(26, 196, 88); } .primary-toolbar button.suggested-action.flat, headerbar button.suggested-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #6db442; - outline-color: rgba(109, 180, 66, 0.3); + color: rgb(26, 196, 88); + outline-color: rgba(26, 196, 88, 0.3); } .primary-toolbar button.suggested-action:hover, headerbar button.suggested-action:hover { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #88c663; - border-color: #88c663; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #2ee370; + border-color: #2ee370; } .primary-toolbar button.suggested-action:active, headerbar button.suggested-action:active, .primary-toolbar button.suggested-action:checked, headerbar button.suggested-action:checked { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #568f34; - border-color: #568f34; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #149744; + border-color: #149744; } .primary-toolbar button.suggested-action:disabled, headerbar button.suggested-action:disabled { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(43, 43, 43, 0); - border-color: rgba(43, 43, 43, 0); + color: rgba(206, 214, 224, 0.55); + background-color: rgba(87, 96, 111, 0); + border-color: rgba(87, 96, 111, 0); } .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled label { color: inherit; @@ -1388,37 +1534,37 @@ headerbar .linked:not(.vertical).path-bar > button:disabled { } .primary-toolbar button.destructive-action, headerbar button.destructive-action { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #F04A50; - border-color: #F04A50; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff5f45; + border-color: #ff5f45; } .primary-toolbar button.destructive-action.flat, headerbar button.destructive-action.flat { border-color: transparent; background-color: transparent; background-image: none; - color: #F04A50; - outline-color: rgba(240, 74, 80, 0.3); + color: #ff5f45; + outline-color: rgba(255, 95, 69, 0.3); } .primary-toolbar button.destructive-action:hover, headerbar button.destructive-action:hover { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #f4797e; - border-color: #f4797e; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff8b78; + border-color: #ff8b78; } .primary-toolbar button.destructive-action:active, headerbar button.destructive-action:active, .primary-toolbar button.destructive-action:checked, headerbar button.destructive-action:checked { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #ec1b22; - border-color: #ec1b22; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff3312; + border-color: #ff3312; } .primary-toolbar button.destructive-action:disabled, headerbar button.destructive-action:disabled { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(43, 43, 43, 0); - border-color: rgba(43, 43, 43, 0); + color: rgba(206, 214, 224, 0.55); + background-color: rgba(87, 96, 111, 0); + border-color: rgba(87, 96, 111, 0); } .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled label { color: inherit; @@ -1427,48 +1573,48 @@ headerbar .linked:not(.vertical).path-bar > button:disabled { opacity: 0.8; } .primary-toolbar spinbutton:focus button, headerbar spinbutton:focus button { - color: #ffffff; + color: #f2f5fc; } .primary-toolbar spinbutton:focus button:hover, headerbar spinbutton:focus button:hover { - background-color: rgba(255, 255, 255, 0.1); + background-color: rgba(242, 245, 252, 0.1); border-color: transparent; } .primary-toolbar spinbutton:focus button:disabled, headerbar spinbutton:focus button:disabled { - color: rgba(255, 255, 255, 0.4); + color: rgba(242, 245, 252, 0.4); } .primary-toolbar spinbutton button, headerbar spinbutton button { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .primary-toolbar spinbutton button:hover, headerbar spinbutton button:hover { - background-color: rgba(255, 255, 255, 0.12); + background-color: rgba(206, 214, 224, 0.25); border-color: transparent; } .primary-toolbar spinbutton button:disabled, headerbar spinbutton button:disabled { - color: rgba(255, 255, 255, 0.57); + color: rgba(206, 214, 224, 0.7); } .primary-toolbar spinbutton button:active, headerbar spinbutton button:active { background-color: rgba(0, 0, 0, 0.1); } .primary-toolbar combobox:disabled, headerbar combobox:disabled { - color: rgba(255, 255, 255, 0.27); + color: rgba(206, 214, 224, 0.4); } .primary-toolbar combobox > .linked > button.combo, headerbar combobox > .linked > button.combo { - color: rgba(255, 255, 255, 0.87); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(60, 77, 94, 0.9); } .primary-toolbar combobox > .linked > button.combo image, headerbar combobox > .linked > button.combo image { color: inherit; } .primary-toolbar combobox > .linked > button.combo:hover, headerbar combobox > .linked > button.combo:hover { - color: rgba(255, 255, 255, 0.87); - border-color: #8fa876; - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(100, 181, 246, 0.35); + background-color: rgba(60, 77, 94, 0.9); box-shadow: none; } .primary-toolbar combobox > .linked > button.combo:disabled, headerbar combobox > .linked > button.combo:disabled { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(99, 99, 99, 0.25); + color: rgba(206, 214, 224, 0.55); + background-color: rgba(60, 77, 94, 0.75); } .primary-toolbar combobox > .linked > entry.combo:dir(ltr), headerbar combobox > .linked > entry.combo:dir(ltr) { border-right-style: none; @@ -1494,7 +1640,7 @@ headerbar .linked:not(.vertical).path-bar > button:disabled { opacity: 0.75; } .primary-toolbar progressbar trough, headerbar progressbar trough { - background-color: rgba(13, 13, 13, 0.4); + background-color: rgba(206, 214, 224, 0.3); } .primary-toolbar progressbar:backdrop, headerbar progressbar:backdrop { opacity: 0.75; @@ -1503,26 +1649,26 @@ headerbar .linked:not(.vertical).path-bar > button:disabled { opacity: 0.75; } .primary-toolbar scale slider, headerbar scale slider { - background-color: #454545; - border-color: rgba(13, 13, 13, 0.7); + background-color: #6d798c; + border-color: rgba(206, 214, 224, 0.6); } .primary-toolbar scale slider:hover, headerbar scale slider:hover { - background-color: #525252; - border-color: rgba(13, 13, 13, 0.7); + background-color: #7b8698; + border-color: rgba(206, 214, 224, 0.6); } .primary-toolbar scale slider:active, headerbar scale slider:active { - background-color: #8fa876; - border-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); + border-color: rgba(100, 181, 246, 0.35); } .primary-toolbar scale slider:disabled, headerbar scale slider:disabled { - background-color: #3d3d3d; - border-color: rgba(13, 13, 13, 0.7); + background-color: #667283; + border-color: rgba(206, 214, 224, 0.6); } .primary-toolbar scale trough, headerbar scale trough { - background-color: rgba(13, 13, 13, 0.4); + background-color: rgba(206, 214, 224, 0.3); } .primary-toolbar scale trough:disabled, headerbar scale trough:disabled { - background-color: rgba(13, 13, 13, 0.3); + background-color: rgba(206, 214, 224, 0.2); } .path-bar button.text-button, .path-bar button.image-button, .path-bar headerbar button.titlebutton, headerbar .path-bar button.titlebutton, @@ -1553,7 +1699,7 @@ headerbar .linked:not(.vertical).path-bar > button:disabled { } treeview.view { - border-left-color: rgba(255, 255, 255, 0.02); + border-left-color: rgba(206, 214, 224, 0.15); border-top-color: rgba(0, 0, 0, 0.1); } * { @@ -1566,18 +1712,18 @@ treeview.view { } treeview.view acceleditor > label { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } treeview.view:selected, treeview.view:selected:focus { border-radius: 0; - border-left-color: #c7d4bb; - border-top-color: rgba(255, 255, 255, 0); + border-left-color: rgba(217, 234, 251, 0.675); + border-top-color: rgba(206, 214, 224, 0.1); } treeview.view:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } treeview.view:disabled:selected { - color: #bccbad; + color: rgba(208, 230, 251, 0.61); } treeview.view.separator { min-height: 2px; @@ -1586,7 +1732,7 @@ treeview.view.separator { treeview.view:drop(active) { border-style: solid none; border-width: 1px; - border-color: rgba(192, 206, 178, 0.935); + border-color: rgba(187, 208, 228, 0.675); } treeview.view:drop(active).after { border-top-style: none; @@ -1596,41 +1742,41 @@ treeview.view:drop(active).before { } treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); - color: rgba(147, 147, 147, 0.935); + color: #85929f; } treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } treeview.view.expander:hover { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } treeview.view.expander:selected { - color: #dde5d6; + color: rgba(230, 240, 252, 0.805); } treeview.view.expander:selected:hover { - color: #ffffff; + color: #f2f5fc; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } treeview.view.progressbar, treeview.view.progressbar:focus { - color: #ffffff; + color: #f2f5fc; border-radius: 2px; - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); box-shadow: none; - background-color: #ffffff; + background-color: #f2f5fc; } treeview.view.trough { - color: rgba(255, 255, 255, 0.87); - background-color: #2b2b2b; + color: #ced6e0; + background-color: #4c5461; border-radius: 2px; - border: 1px solid #292929; + border: 1px solid #86909b; } treeview.view.trough:selected, treeview.view.trough:selected:focus { - color: #ffffff; + color: #f2f5fc; background-color: rgba(0, 0, 0, 0.2); border-radius: 2px; border-width: 0; @@ -1638,21 +1784,21 @@ treeview.view.trough:selected, treeview.view.trough:selected:focus { treeview.view header button { padding: 3px 6px; font-weight: bold; - color: rgba(208, 208, 208, 0.896); - background-color: #353535; + color: #b1bbc6; + background-color: #555e6c; background-image: none; border-style: none solid solid none; border-radius: 0; - border-color: #292929; + border-color: #86909b; } treeview.view header button:active, treeview.view header button:hover { - background-color: #3d3d3d; + background-color: #5b6575; } treeview.view header button:active:hover { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } treeview.view header button:disabled { - border-color: #383838; + border-color: #57606f; background-image: none; } treeview.view header button:last-child { @@ -1664,20 +1810,20 @@ treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover, treeview.view header.button.dnd:active { transition: none; - color: #8fa876; - box-shadow: inset 1px 1px 0 1px #8fa876, inset -1px 0 0 1px #8fa876, inset 1px 1px #404040, inset -1px 0 #404040; + color: rgba(100, 181, 246, 0.35); + box-shadow: inset 1px 1px 0 1px rgba(100, 181, 246, 0.35), inset -1px 0 0 1px rgba(100, 181, 246, 0.35), inset 1px 1px #3c4d5e, inset -1px 0 #3c4d5e; } menubar, .menubar { -GtkWidget-window-dragging: true; padding: 0px; - background-color: #2b2b2b; - color: rgba(255, 255, 255, 0.87); + background-color: #57606f; + color: #ced6e0; } menubar:backdrop, .menubar:backdrop { - color: rgba(255, 255, 255, 0.57); + color: rgba(206, 214, 224, 0.7); } menubar > menuitem, .menubar > menuitem { @@ -1688,16 +1834,16 @@ menubar > menuitem, menubar > menuitem:hover, .menubar > menuitem:hover { background-color: rgba(255, 255, 255, 0.1); - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } menubar > menuitem:disabled, .menubar > menuitem:disabled { - color: rgba(255, 255, 255, 0.27); + color: rgba(206, 214, 224, 0.4); border-color: transparent; } menubar > menuitem > label:disabled, .menubar > menuitem > label:disabled { - color: rgba(255, 255, 255, 0.42); + color: rgba(206, 214, 224, 0.55); } menu, @@ -1705,8 +1851,8 @@ menu, margin: 4px; padding: 0; border-radius: 0; - background-color: #383838; - border: 1px solid #292929; + background-color: #57606f; + border: 1px solid #86909b; } .csd menu, .csd .menu { @@ -1718,12 +1864,12 @@ menu separator, .csd menu separator, .menu separator, .csd .menu separator { margin: 2px 0; - background-color: #292929; + background-color: rgba(134, 144, 155, 0.5); } menu .separator:not(label), .csd menu .separator:not(label), .menu .separator:not(label), .csd .menu .separator:not(label) { - color: #383838; + color: #57606f; } menu menuitem, .menu menuitem { @@ -1733,12 +1879,12 @@ menu menuitem, } menu menuitem:hover, .menu menuitem:hover { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; background-color: rgba(255, 255, 255, 0.1); } menu menuitem:disabled, .menu menuitem:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } menu menuitem arrow, .menu menuitem arrow { @@ -1758,15 +1904,18 @@ menu menuitem arrow:dir(rtl), menuitem accelerator { color: alpha(currentColor,0.55); } -menuitem check, menuitem radio { +menuitem check, +menuitem radio { min-height: 16px; min-width: 16px; } -menuitem check:dir(ltr), menuitem radio:dir(ltr) { +menuitem check:dir(ltr), +menuitem radio:dir(ltr) { margin-right: 6px; margin-left: 2px; } -menuitem check:dir(rtl), menuitem radio:dir(rtl) { +menuitem check:dir(rtl), +menuitem radio:dir(rtl) { margin-left: 6px; margin-right: 2px; } @@ -1779,24 +1928,24 @@ menu > arrow, min-width: 16px; min-height: 16px; padding: 4px; - background-color: #383838; + background-color: #57606f; border-radius: 0; } menu > arrow.top, .menu > arrow.top { margin-top: -6px; - border-bottom: 1px solid rgba(79, 79, 79, 0.987); + border-bottom: 1px solid #4b5b6b; -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } menu > arrow.bottom, .menu > arrow.bottom { margin-bottom: -6px; - border-top: 1px solid rgba(79, 79, 79, 0.987); + border-top: 1px solid #4b5b6b; -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } menu > arrow:hover, .menu > arrow:hover { - background-color: rgba(79, 79, 79, 0.987); + background-color: #4b5b6b; } menu > arrow:disabled, .menu > arrow:disabled { @@ -1814,21 +1963,21 @@ popover.background { padding: 2px; border-radius: 3px; background-clip: border-box; - background-color: #383838; + background-color: #57606f; box-shadow: 0 2px 6px 1px rgba(0, 0, 0, 0.35); } .csd popover, popover, .csd popover.background, popover.background { - border: 1px solid #1c1c1c; + border: 1px solid #78838f; } popover separator, popover.background separator { - background-color: #383838; + background-color: #57606f; } popover label.separator, popover.background label.separator { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } popover > list, popover > .view, @@ -1860,7 +2009,7 @@ notebook { padding: 0; } notebook.frame { - border: 1px solid #292929; + border: 1px solid #86909b; } notebook.frame > header { margin: -1px; @@ -1886,24 +2035,24 @@ notebook.frame > header.left, notebook.frame > header.right { padding-bottom: 0; } notebook > stack:not(:only-child) { - background-color: #404040; + background-color: #3c4d5e; } notebook > header { padding: 2px; - background-color: #383838; + background-color: #57606f; /* button in headers */ } notebook > header.top { - box-shadow: inset 0 -1px #292929; + box-shadow: inset 0 -1px #86909b; } notebook > header.bottom { - box-shadow: inset 0 1px #292929; + box-shadow: inset 0 1px #86909b; } notebook > header.right { - box-shadow: inset 1px 0 #292929; + box-shadow: inset 1px 0 #86909b; } notebook > header.left { - box-shadow: inset -1px 0 #292929; + box-shadow: inset -1px 0 #86909b; } notebook > header.top { padding-bottom: 0; @@ -1990,79 +2139,80 @@ notebook > header.left > tabs > arrow.down:first-child, notebook > header.right margin-bottom: 2px; } notebook > header > tabs > arrow { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } notebook > header > tabs > arrow:hover { - color: rgba(255, 255, 255, 0.645); + color: #aab3be; } notebook > header > tabs > arrow:active { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } notebook > header > tabs > arrow:disabled { - color: rgba(255, 255, 255, 0.12); + color: rgba(134, 144, 155, 0.7); } notebook > header.top > tabs > tab:hover:not(:checked) { - box-shadow: inset 0 -1px #292929; + box-shadow: inset 0 -1px #86909b; } notebook > header.bottom > tabs > tab:hover:not(:checked) { - box-shadow: inset 0 1px #292929; + box-shadow: inset 0 1px #86909b; } notebook > header.left > tabs > tab:hover:not(:checked) { - box-shadow: inset -1px 0 #292929; + box-shadow: inset -1px 0 #86909b; } notebook > header.right > tabs > tab:hover:not(:checked) { - box-shadow: inset 1px 0 #292929; + box-shadow: inset 1px 0 #86909b; } notebook > header > tabs > tab { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(64, 64, 64, 0); + color: #86909b; + background-color: rgba(60, 77, 94, 0); } notebook > header > tabs > tab:hover:not(:checked) { - color: rgba(255, 255, 255, 0.645); - background-color: rgba(64, 64, 64, 0.5); - border-color: #292929; + color: #aab3be; + background-color: rgba(60, 77, 94, 0.5); + border-color: #86909b; } notebook > header > tabs > tab:checked { - color: rgba(255, 255, 255, 0.87); - background-color: #404040; - border-color: #292929; + color: #ced6e0; + background-color: #3c4d5e; + border-color: #86909b; } notebook > header > tabs > tab button.flat { min-height: 22px; min-width: 16px; padding: 0; - color: rgba(173, 173, 173, 0.9155); + color: #a4adb8; } notebook > header > tabs > tab button.flat:hover { color: #ff4d4d; } notebook > header > tabs > tab button.flat:active, notebook > header > tabs > tab button.flat:active:hover { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } notebook > header button.flat { padding: 2px; } scrollbar { - background-color: #3d3d3d; + background-color: rgba(60, 77, 94, 0.3); transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } * { + /* pretter ignore */ -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } scrollbar.top { - border-bottom: 1px solid #292929; + border-bottom: 1px solid #86909b; } scrollbar.bottom { - border-top: 1px solid #292929; + border-top: 1px solid #86909b; } scrollbar.left { - border-right: 1px solid #292929; + border-right: 1px solid #86909b; } scrollbar.right { - border-left: 1px solid #292929; + border-left: 1px solid #86909b; } scrollbar button { border: none; @@ -2074,13 +2224,13 @@ scrollbar slider { border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; - background-color: rgba(123, 123, 123, 0.948); + background-color: #878f9c; } scrollbar slider:hover { - background-color: rgba(105, 105, 105, 0.961); + background-color: #7b8391; } scrollbar slider:hover:active { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } scrollbar slider:disabled { background-color: transparent; @@ -2104,7 +2254,7 @@ scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; min-width: 4px; min-height: 4px; - background-color: rgba(184, 184, 184, 0.909); + background-color: #aab3be; border: 1px solid rgba(0, 0, 0, 0.3); } scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { @@ -2125,6 +2275,104 @@ scrollbar.vertical slider { min-height: 40px; } +frame > border, +.frame { + margin: 0; + padding: 0; + border-radius: 0; + border: 1px solid #86909b; +} + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; +} + +scrolledwindow viewport.frame { + border-style: none; +} +scrolledwindow overshoot.top { + background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(100, 181, 246, 0)), to(rgba(100, 181, 246, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center top; + background-color: transparent; + border: none; + box-shadow: none; +} +scrolledwindow overshoot.bottom { + background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(100, 181, 246, 0)), to(rgba(100, 181, 246, 0))); + background-size: 100% 60%; + background-repeat: no-repeat; + background-position: center bottom; + background-color: transparent; + border: none; + box-shadow: none; +} +scrolledwindow overshoot.left { + background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(100, 181, 246, 0)), to(rgba(100, 181, 246, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: left center; + background-color: transparent; + border: none; + box-shadow: none; +} +scrolledwindow overshoot.right { + background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(100, 181, 246, 0)), to(rgba(100, 181, 246, 0))); + background-size: 60% 100%; + background-repeat: no-repeat; + background-position: right center; + background-color: transparent; + border: none; + box-shadow: none; +} +scrolledwindow undershoot.top { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-top: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center top; +} +scrolledwindow undershoot.bottom { + background-color: transparent; + background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-bottom: 1px; + background-size: 10px 1px; + background-repeat: repeat-x; + background-origin: content-box; + background-position: center bottom; +} +scrolledwindow undershoot.left { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-left: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: left center; +} +scrolledwindow undershoot.right { + background-color: transparent; + background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); + padding-right: 1px; + background-size: 1px 10px; + background-repeat: repeat-y; + background-origin: content-box; + background-position: right center; +} +scrolledwindow junction { + border-color: transparent; + border-image: linear-gradient(to bottom, #86909b 1px, transparent 1px) 0 0 0 1/0 1px stretch; + background-color: rgba(60, 77, 94, 0.3); +} +scrolledwindow junction:dir(rtl) { + border-image-slice: 0 1 0 0; +} + switch { font-size: 1px; min-width: 52px; @@ -2137,7 +2385,8 @@ switch slider { min-width: 1px; min-height: 1px; } -switch, switch slider { +switch, +switch slider { outline-color: transparent; color: transparent; border: none; @@ -2145,7 +2394,7 @@ switch, switch slider { } switch { - background-image: -gtk-scaled(url("assets/switch-dark.png"), url("assets/switch-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch.png"), url("assets/switch@2.png")); } menuitem:hover switch, @@ -2157,11 +2406,11 @@ infobar switch { headerbar switch, .primary-toolbar switch, .primary-toolbar toolbar switch { - background-image: -gtk-scaled(url("assets/switch-header-dark.png"), url("assets/switch-header-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-header.png"), url("assets/switch-header@2.png")); } switch:checked { - background-image: -gtk-scaled(url("assets/switch-active-dark.png"), url("assets/switch-active-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-active.png"), url("assets/switch-active@2.png")); } menuitem:hover switch:checked, @@ -2173,11 +2422,11 @@ infobar switch:checked { headerbar switch:checked, .primary-toolbar switch:checked, .primary-toolbar toolbar switch:checked { - background-image: -gtk-scaled(url("assets/switch-active-header-dark.png"), url("assets/switch-active-header-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-active-header.png"), url("assets/switch-active-header@2.png")); } switch:disabled { - background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"), url("assets/switch-insensitive-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-insensitive.png"), url("assets/switch-insensitive@2.png")); } menuitem:hover switch:disabled, @@ -2189,11 +2438,11 @@ infobar switch:disabled { headerbar switch:disabled, .primary-toolbar switch:disabled, .primary-toolbar toolbar switch:disabled { - background-image: -gtk-scaled(url("assets/switch-insensitive-header-dark.png"), url("assets/switch-insensitive-header-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-insensitive-header.png"), url("assets/switch-insensitive-header@2.png")); } switch:checked:disabled { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"), url("assets/switch-active-insensitive-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-active-insensitive.png"), url("assets/switch-active-insensitive@2.png")); } menuitem:hover switch:checked:disabled, @@ -2205,13 +2454,13 @@ infobar switch:checked:disabled { headerbar switch:checked:disabled, .primary-toolbar switch:checked:disabled, .primary-toolbar toolbar switch:checked:disabled { - background-image: -gtk-scaled(url("assets/switch-active-insensitive-header-dark.png"), url("assets/switch-active-insensitive-header-dark@2.png")); + background-image: -gtk-scaled(url("assets/switch-active-insensitive-header.png"), url("assets/switch-active-insensitive-header@2.png")); } .check, check, treeview.check { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } .osd check { @@ -2228,7 +2477,7 @@ infobar check { .check:disabled, check:disabled, treeview.check:disabled { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); } .osd check:disabled { @@ -2245,7 +2494,7 @@ infobar check:disabled { .check:indeterminate, check:indeterminate, treeview.check:indeterminate { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); } .osd check:indeterminate { @@ -2262,7 +2511,7 @@ infobar check:indeterminate { .check:indeterminate:disabled, check:indeterminate:disabled, treeview.check:indeterminate:disabled { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); } .osd check:indeterminate:disabled { @@ -2279,7 +2528,7 @@ infobar check:indeterminate:disabled { .check:checked, check:checked, treeview.check:checked { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); } .osd check:checked { @@ -2296,7 +2545,7 @@ infobar check:checked { .check:checked:disabled, check:checked:disabled, treeview.check:checked:disabled { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); } .osd check:checked:disabled { @@ -2313,7 +2562,7 @@ infobar check:checked:disabled { .radio, radio, treeview.radio { - -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); } .osd radio { @@ -2330,7 +2579,7 @@ infobar radio { .radio:disabled, radio:disabled, treeview.radio:disabled { - -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); } .osd radio:disabled { @@ -2347,7 +2596,7 @@ infobar radio:disabled { .radio:indeterminate, radio:indeterminate, treeview.radio:indeterminate { - -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); } .osd radio:indeterminate { @@ -2364,7 +2613,7 @@ infobar radio:indeterminate { .radio:indeterminate:disabled, radio:indeterminate:disabled, treeview.radio:indeterminate:disabled { - -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); } .osd radio:indeterminate:disabled { @@ -2381,7 +2630,7 @@ infobar radio:indeterminate:disabled { .radio:checked, radio:checked, treeview.radio:checked { - -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); } .osd radio:checked { @@ -2398,7 +2647,7 @@ infobar radio:checked { .radio:checked:disabled, radio:checked:disabled, treeview.radio:checked:disabled { - -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); } .osd radio:checked:disabled { @@ -2413,23 +2662,26 @@ infobar radio:checked:disabled { } .view.content-view.check:not(.list), iconview.content-view.check:not(.list) { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode-dark.png"), url("assets/checkbox-selectionmode-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); background-color: transparent; } .view.content-view.check:checked:not(.list), iconview.content-view.check:checked:not(.list) { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode-dark.png"), url("assets/checkbox-checked-selectionmode-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); background-color: transparent; } -checkbutton.text-button, radiobutton.text-button { +checkbutton.text-button, +radiobutton.text-button { padding: 2px 0; outline-offset: 0; } -checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child { +checkbutton label:not(:only-child):first-child, +radiobutton label:not(:only-child):first-child { margin-left: 4px; } -checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child { +checkbutton label:not(:only-child):last-child, +radiobutton label:not(:only-child):last-child { margin-right: 4px; } @@ -2453,13 +2705,15 @@ scale { scale.horizontal trough { padding: 0 4px; } -scale.horizontal highlight, scale.horizontal fill { +scale.horizontal highlight, +scale.horizontal fill { margin: 0 -4px; } scale.vertical trough { padding: 4px 0; } -scale.vertical highlight, scale.vertical fill { +scale.vertical highlight, +scale.vertical fill { margin: -4px 0; } scale slider { @@ -2478,84 +2732,84 @@ scale.fine-tune trough { } scale slider { background-clip: border-box; - background-color: #454545; - border: 1px solid #242424; + background-color: #405264; + border: 1px solid #808b96; border-radius: 50%; box-shadow: none; } scale slider:disabled { - background-color: #3c3c3c; - border-color: rgba(36, 36, 36, 0.8); + background-color: #485666; + border-color: rgba(128, 139, 150, 0.8); } scale slider:active { - background-color: #8fa876; - border-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); + border-color: rgba(100, 181, 246, 0.35); } .osd scale slider { - background-color: #353535; - border-color: #8fa876; + background-color: #3c4d5e; + border-color: rgba(100, 181, 246, 0.35); } .osd scale slider:hover { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } .osd scale slider:active { - background-color: #76905b; - border-color: #76905b; + background-color: rgba(52, 158, 243, 0.35); + border-color: rgba(52, 158, 243, 0.35); } menuitem:hover scale slider, row:selected scale slider, infobar scale slider { - background-color: #ffffff; - border-color: #ffffff; + background-color: #f2f5fc; + border-color: #f2f5fc; } menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { - background-color: #eef2ea; - border-color: #eef2ea; + background-color: rgba(237, 243, 252, 0.9025); + border-color: rgba(237, 243, 252, 0.9025); } menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { - background-color: #c7d4bb; - border-color: #c7d4bb; + background-color: rgba(217, 234, 251, 0.675); + border-color: rgba(217, 234, 251, 0.675); } menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { - background-color: #cdd8c1; - border-color: #cdd8c1; + background-color: rgba(221, 236, 251, 0.7075); + border-color: rgba(221, 236, 251, 0.7075); } scale trough { outline-offset: 2px; -gtk-outline-radius: 4.5px; border-radius: 2.5px; - background-color: #2b2b2b; + background-color: #4c5461; } scale trough:disabled { - background-color: rgba(43, 43, 43, 0.55); + background-color: rgba(76, 84, 97, 0.55); } .osd scale trough { - background-color: #474747; - outline-color: rgba(219, 219, 219, 0.2); + background-color: #4a5f74; + outline-color: rgba(242, 245, 252, 0.2); } .osd scale trough highlight { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } menuitem:hover scale trough row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } menuitem:hover scale trough row:selected scale trough highlight, infobar scale trough highlight { - background-color: #ffffff; + background-color: #f2f5fc; } menuitem:hover scale trough row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { - background-color: #cdd8c1; + background-color: rgba(221, 236, 251, 0.7075); } menuitem:hover scale trough row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } scale highlight { border-radius: 2.5px; - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } scale highlight:disabled { - background-color: rgba(143, 168, 118, 0.55); + background-color: rgba(100, 181, 246, 0); } scale fill { border-radius: 2.5px; - background-color: rgba(143, 168, 118, 0.5); + background-color: rgba(100, 181, 246, 0); } scale fill:disabled { background-color: transparent; @@ -2616,7 +2870,7 @@ scale.vertical.fine-tune indicator { progressbar { padding: 0; font-size: smaller; - color: rgba(255, 255, 255, 0.57); + color: rgba(206, 214, 224, 0.7); } progressbar.osd { min-width: 3px; @@ -2629,27 +2883,27 @@ progressbar.osd trough { box-shadow: none; } progressbar progress { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); border-radius: 0px; box-shadow: none; } row:selected progressbar progress, infobar progressbar progress { - background-color: #ffffff; + background-color: #f2f5fc; } progressbar trough { - border: 1px solid #292929; + border: 1px solid #86909b; border-radius: 2px; - background-color: #2b2b2b; + background-color: #4c5461; } row:selected progressbar trough, infobar progressbar trough { background-color: rgba(0, 0, 0, 0.2); } .osd .progressbar { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } .osd .trough { - background-color: #f4f4f4; + background-color: white; } levelbar block { @@ -2664,7 +2918,7 @@ levelbar trough { border: none; padding: 3px; border-radius: 3px; - background-color: #2b2b2b; + background-color: #4c5461; } levelbar.horizontal.discrete block { margin: 0 1px; @@ -2673,8 +2927,8 @@ levelbar.vertical.discrete block { margin: 1px 0; } levelbar block:not(.empty) { - border: 1px solid #8fa876; - background-color: #8fa876; + border: 1px solid rgba(100, 181, 246, 0.35); + background-color: rgba(100, 181, 246, 0.35); border-radius: 2px; } levelbar block.low { @@ -2682,114 +2936,16 @@ levelbar block.low { background-color: #f27835; } levelbar block.high { - border-color: #8fa876; - background-color: #8fa876; + border-color: rgba(100, 181, 246, 0.35); + background-color: rgba(100, 181, 246, 0.35); } levelbar block.full { - border-color: #73d216; - background-color: #73d216; + border-color: rgb(70, 221, 126); + background-color: rgb(70, 221, 126); } levelbar block.empty { - background-color: #404040; - border-color: #404040; -} - -frame > border, -.frame { - margin: 0; - padding: 0; - border-radius: 0; - border: 1px solid #292929; -} - -frame.flat > border, -frame > border.flat, -.frame.flat { - border-style: none; -} - -scrolledwindow viewport.frame { - border-style: none; -} -scrolledwindow overshoot.top { - background-image: -gtk-gradient(radial, center top, 0, center top, 0.6, from(rgba(143, 168, 118, 0.2)), to(rgba(143, 168, 118, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center top; - background-color: transparent; - border: none; - box-shadow: none; -} -scrolledwindow overshoot.bottom { - background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.6, from(rgba(143, 168, 118, 0.2)), to(rgba(143, 168, 118, 0))); - background-size: 100% 60%; - background-repeat: no-repeat; - background-position: center bottom; - background-color: transparent; - border: none; - box-shadow: none; -} -scrolledwindow overshoot.left { - background-image: -gtk-gradient(radial, left center, 0, left center, 0.6, from(rgba(143, 168, 118, 0.2)), to(rgba(143, 168, 118, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: left center; - background-color: transparent; - border: none; - box-shadow: none; -} -scrolledwindow overshoot.right { - background-image: -gtk-gradient(radial, right center, 0, right center, 0.6, from(rgba(143, 168, 118, 0.2)), to(rgba(143, 168, 118, 0))); - background-size: 60% 100%; - background-repeat: no-repeat; - background-position: right center; - background-color: transparent; - border: none; - box-shadow: none; -} -scrolledwindow undershoot.top { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-top: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center top; -} -scrolledwindow undershoot.bottom { - background-color: transparent; - background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-bottom: 1px; - background-size: 10px 1px; - background-repeat: repeat-x; - background-origin: content-box; - background-position: center bottom; -} -scrolledwindow undershoot.left { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-left: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: left center; -} -scrolledwindow undershoot.right { - background-color: transparent; - background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, rgba(0, 0, 0, 0.2) 50%); - padding-right: 1px; - background-size: 1px 10px; - background-repeat: repeat-y; - background-origin: content-box; - background-position: right center; -} -scrolledwindow junction { - border-color: transparent; - border-image: linear-gradient(to bottom, #292929 1px, transparent 1px) 0 0 0 1/0 1px stretch; - background-color: #3d3d3d; -} -scrolledwindow junction:dir(rtl) { - border-image-slice: 0 1 0 0; + background-color: #3c4d5e; + border-color: #3c4d5e; } separator { @@ -2798,9 +2954,65 @@ separator { min-height: 1px; } +.app-notification { + padding: 10px; + color: #f2f5fc; + background-color: #3c4d5e; + background-clip: border-box; + border-radius: 0 0 2px 2px; + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: #28343f; +} +.app-notification border { + border: none; +} +.app-notification button { + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.4); +} +.app-notification button.flat { + border-color: rgba(100, 181, 246, 0); +} +.app-notification button:hover { + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(128, 151, 174, 0.5); +} +.app-notification button:active, .app-notification button:checked { + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(0, 0, 0, 0.15); + background-clip: padding-box; +} +.app-notification button:disabled { + color: #737f8d; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.25); +} + +expander arrow { + min-width: 16px; + min-height: 16px; + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); +} +expander arrow:dir(rtl) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); +} +expander arrow:hover { + color: white; +} +expander arrow:checked { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); +} + list { - background-color: #404040; - border-color: #292929; + background-color: #3c4d5e; + border-color: #86909b; } list row { padding: 2px; @@ -2813,104 +3025,48 @@ row.activatable.has-open-popup, row.activatable:hover { background-color: rgba(255, 255, 255, 0.05); } row.activatable:active { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } row.activatable:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } row.activatable:disabled image { color: inherit; } row.activatable:selected:active { - color: #ffffff; + color: #f2f5fc; } row.activatable:selected.has-open-popup, row.activatable:selected:hover { - background-color: #81976a; -} - -.app-notification { - padding: 10px; - color: #dbdbdb; - background-color: #353535; - background-clip: border-box; - border-radius: 0 0 2px 2px; - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: #1c1c1c; -} -.app-notification border { - border: none; -} -.app-notification button { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.4); -} -.app-notification button.flat { - border-color: rgba(143, 168, 118, 0); -} -.app-notification button:hover { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(127, 127, 127, 0.5); -} -.app-notification button:active, .app-notification button:checked { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(0, 0, 0, 0.15); - background-clip: padding-box; -} -.app-notification button:disabled { - color: #676767; - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.25); -} - -expander arrow { - min-width: 16px; - min-height: 16px; - -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); -} -expander arrow:dir(rtl) { - -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); -} -expander arrow:hover { - color: rgba(255, 255, 255, 0.87); -} -expander arrow:checked { - -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + background-color: rgba(66, 119, 161, 0.415); } calendar { - color: rgba(255, 255, 255, 0.87); - border: 1px solid #292929; + color: #ced6e0; + border: 1px solid #86909b; border-radius: 3px; padding: 2px; } calendar:selected { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; border-radius: 1.5px; } calendar.header { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; border: none; border-radius: 0; } calendar.button, calendar.button:focus { - color: rgba(255, 255, 255, 0.32); + color: rgba(206, 214, 224, 0.45); border-color: transparent; background-color: transparent; background-image: none; } calendar.button:hover, calendar.button:focus:hover { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } calendar.button:disabled, calendar.button:focus:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; background-color: transparent; background-image: none; } @@ -2918,7 +3074,7 @@ calendar:indeterminate { color: alpha(currentColor,0.55); } calendar.highlight { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .dialog-action-area .button.text-button { @@ -2933,8 +3089,8 @@ calendar.highlight { -GtkDialog-button-spacing: 0; } .message-dialog .titlebar { - background-color: #2b2b2b; - border-bottom: 1px solid #191919; + background-color: #57606f; + border-bottom: 1px solid #474f5b; } .message-dialog.csd.background { border-bottom-left-radius: 3px; @@ -2958,14 +3114,14 @@ calendar.highlight { } filechooser #pathbarbox { - background-color: #2b2b2b; - border-bottom: 1px solid #292929; + background-color: #57606f; + border-bottom: 1px solid #86909b; } filechooser .search-bar { - background-color: #2b2b2b; + background-color: #57606f; } filechooser actionbar { - background-color: #383838; + background-color: #57606f; } filechooserbutton:drop(active) { @@ -2973,22 +3129,76 @@ filechooserbutton:drop(active) { border-color: transparent; } +infobar { + border-style: none; +} +infobar.info, infobar.question, infobar.warning, infobar.error { + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; + caret-color: currentColor; +} +infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { + color: rgba(100, 181, 246, 0.35); + background-color: #f2f5fc; +} +infobar.info:disabled label, +infobar.info:disabled image, infobar.question:disabled label, +infobar.question:disabled image, infobar.warning:disabled label, +infobar.warning:disabled image, infobar.error:disabled label, +infobar.error:disabled image { + color: rgba(242, 245, 252, 0.5); +} +infobar.warning { + background-color: #f27835; +} +infobar.error { + background-color: #ff5f45; +} +infobar.question { + background-color: #64b5f6; +} + +tooltip, +.tooltip { + color: #4a4a4a; + border-radius: 2px; + border: 1px solid #d0d0d0; +} +tooltip.background, +.tooltip.background { + background-color: #fbeaa0; + background-clip: padding-box; +} +tooltip.background label, +.tooltip.background label { + padding: 4px; +} +tooltip decoration, +.tooltip decoration { + background-color: transparent; +} +tooltip *, +.tooltip * { + background-color: transparent; + color: #4a4a4a; +} + .sidebar { border-style: none; - background-color: #3d3d3d; + background-color: #5b6575; } stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) { - border-right: 1px solid #292929; + border-right: 1px solid #86909b; border-left-style: none; } stacksidebar.sidebar:dir(rtl) list, stacksidebar.sidebar.right list, .sidebar:dir(rtl), .sidebar.right { - border-left: 1px solid #292929; + border-left: 1px solid #86909b; border-right-style: none; } .sidebar list { - background-color: #404040; + background-color: #3c4d5e; } paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar { border-style: none; @@ -3002,13 +3212,13 @@ stacksidebar row > label { padding-right: 6px; } stacksidebar row.needs-attention { - background-image: radial-gradient(circle closest-side at 5% 25%, #F04A50 0%, #F04A50 100%, transparent 100%); + background-image: radial-gradient(circle closest-side at 5% 25%, #ff5f45 0%, #ff5f45 100%, transparent 100%); background-size: 70px; background-position: 4px; background-repeat: no-repeat; } stacksidebar row.activatable:selected.needs-attention { - background-image: radial-gradient(circle closest-side at 5% 25%, #ffffff 0%, #ffffff 100%, transparent 100%); + background-image: radial-gradient(circle closest-side at 5% 25%, #f2f5fc 0%, #f2f5fc 100%, transparent 100%); background-size: 70px; background-position: 4px; background-repeat: no-repeat; @@ -3052,23 +3262,27 @@ button.sidebar-button:not(:hover):not(:active) > image { placessidebar row.sidebar-placeholder-row { padding: 0 8px; min-height: 2px; - background-image: linear-gradient(to bottom, #8fa876, #8fa876); + background-image: linear-gradient(to bottom, rgba(100, 181, 246, 0.35), rgba(100, 181, 246, 0.35)); background-clip: content-box; } placessidebar row.sidebar-new-bookmark-row { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } placessidebar row:drop(active):not(:disabled) { - box-shadow: inset 0 1px #8fa876, inset 0 -1px #8fa876; + box-shadow: inset 0 1px rgba(100, 181, 246, 0.35), inset 0 -1px rgba(100, 181, 246, 0.35); } -placessidebar row:drop(active):not(:disabled), placessidebar row:drop(active):not(:disabled) label, placessidebar row:drop(active):not(:disabled) image { - color: #8fa876; +placessidebar row:drop(active):not(:disabled), +placessidebar row:drop(active):not(:disabled) label, +placessidebar row:drop(active):not(:disabled) image { + color: rgba(100, 181, 246, 0.35); } placessidebar row:drop(active):not(:disabled):selected { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } -placessidebar row:drop(active):not(:disabled):selected, placessidebar row:drop(active):not(:disabled):selected label, placessidebar row:drop(active):not(:disabled):selected image { - color: #ffffff; +placessidebar row:drop(active):not(:disabled):selected, +placessidebar row:drop(active):not(:disabled):selected label, +placessidebar row:drop(active):not(:disabled):selected image { + color: #f2f5fc; } placesview .server-list-button > image { @@ -3090,11 +3304,11 @@ paned > separator { -gtk-icon-source: none; border-style: none; background-color: transparent; - background-image: linear-gradient(to bottom, #292929, #292929); + background-image: linear-gradient(to bottom, #86909b, #86909b); background-size: 1px 1px; } paned > separator:selected { - background-image: linear-gradient(to bottom, #8fa876, #8fa876); + background-image: linear-gradient(to bottom, rgba(100, 181, 246, 0.35), rgba(100, 181, 246, 0.35)); } paned > separator.wide { min-width: 5px; @@ -3130,104 +3344,6 @@ paned.vertical > separator.wide { background-size: 24px 2px; } -infobar { - border-style: none; -} -infobar.info, infobar.question, infobar.warning, infobar.error { - background-color: #8fa876; - color: #ffffff; - caret-color: currentColor; -} -infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection { - color: #8fa876; - background-color: #ffffff; -} -infobar.info:disabled label, infobar.info:disabled image, infobar.question:disabled label, infobar.question:disabled image, infobar.warning:disabled label, infobar.warning:disabled image, infobar.error:disabled label, infobar.error:disabled image { - color: rgba(255, 255, 255, 0.5); -} -infobar.warning { - background-color: #f27835; -} -infobar.error { - background-color: #F04A50; -} -infobar.question { - background-color: #55c1ec; -} - -.primary-toolbar toolbar.selection-mode button:hover, -.selection-mode.primary-toolbar button:hover, .primary-toolbar .selection-mode.inline-toolbar button:hover, headerbar.selection-mode button:hover, row:selected button, infobar.info button, infobar.question button, infobar.warning button, infobar.error button { - color: #ffffff; - background-color: rgba(255, 255, 255, 0); - border-color: rgba(255, 255, 255, 0.5); -} - -row:selected button.flat, infobar.info button.flat, infobar.question button.flat, infobar.warning button.flat, infobar.error button.flat { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #ffffff; - background-color: rgba(255, 255, 255, 0); -} -.primary-toolbar toolbar.selection-mode button:disabled, -.selection-mode.primary-toolbar button:disabled, .primary-toolbar .selection-mode.inline-toolbar button:disabled, headerbar.selection-mode button:disabled, .primary-toolbar toolbar.selection-mode button:disabled label, -.selection-mode.primary-toolbar button:disabled label, .primary-toolbar .selection-mode.inline-toolbar button:disabled label, headerbar.selection-mode button:disabled label, row:selected button.flat:disabled, infobar.info button.flat:disabled, infobar.question button.flat:disabled, infobar.warning button.flat:disabled, infobar.error button.flat:disabled, row:selected button.flat:disabled label, infobar.info button.flat:disabled label, infobar.question button.flat:disabled label, infobar.warning button.flat:disabled label, infobar.error button.flat:disabled label { - color: rgba(255, 255, 255, 0.4); -} - -row:selected button:hover, infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover { - color: #ffffff; - background-color: rgba(255, 255, 255, 0.2); - border-color: rgba(255, 255, 255, 0.8); -} -.primary-toolbar toolbar.selection-mode button:active, -.selection-mode.primary-toolbar button:active, .primary-toolbar .selection-mode.inline-toolbar button:active, headerbar.selection-mode button:active, .primary-toolbar toolbar.selection-mode button:checked, -.selection-mode.primary-toolbar button:checked, .primary-toolbar .selection-mode.inline-toolbar button:checked, headerbar.selection-mode button:checked, row:selected button:active, infobar.info button:active, infobar.question button:active, infobar.warning button:active, infobar.error button:active, row:selected button:checked, infobar.info button:checked, infobar.question button:checked, infobar.warning button:checked, infobar.error button:checked { - color: #8fa876; - background-color: #ffffff; - border-color: #ffffff; -} - -row:selected button:disabled, infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled { - background-color: rgba(255, 255, 255, 0); - border-color: rgba(255, 255, 255, 0.4); -} -row:selected button:disabled, infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled, row:selected button:disabled label, infobar.info button:disabled label, infobar.question button:disabled label, infobar.warning button:disabled label, infobar.error button:disabled label { - color: rgba(255, 255, 255, 0.5); -} -.primary-toolbar toolbar.selection-mode button:disabled:checked, -.selection-mode.primary-toolbar button:disabled:checked, .primary-toolbar .selection-mode.inline-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .primary-toolbar toolbar.selection-mode button:disabled:active, -.selection-mode.primary-toolbar button:disabled:active, .primary-toolbar .selection-mode.inline-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, row:selected button:disabled:active, infobar.info button:disabled:active, infobar.question button:disabled:active, infobar.warning button:disabled:active, infobar.error button:disabled:active, row:selected button:disabled:checked, infobar.info button:disabled:checked, infobar.question button:disabled:checked, infobar.warning button:disabled:checked, infobar.error button:disabled:checked { - color: #8fa876; - background-color: rgba(255, 255, 255, 0.5); - border-color: rgba(255, 255, 255, 0.4); -} - -tooltip, -.tooltip { - color: #4a4a4a; - border-radius: 2px; - border: 1px solid #d0d0d0; -} -tooltip.background, -.tooltip.background { - background-color: #fbeaa0; - background-clip: padding-box; -} -tooltip.background label, -.tooltip.background label { - padding: 4px; -} -tooltip decoration, -.tooltip decoration { - background-color: transparent; -} -tooltip *, -.tooltip * { - background-color: transparent; - color: #4a4a4a; -} - colorswatch, colorswatch:drop(active) { border-style: none; } @@ -3267,16 +3383,16 @@ colorswatch.dark overlay { color: rgba(255, 255, 255, 0.7); } colorswatch.dark overlay:hover { - border-color: #292929; + border-color: #86909b; } colorswatch.light overlay { color: rgba(0, 0, 0, 0.7); } colorswatch.light overlay:hover { - border-color: #292929; + border-color: #86909b; } colorswatch overlay { - border: 1px solid #292929; + border: 1px solid #86909b; } colorswatch overlay:hover { background-color: rgba(255, 255, 255, 0.2); @@ -3291,16 +3407,16 @@ colorswatch:disabled overlay { colorswatch#add-color-button { border-style: solid; border-width: 1px; - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #454545; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #405264; } colorswatch#add-color-button:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #525252; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #4a5f74; } colorswatch#add-color-button overlay { border-color: transparent; @@ -3311,7 +3427,8 @@ colorswatch#add-color-button overlay { button.color { padding: 0; } -button.color colorswatch:first-child:last-child, button.color colorswatch:first-child:last-child overlay { +button.color colorswatch:first-child:last-child, +button.color colorswatch:first-child:last-child overlay { margin: 4px; border-radius: 0; } @@ -3321,16 +3438,16 @@ colorchooser .popover.osd { } .content-view { - background-color: #404040; + background-color: #3c4d5e; } .content-view:hover { -gtk-icon-effect: highlight; } .scale-popup button:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #525252; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #4a5f74; } .touch-selection, @@ -3365,37 +3482,37 @@ button.circular-button label, min-width: 16px; min-height: 20px; padding: 3px 6px 4px 6px; - color: rgba(255, 255, 255, 0.87); - background-color: #404040; - border: 1px solid #292929; + color: #ced6e0; + background-color: #3c4d5e; + border: 1px solid #86909b; border-radius: 2.5px; box-shadow: inset 0px -2px 0px rgba(0, 0, 0, 0.15); } *:drop(active):focus, *:drop(active) { - box-shadow: inset 0 0 0 1px #8fa876; + box-shadow: inset 0 0 0 1px rgba(100, 181, 246, 0.35); } decoration { - border-radius: 8px 8px 0 0; + border-radius: 8px; border-width: 0px; - box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px #212121; + box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px #57606f; margin: 10px; } decoration:backdrop { - box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px #2e2e2e; + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px #57606f; } .fullscreen decoration, .maximized decoration, .tiled decoration, .tiled decoration:backdrop { border-radius: 0; - box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px transparent, 0 0 0 1px #2e2e2e; + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px transparent, 0 0 0 1px #57606f; } .popup decoration { box-shadow: none; border-radius: 0; } .ssd decoration { - border-radius: 8px 8px 0 0; + border-radius: 8px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .ssd decoration.maximized { @@ -3403,7 +3520,7 @@ decoration:backdrop { } .csd.popup decoration { border-radius: 2px; - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(33, 33, 33, 0.9); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(87, 96, 111, 0.9); } tooltip.csd decoration { border-radius: 2px; @@ -3415,7 +3532,7 @@ message-dialog.csd decoration { .solid-csd decoration { border-radius: 0; margin: 1px; - background-color: #2b2b2b; + background-color: #57606f; box-shadow: none; } @@ -3437,21 +3554,21 @@ headerbar button.titlebutton, border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(43, 43, 43, 0); + background-color: rgba(87, 96, 111, 0); } headerbar button.titlebutton:hover, .titlebar button.titlebutton:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(64, 82, 100, 0.9); } headerbar button.titlebutton:active, headerbar button.titlebutton:checked, .titlebar button.titlebutton:active, .titlebar button.titlebutton:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); background-color: rgba(0, 0, 0, 0.15); } headerbar button.titlebutton.close, headerbar button.titlebutton.maximize, headerbar button.titlebutton.minimize, @@ -3467,87 +3584,45 @@ headerbar button.titlebutton.close, headerbar button.titlebutton.maximize, heade } headerbar button.titlebutton.close, .titlebar button.titlebutton.close { - color: #ffffff; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#8fa876), to(transparent)); + color: #f2f5fc; + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(100, 181, 246, 0.35)), to(transparent)); } headerbar button.titlebutton.close:hover, .titlebar button.titlebutton.close:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#9cb286), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(124, 193, 247, 0.35)), to(transparent)); } headerbar button.titlebutton.close:active, .titlebar button.titlebutton.close:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#829e66), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(76, 169, 245, 0.35)), to(transparent)); } headerbar button.titlebutton.close:backdrop, .titlebar button.titlebutton.close:backdrop { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#626262), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(13, 13, 13, 0)), to(transparent)); } headerbar button.titlebutton.maximize:hover, headerbar button.titlebutton.maximize:hover:backdrop, headerbar button.titlebutton.minimize:hover, headerbar button.titlebutton.minimize:hover:backdrop, .titlebar button.titlebutton.maximize:hover, .titlebar button.titlebutton.maximize:hover:backdrop, .titlebar button.titlebutton.minimize:hover, .titlebar button.titlebutton.minimize:hover:backdrop { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4c4c4c), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(0, 0, 0, 0)), to(transparent)); } headerbar button.titlebutton.maximize:active, headerbar button.titlebutton.maximize:active:backdrop, headerbar button.titlebutton.minimize:active, headerbar button.titlebutton.minimize:active:backdrop, .titlebar button.titlebutton.maximize:active, .titlebar button.titlebutton.maximize:active:backdrop, .titlebar button.titlebutton.minimize:active, .titlebar button.titlebutton.minimize:active:backdrop { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#949494), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(0, 0, 0, 0)), to(transparent)); } headerbar button.titlebutton.maximize:backdrop, headerbar button.titlebutton.minimize:backdrop, .titlebar button.titlebutton.maximize:backdrop, .titlebar button.titlebutton.minimize:backdrop { - color: #626262; + color: rgba(13, 13, 13, 0); } -.caja-navigation-window .view .cell:selected, .caja-navigation-window iconview .cell:selected, .caja-navigation-window .view .cell:selected:focus, .nemo-window .nemo-inactive-pane .view:selected:focus, .nemo-window .nemo-inactive-pane iconview:selected:focus, .nemo-window .nemo-inactive-pane .view:selected, .nemo-window .nemo-inactive-pane iconview:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar list row.sidebar-row:active:hover, -filechooser placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, -filechooser placessidebar.sidebar list row.sidebar-row:selected, -filechooser placessidebar.sidebar list row.sidebar-row:selected:hover, -filechooser placessidebar.sidebar list row.sidebar-row:active:hover, .view:selected, .view:selected:focus, -.view text:selected, -textview text:selected, -.view text:selected:focus, -textview text:selected:focus, .view text selection:focus, .view text selection, -textview text selection:focus, -textview text selection, iconview:selected, iconview:selected:focus, -iconview text:selected, -iconview text:selected:focus, iconview text selection:focus, iconview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, treeview.view:selected, treeview.view:selected:focus, row:selected { - background-color: #8fa876; -} -row:selected label, label:selected, .caja-navigation-window .view .cell:selected, .caja-navigation-window iconview .cell:selected, .caja-navigation-window .view .cell:selected:focus, .nemo-window .nemo-inactive-pane .view:selected:focus, .nemo-window .nemo-inactive-pane iconview:selected:focus, .nemo-window .nemo-inactive-pane .view:selected, .nemo-window .nemo-inactive-pane iconview:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected:hover, .nautilus-window placessidebar.sidebar list row.sidebar-row:active:hover, -filechooser placessidebar.sidebar list row.sidebar-row:selected.has-open-popup, -filechooser placessidebar.sidebar list row.sidebar-row:selected, -filechooser placessidebar.sidebar list row.sidebar-row:selected:hover, -filechooser placessidebar.sidebar list row.sidebar-row:active:hover, .view:selected, .view:selected:focus, -.view text:selected, -textview text:selected, -.view text:selected:focus, -textview text:selected:focus, .view text selection:focus, .view text selection, -textview text selection:focus, -textview text selection, iconview:selected, iconview:selected:focus, -iconview text:selected, -iconview text:selected:focus, iconview text selection:focus, iconview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, treeview.view:selected, treeview.view:selected:focus, row:selected { - color: #ffffff; -} -label:disabled selection, row:selected label:disabled, label:disabled:selected, .caja-navigation-window .view .cell:disabled:selected, .caja-navigation-window iconview .cell:disabled:selected, .nemo-window .nemo-inactive-pane .view:disabled:selected:focus, .nemo-window .nemo-inactive-pane iconview:disabled:selected:focus, .nemo-window .nemo-inactive-pane .view:disabled:selected, .nemo-window .nemo-inactive-pane iconview:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:disabled:active:hover, -filechooser placessidebar.sidebar list row.sidebar-row.has-open-popup:disabled:selected, -filechooser placessidebar.sidebar list row.sidebar-row:disabled:selected, -filechooser placessidebar.sidebar list row.sidebar-row:disabled:selected:hover, -filechooser placessidebar.sidebar list row.sidebar-row:disabled:active:hover, .view:disabled:selected, -.view text:disabled:selected, -textview text:disabled:selected, -textview text:disabled:selected:focus, .view text selection:disabled, -textview text selection:disabled:focus, -textview text selection:disabled, iconview:disabled:selected, iconview:disabled:selected:focus, -iconview text:disabled:selected, -iconview text:disabled:selected:focus, iconview text selection:disabled:focus, iconview text selection:disabled, flowbox flowboxchild:disabled:selected, entry selection:disabled, row:disabled:selected { - color: #c7d4bb; -} - -GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, GeditNotebook.notebook tab.top:active, GeditNotebook.notebook tab.top.active-page, GeditNotebook.notebook tab.top.active-page:hover, +GeditNotebook.notebook tab.reorderable-page.top:active, GeditNotebook.notebook tab.reorderable-page.top.active-page, GeditNotebook.notebook tab.reorderable-page.top.active-page:hover, +GeditNotebook.notebook tab.top:active, +GeditNotebook.notebook tab.top.active-page, +GeditNotebook.notebook tab.top.active-page:hover, ScratchMainWindow .notebook tab.reorderable-page.top:active, ScratchMainWindow .notebook tab.reorderable-page.top.active-page, ScratchMainWindow .notebook tab.reorderable-page.top.active-page:hover, @@ -3578,10 +3653,11 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top.active PantheonTerminalPantheonTerminalWindow .notebook tab.top:active, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page, PantheonTerminalPantheonTerminalWindow .notebook tab.top.active-page:hover { - box-shadow: inset 0 1px #292929, inset 0 -1px #292929, inset 1px 0 #292929, inset -1px 0 #292929; + box-shadow: inset 0 1px #86909b, inset 0 -1px #86909b, inset 1px 0 #86909b, inset -1px 0 #86909b; } -TerminalWindow .notebook tab.reorderable-page.top, TerminalWindow .notebook tab.top, +TerminalWindow .notebook tab.reorderable-page.top, +TerminalWindow .notebook tab.top, PantheonTerminalPantheonTerminalWindow .notebook tab.reorderable-page.top, PantheonTerminalPantheonTerminalWindow .notebook tab.top { padding-top: 7px; @@ -3589,16 +3665,16 @@ PantheonTerminalPantheonTerminalWindow .notebook tab.top { } TerminalWindow .notebook.header.top, PantheonTerminalPantheonTerminalWindow .notebook.header.top { - box-shadow: inset 0 1px #212121, inset 0 -1px #292929; + box-shadow: inset 0 1px #4e5664, inset 0 -1px #86909b; } GtkHTML { - background-color: #404040; - color: #DADADA; + background-color: #57606f; + color: #dae1e9; } GtkHTML:active { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); } SushiFontWidget { @@ -3610,7 +3686,7 @@ SushiFontWidget { } vte-terminal.terminal-screen { - -TerminalScreen-background-darkness: 1; + -terminalscreen-background-darkness: 1; background-color: #3f3f3f; color: #fff; } @@ -3622,22 +3698,24 @@ terminal-screen-container scrollbar:not(slider) { } TerminalWindow .notebook tab .button { - color: rgba(173, 173, 173, 0.9155); + color: #a4adb8; } TerminalWindow .notebook tab .button:hover { - color: rgba(255, 255, 255, 0.87); - border-color: #292929; - background-color: #454545; + color: #ced6e0; + border-color: #86909b; + background-color: #405264; } -TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .prelight-page .button:hover { +TerminalWindow .notebook .active-page .button:hover, +TerminalWindow .notebook .prelight-page .button:hover { color: #ff4d4d; } -TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { - color: #8fa876; +TerminalWindow .notebook .active-page .button:active, +TerminalWindow .notebook .prelight-page .button:active { + color: rgba(100, 181, 246, 0.35); } vte-terminal { - -TerminalScreen-background-darkness: 1; + -terminalscreen-background-darkness: 1; background-color: #3f3f3f; color: #fff; } @@ -3648,33 +3726,34 @@ vte-terminal { .nemo-desktop.nemo-canvas-item, .nautilus-desktop.nautilus-canvas-item { - color: #ffffff; + color: #f2f5fc; text-shadow: 1px 1px rgba(0, 0, 0, 0.6); } .nemo-desktop.nemo-canvas-item:active, .nautilus-desktop.nautilus-canvas-item:active { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .nemo-desktop.nemo-canvas-item:selected, .nautilus-desktop.nautilus-canvas-item:selected { - color: #ffffff; + color: #f2f5fc; } .nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, .nautilus-list-dim-label { - color: rgba(143, 143, 143, 0.935); + color: #939ba8; } .nautilus-canvas-item.dim-label:selected, label.nautilus-canvas-item.separator:selected, .nautilus-canvas-item.dim-label:selected:focus, .nautilus-list-dim-label:selected, .nautilus-list-dim-label:selected:focus { - color: #e9eee4; + color: rgba(235, 242, 252, 0.87); } .nautilus-window paned > separator { - background-image: linear-gradient(to bottom, #292929, #292929); + background-image: linear-gradient(to bottom, #86909b, #86909b); } -.nautilus-window .csd.background, .nautilus-window placessidebar list, +.nautilus-window .csd.background, +.nautilus-window placessidebar list, filechooser .csd.background, filechooser placessidebar list { background-color: transparent; @@ -3686,18 +3765,20 @@ filechooser placessidebar.sidebar list { .nautilus-window placessidebar.sidebar list row.sidebar-row, filechooser placessidebar.sidebar list row.sidebar-row { border: none; - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .nautilus-window placessidebar.sidebar list row.sidebar-row.has-open-popup, .nautilus-window placessidebar.sidebar list row.sidebar-row:hover, filechooser placessidebar.sidebar list row.sidebar-row.has-open-popup, filechooser placessidebar.sidebar list row.sidebar-row:hover { - background-color: rgba(255, 255, 255, 0.02); + background-color: rgba(206, 214, 224, 0.15); } -.nautilus-window placessidebar.sidebar list row.sidebar-row:disabled, .nautilus-window placessidebar.sidebar list row.sidebar-row:disabled label, .nautilus-window placessidebar.sidebar list row.sidebar-row:disabled image, +.nautilus-window placessidebar.sidebar list row.sidebar-row:disabled, +.nautilus-window placessidebar.sidebar list row.sidebar-row:disabled label, +.nautilus-window placessidebar.sidebar list row.sidebar-row:disabled image, filechooser placessidebar.sidebar list row.sidebar-row:disabled, filechooser placessidebar.sidebar list row.sidebar-row:disabled label, filechooser placessidebar.sidebar list row.sidebar-row:disabled image { - color: rgba(255, 255, 255, 0.27); + color: rgba(206, 214, 224, 0.4); } .nautilus-window placessidebar.sidebar list row.sidebar-row:selected.has-open-popup .sidebar-icon, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected .sidebar-icon, .nautilus-window placessidebar.sidebar list row.sidebar-row:selected:hover .sidebar-icon, .nautilus-window placessidebar.sidebar list row.sidebar-row:active:hover .sidebar-icon, filechooser placessidebar.sidebar list row.sidebar-row:selected.has-open-popup .sidebar-icon, @@ -3708,20 +3789,20 @@ filechooser placessidebar.sidebar list row.sidebar-row:active:hover .sidebar-ico } .nautilus-window placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button, filechooser placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .nautilus-window placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button:hover, filechooser placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button:hover { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(127, 127, 127, 0.5); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(128, 151, 174, 0.5); } .nautilus-window placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button:active, filechooser placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button:active { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #0f0f0f; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #6c7682; background-color: rgba(0, 0, 0, 0.15); } .nautilus-window placessidebar.sidebar list row.sidebar-row:not(:selected) button.sidebar-button:not(:hover):not(:active) > image, @@ -3730,27 +3811,31 @@ filechooser placessidebar.sidebar list row.sidebar-row:not(:selected) button.sid } .nautilus-window placessidebar.sidebar list row.sidebar-row.sidebar-new-bookmark-row, filechooser placessidebar.sidebar list row.sidebar-row.sidebar-new-bookmark-row { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } .nautilus-window placessidebar.sidebar list row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon, filechooser placessidebar.sidebar list row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon { color: inherit; } -.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled), .nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled) label, .nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled) .sidebar-icon, +.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled), +.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled) label, +.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled) .sidebar-icon, filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled), filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled) label, filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled) .sidebar-icon { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } .nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected, filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } -.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected, .nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected label, .nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon, +.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected, +.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected label, +.nautilus-window placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon, filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected, filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected label, filechooser placessidebar.sidebar list row.sidebar-row:drop(active):not(:disabled):selected .sidebar-icon { - color: #ffffff; + color: #f2f5fc; } .nautilus-window placessidebar.sidebar list separator, filechooser placessidebar.sidebar list separator { @@ -3762,14 +3847,14 @@ filechooser.maximized placessidebar.sidebar { } filechooser placessidebar > viewport.frame { - border: 1px solid #292929; + border: 1px solid #86909b; border-width: 1px 0 0 0; } NautilusQueryEditor .search-bar.toolbar { padding: 5px; box-shadow: none; - background-color: #404040; + background-color: #3c4d5e; } .nautilus-circular-button.image-button.button, headerbar button.nautilus-circular-button.button.titlebutton, @@ -3784,20 +3869,20 @@ NautilusQueryEditor .search-bar.toolbar { border-width: 1px; } .disk-space-display.unknown { - background-color: rgba(255, 255, 255, 0.37); - border-color: rgba(230, 230, 230, 0.37); + background-color: rgba(206, 214, 224, 0.5); + border-color: rgba(175, 188, 204, 0.5); } .disk-space-display.used { - background-color: rgba(143, 168, 118, 0.8); - border-color: rgba(118, 144, 91, 0.8); + background-color: rgba(100, 181, 246, 0.15); + border-color: rgba(52, 158, 243, 0.15); } .disk-space-display.free { - background-color: #303030; - border-color: #171717; + background-color: #505966; + border-color: #3a404a; } NautilusListView .view, NautilusListView iconview { - border-bottom: 1px solid #292929; + border-bottom: 1px solid #86909b; } .nemo-window { @@ -3807,48 +3892,52 @@ NautilusListView .view, NautilusListView iconview { .nemo-window .nemo-window-pane widget.entry { border: 1px solid; border-radius: 3px; - color: #DADADA; - border-color: #292929; - background-color: #404040; - box-shadow: inset 1px 0 #8fa876, inset -1px 0 #8fa876, inset 0 1px #8fa876, inset 0 -1px #8fa876; + color: #dae1e9; + border-color: #86909b; + background-color: #3c4d5e; + box-shadow: inset 1px 0 rgba(100, 181, 246, 0.35), inset -1px 0 rgba(100, 181, 246, 0.35), inset 0 1px rgba(100, 181, 246, 0.35), inset 0 -1px rgba(100, 181, 246, 0.35); } .nemo-window .nemo-inactive-pane .view, .nemo-window .nemo-inactive-pane iconview { - background-color: #333333; + background-color: #32404e; } .nemo-window .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: rgba(255, 255, 255, 0.87); - -NemoPlacesTreeView-disk-full-fg-color: #76905b; + -nemoplacestreeview-disk-full-bg-color: #ced6e0; + -nemoplacestreeview-disk-full-fg-color: rgba(52, 158, 243, 0.35); -GtkTreeView-vertical-separator: 7; } .nemo-window .places-treeview .view.cell:hover, .nemo-window .places-treeview iconview.cell:hover { - background-color: rgba(255, 255, 255, 0.12); + background-color: rgba(206, 214, 224, 0.25); } .nemo-window .nemo-places-sidebar.frame { border-width: 0; } .nemo-window .sidebar { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; background-color: #353535; } .nemo-window .sidebar .frame { border: none; } -.nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { +.nemo-window .sidebar .view, .nemo-window .sidebar iconview, +.nemo-window .sidebar row { background-color: transparent; - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } -.nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { - background-color: #8fa876; - color: #ffffff; +.nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, +.nemo-window .sidebar row.cell:selected { + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } -.nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { - color: rgba(141, 141, 141, 0.935); +.nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, +.nemo-window .sidebar row.expander { + color: #82868b; } -.nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { - color: rgba(255, 255, 255, 0.87); +.nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, +.nemo-window .sidebar row.expander:hover { + color: #ced6e0; } .nemo-window grid > paned > separator { - background-image: linear-gradient(to bottom, #292929, #292929); + background-image: linear-gradient(to bottom, #86909b, #86909b); } .nemo-window widget .toolbar .image-button, .nemo-window widget .toolbar headerbar button.titlebutton, headerbar .nemo-window widget .toolbar button.titlebutton, .nemo-window widget .toolbar .titlebar button.titlebutton, @@ -3863,7 +3952,7 @@ NautilusListView .view, NautilusListView iconview { */ } .caja-navigation-window .view .cell:selected, .caja-navigation-window iconview .cell:selected, .caja-navigation-window .view .cell:selected:focus { - background-image: linear-gradient(to bottom, #8fa876, #8fa876); + background-image: linear-gradient(to bottom, rgba(100, 181, 246, 0.35), rgba(100, 181, 246, 0.35)); } .caja-navigation-window .frame { border-width: 1px 0 1px 0; @@ -3872,76 +3961,76 @@ NautilusListView .view, NautilusListView iconview { .caja-navigation-window .caja-side-pane textview text, .caja-navigation-window .caja-side-pane notebook { background-color: #353535; - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .caja-navigation-window .caja-side-pane .frame { border-width: 1px 0 0 0; } .caja-navigation-window .caja-side-pane .view > box, .caja-navigation-window .caja-side-pane iconview > box, .caja-navigation-window .caja-side-pane viewport.frame { - border: 1px solid #292929; + border: 1px solid #86909b; border-width: 1px 0 0 0; } .gedit-headerbar-paned { - color: #212121; + color: #4e5664; } .gedit-side-panel-paned > separator { - background-image: linear-gradient(to bottom, #292929, #292929); + background-image: linear-gradient(to bottom, #86909b, #86909b); } .gedit-bottom-panel-paned > separator { - background-image: linear-gradient(to bottom, #292929, #292929); + background-image: linear-gradient(to bottom, #86909b, #86909b); } .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; - border-color: #404040; + border-color: #3c4d5e; } .open-document-selector-treeview.view:hover, iconview.open-document-selector-treeview:hover { background-color: rgba(0, 0, 0, 0.05); } .open-document-selector-treeview.view:hover:selected, iconview.open-document-selector-treeview:hover:selected { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); } .open-document-selector-name-label { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .open-document-selector-path-label { - color: rgba(147, 147, 147, 0.935); + color: #85929f; font-size: smaller; } .open-document-selector-path-label:selected { - color: rgba(255, 255, 255, 0.9); + color: rgba(242, 245, 252, 0.9); } .gedit-document-panel { background-color: #353535; } .gedit-document-panel row { - color: rgba(255, 255, 255, 0.87); - background-color: rgba(255, 255, 255, 0); + color: #ced6e0; + background-color: rgba(206, 214, 224, 0); } .gedit-document-panel row:hover { - background-color: rgba(255, 255, 255, 0.02); + background-color: rgba(206, 214, 224, 0.15); } .gedit-document-panel row:active { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); } .gedit-document-panel row:active button { - color: #ffffff; + color: #f2f5fc; } .gedit-document-panel row:selected, .gedit-document-panel row:selected:hover { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); } .gedit-document-panel row:hover:not(:selected) button:active { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .gedit-document-panel row button { min-width: 22px; @@ -3956,13 +4045,13 @@ NautilusListView .view, NautilusListView iconview { color: inherit; } .gedit-document-panel row:hover:not(:selected) button { - color: rgba(173, 173, 173, 0.9155); + color: #a4adb8; } .gedit-document-panel row:hover:not(:selected) button:hover { color: #ff4d4d; } .gedit-document-panel row:hover:not(:selected) button:active { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .gedit-document-panel row:hover:selected button:hover { color: #ff6666; @@ -3971,22 +4060,22 @@ NautilusListView .view, NautilusListView iconview { box-shadow: none; } .gedit-document-panel row:hover:selected button:hover:active { - color: #ffffff; + color: #f2f5fc; } .gedit-document-panel-dragged-row { - border: 1px solid #292929; - background-color: #1f1f1f; - color: rgba(255, 255, 255, 0.87); + border: 1px solid #86909b; + background-color: #414752; + color: #ced6e0; } .gedit-side-panel-paned statusbar { - border-top: 1px solid #292929; - background-color: #383838; + border-top: 1px solid #86909b; + background-color: #57606f; } .gedit-search-entry-occurrences-tag { - color: rgba(255, 255, 255, 0.47); + color: rgba(206, 214, 224, 0.6); border: none; margin: 2px; padding: 2px; @@ -4003,9 +4092,9 @@ NautilusListView .view, NautilusListView iconview { } .xed-window .xed-goto-line-box, .gedit-search-slider { - background-color: #3d3d3d; + background-color: #5b6575; padding: 6px; - border-color: #292929; + border-color: #86909b; border-radius: 0 0 2px 2px; border-width: 0 1px 1px 1px; border-style: solid; @@ -4042,35 +4131,35 @@ workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.t } editortweak .linked > entry.search:focus + .gb-linked-scroller { - border-top-color: #8fa876; + border-top-color: rgba(100, 181, 246, 0.35); } layouttab { - background-color: #404040; + background-color: #3c4d5e; } layout { - border: 1px solid #292929; - -PnlDockBin-handle-size: 1; + border: 1px solid #86909b; + -pnldockbin-handle-size: 1; } eggsearchbar box.search-bar { - border-bottom: 1px solid #292929; + border-bottom: 1px solid #86909b; } pillbox { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); border-radius: 3px; } pillbox:disabled label { - color: rgba(255, 255, 255, 0.5); + color: rgba(242, 245, 252, 0.5); } docktabstrip { padding: 0 6px; - background-color: #383838; - border-bottom: 1px solid #292929; + background-color: #57606f; + border-bottom: 1px solid #86909b; } docktabstrip docktab { min-height: 28px; @@ -4084,21 +4173,21 @@ docktabstrip docktab:checked label, docktabstrip docktab:hover label { opacity: 1; } docktabstrip docktab:checked { - border-color: #292929; - background-color: #404040; + border-color: #86909b; + background-color: #3c4d5e; } dockbin { - border: 1px solid #292929; - -PnlDockBin-handle-size: 1; + border: 1px solid #86909b; + -pnldockbin-handle-size: 1; } dockpaned { - border: 1px solid #292929; + border: 1px solid #86909b; } dockoverlayedge { - background-color: #383838; + background-color: #57606f; } dockoverlayedge docktabstrip { padding: 0; @@ -4134,13 +4223,13 @@ popover.popover-selector list row image { entry.search.preferences-search { border: none; - border-right: 1px solid #292929; - border-bottom: 1px solid #292929; + border-right: 1px solid #86909b; + border-bottom: 1px solid #86909b; border-radius: 0; } preferences stacksidebar.sidebar list { - background-image: linear-gradient(to bottom, #404040, #404040); + background-image: linear-gradient(to bottom, #3c4d5e, #3c4d5e); } preferences stacksidebar.sidebar list separator { background-color: transparent; @@ -4148,7 +4237,7 @@ preferences stacksidebar.sidebar list separator { devhelppanel entry:focus, symboltreepanel entry:focus { - border-color: #292929; + border-color: #86909b; } button.run-arrow-button { @@ -4166,7 +4255,7 @@ gstyleslidein #scale_box button.toggle:checked, gstyleslidein #strings_controls button.toggle:checked, gstyleslidein #palette_controls button.toggle:checked, gstyleslidein #components_controls button.toggle:checked { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } configurationview entry.flat { @@ -4177,33 +4266,33 @@ configurationview list { } EphyWindow .floating-bar { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .xreader-window .primary-toolbar .button.the-button-in-the-combobox { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(64, 82, 100, 0.9); } .xreader-window .primary-toolbar .button.the-button-in-the-combobox:hover { - background-color: rgba(138, 138, 138, 0.4); + background-color: rgba(94, 120, 147, 0.9); } .xreader-window .primary-toolbar .button.the-button-in-the-combobox:disabled { - color: rgba(255, 255, 255, 0.47); + color: rgba(206, 214, 224, 0.6); } calendar-view event.color-light label { color: black; } calendar-view event.color-light.timed label { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } calendar-view event.color-dark label { color: white; } calendar-view event.color-dark.timed label { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .documents-scrolledwin.frame { @@ -4216,36 +4305,36 @@ button.documents-load-more { } .documents-icon-bg { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; border-radius: 2px; } .documents-collection-icon, .photos-collection-icon { - background-color: rgba(255, 255, 255, 0.17); + background-color: rgba(206, 214, 224, 0.3); border-radius: 2px; } .documents-favorite.button:active, .documents-favorite.button:active:hover { - color: #c2d0b4; + color: rgba(196, 227, 252, 0.35); } .documents-entry-tag, .photos-entry-tag { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; border-radius: 2px; border-width: 0; margin: 2px; padding: 4px; } .documents-entry-tag:hover, .photos-entry-tag:hover { - color: #ffffff; - background-color: #99b082; + color: #f2f5fc; + background-color: rgba(119, 190, 247, 0.35); } .documents-entry-tag:active, .photos-entry-tag:active { - color: #ffffff; - background-color: #85a06a; + color: #f2f5fc; + background-color: rgba(81, 172, 245, 0.35); } .photos-fade-in { @@ -4260,7 +4349,7 @@ button.documents-load-more { .tweak-categories, .tweak-category:not(:selected):not(:hover) { - background-image: linear-gradient(to bottom, #404040, #404040); + background-image: linear-gradient(to bottom, #3c4d5e, #3c4d5e); } .content-view.document-page { @@ -4275,7 +4364,7 @@ TotemGrilo.vertical GdMainView.frame { SynapseGuiSelectionContainer *:selected, SynapseGuiViewVirgilio *:selected { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } .tr-workarea .undershoot, @@ -4285,13 +4374,14 @@ SynapseGuiViewVirgilio *:selected { .gnome-panel-menu-bar, .mate-panel-menu-bar { - color: #DADADA; - background-color: #2f2f2f; + color: #ced6e0; + background-color: #57606f; } -.gnome-panel-menu-bar, .gnome-panel-menu-bar menubar, +.gnome-panel-menu-bar, +.gnome-panel-menu-bar menubar, .mate-panel-menu-bar, .mate-panel-menu-bar menubar { - background-color: #2f2f2f; + background-color: #57606f; } .gnome-panel-menu-bar menubar, .gnome-panel-menu-bar #PanelApplet label, @@ -4299,13 +4389,14 @@ SynapseGuiViewVirgilio *:selected { .mate-panel-menu-bar menubar, .mate-panel-menu-bar #PanelApplet label, .mate-panel-menu-bar #PanelApplet image { - color: #DADADA; + color: #ced6e0; } .gnome-panel-menu-bar menu > menuitem, .mate-panel-menu-bar menu > menuitem { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } -.gnome-panel-menu-bar button label, .gnome-panel-menu-bar button image, +.gnome-panel-menu-bar button label, +.gnome-panel-menu-bar button image, .gnome-panel-menu-bar #tasklist-button label, .gnome-panel-menu-bar #tasklist-button image, .mate-panel-menu-bar button label, @@ -4316,7 +4407,7 @@ SynapseGuiViewVirgilio *:selected { } .gnome-panel-menu-bar #tasklist-button, .mate-panel-menu-bar #tasklist-button { - color: #DADADA; + color: #ced6e0; border-radius: 0; border: none; padding-bottom: 0; @@ -4329,7 +4420,7 @@ SynapseGuiViewVirgilio *:selected { .gnome-panel-menu-bar #tasklist-button:checked, .gnome-panel-menu-bar #tasklist-button:active, .mate-panel-menu-bar #tasklist-button:checked, .mate-panel-menu-bar #tasklist-button:active { - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } .gnome-panel-menu-bar #tasklist-button:checked label, .gnome-panel-menu-bar #tasklist-button:active label, .mate-panel-menu-bar #tasklist-button:checked label, @@ -4344,7 +4435,7 @@ SynapseGuiViewVirgilio *:selected { } .gnome-panel-menu-bar na-tray-applet, .mate-panel-menu-bar na-tray-applet { - -NaTrayApplet-icon-padding: 1px; + -natrayapplet-icon-padding: 1px; } MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { @@ -4355,27 +4446,27 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { } .mintmenu:hover { - background-color: #3c3c3c; + background-color: #626c7d; } .mintmenu:selected { - color: #ffffff; - background-color: #8fa876; + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); } .wnck-pager { background-color: rgba(0, 0, 0, 0.04); } .wnck-pager:selected { - background-color: rgba(143, 168, 118, 0.6); + background-color: rgba(100, 181, 246, 0); } .wnck-pager:hover { - background-color: rgba(143, 168, 118, 0.2); + background-color: rgba(100, 181, 246, 0); } .xfce4-panel.panel { background-color: #393939; - color: #DADADA; + color: #ced6e0; } .xfce4-panel.panel frame > border { border: 0; @@ -4386,32 +4477,34 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { .gnome-panel-menu-bar button:not(#tasklist-button), .mate-panel-menu-bar button:not(#tasklist-button), .xfce4-panel.panel button { - color: #DADADA; + color: #ced6e0; border-radius: 0; border: none; - background-color: rgba(47, 47, 47, 0); + background-color: rgba(87, 96, 111, 0); } .gnome-panel-menu-bar button:hover:not(#tasklist-button), .mate-panel-menu-bar button:hover:not(#tasklist-button), .xfce4-panel.panel button:hover { border: none; - background-color: #494949; + background-color: #6d798c; } .gnome-panel-menu-bar button:active:not(#tasklist-button), .mate-panel-menu-bar button:active:not(#tasklist-button), .xfce4-panel.panel button:active, .gnome-panel-menu-bar button:checked:not(#tasklist-button), .mate-panel-menu-bar button:checked:not(#tasklist-button), .xfce4-panel.panel button:checked { - color: #ffffff; + color: #f2f5fc; border: none; - background-color: #8fa876; + background-color: rgba(100, 181, 246, 0.35); } .gnome-panel-menu-bar button:not(#tasklist-button) label, -.mate-panel-menu-bar button:not(#tasklist-button) label, .xfce4-panel.panel button label, .gnome-panel-menu-bar button:not(#tasklist-button) image, -.mate-panel-menu-bar button:not(#tasklist-button) image, .xfce4-panel.panel button image { +.mate-panel-menu-bar button:not(#tasklist-button) label, .xfce4-panel.panel button label, +.gnome-panel-menu-bar button:not(#tasklist-button) image, +.mate-panel-menu-bar button:not(#tasklist-button) image, +.xfce4-panel.panel button image { color: inherit; } .floating-bar { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } .floating-bar.top { border-radius: 0 0 2px 2px; @@ -4436,15 +4529,17 @@ BirdieWidgetsTweetList * { background-color: transparent; } -MarlinViewWindow *:selected, MarlinViewWindow *:selected:focus { - color: #ffffff; - background-color: #8fa876; +MarlinViewWindow *:selected, +MarlinViewWindow *:selected:focus { + color: #f2f5fc; + background-color: rgba(100, 181, 246, 0.35); outline-color: transparent; } MarlinViewWindow GtkIconView.view:selected, MarlinViewWindow GtkIconView.view:selected:focus, MarlinViewWindow GtkIconView.view:selected:hover, MarlinViewWindow GtkIconView.view:selected:focus:hover { background-color: transparent; } -MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { +MarlinViewWindow FMListView, +MarlinViewWindow FMColumnView { outline-color: transparent; } @@ -4452,24 +4547,25 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { border-radius: 3px; padding-left: 4px; padding-right: 4px; - color: rgba(255, 255, 255, 0.87); - border-color: rgba(13, 13, 13, 0.4); - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(206, 214, 224, 0.3); + background-color: rgba(60, 77, 94, 0.9); } -.marlin-pathbar.pathbar image, .marlin-pathbar.pathbar image:hover { +.marlin-pathbar.pathbar image, +.marlin-pathbar.pathbar image:hover { color: inherit; } .marlin-pathbar.pathbar:focus { - color: rgba(255, 255, 255, 0.87); - border-color: #8fa876; - background-color: rgba(99, 99, 99, 0.4); + color: #ced6e0; + border-color: rgba(100, 181, 246, 0.35); + background-color: rgba(60, 77, 94, 0.9); } .marlin-pathbar.pathbar:disabled { - color: rgba(255, 255, 255, 0.42); - background-color: rgba(99, 99, 99, 0.25); + color: rgba(206, 214, 224, 0.55); + background-color: rgba(60, 77, 94, 0.75); } .marlin-pathbar.pathbar:active, .marlin-pathbar.pathbar:checked { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } .gala-notification { @@ -4478,7 +4574,8 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); background-color: white; } -.gala-notification .title, .gala-notification .label { +.gala-notification .title, +.gala-notification .label { color: #5c616c; } @@ -4488,13 +4585,13 @@ PantheonTerminalPantheonTerminalWindow.background { SwitchboardCategoryView .view:selected, SwitchboardCategoryView iconview:selected, SwitchboardCategoryView .view:selected:focus { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .cs-header { padding: 6px; - background-color: #353535; - border-bottom: 1px solid #292929; + background-color: #555e6c; + border-bottom: 1px solid #86909b; } .xed-window .xed-panel.side notebook tab.top { @@ -4507,47 +4604,49 @@ SwitchboardCategoryView .view:selected:focus { padding: 2px 4px; } .xed-window .xed-searchbar { - border: 0px solid #292929; + border: 0px solid #86909b; border-top-width: 1px; } .xed-window statusbar widget border { border-color: transparent; } -.xed-window statusbar button, .xed-window statusbar widget frame, .xed-window statusbar widget frame border { +.xed-window statusbar button, +.xed-window statusbar widget frame, +.xed-window statusbar widget frame border { padding: 0; } EvWindow .content-view .view:selected, EvWindow .content-view iconview:selected, EvWindow .content-view .view:focus:selected { - background-color: #8fa876; - color: #ffffff; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } .thunar .sidebar .view, .thunar .sidebar iconview { background-color: #353535; - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } .thunar .sidebar .view:selected, .thunar .sidebar iconview:selected, .thunar .sidebar .view:active, .thunar .sidebar iconview:active { - background: #8fa876; - color: #ffffff; + background: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } .thunar toolbar.horizontal button image, .thunar .horizontal.inline-toolbar button image { -gtk-icon-transform: scale(0.9); } #panel_window { - background-color: #2f2f2f; - color: #DADADA; + background-color: #57606f; + color: #ced6e0; font-weight: bold; - box-shadow: inset 0 -1px #1d1d1d; + box-shadow: inset 0 -1px #474f5b; } #panel_window menubar, #panel_window menubar > menuitem { background-color: transparent; - color: #DADADA; + color: #ced6e0; font-weight: bold; } #panel_window menubar menuitem:disabled { - color: rgba(218, 218, 218, 0.5); + color: rgba(206, 214, 224, 0.5); } #panel_window menubar menuitem:disabled label { color: inherit; @@ -4562,12 +4661,12 @@ EvWindow .content-view .view:focus:selected { font-weight: normal; border-style: none; background-color: transparent; - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; } #content_frame { padding-bottom: 14px; - background-color: #383838; + background-color: #57606f; border-top-left-radius: 2px; border-top-right-radius: 2px; border: solid rgba(0, 0, 0, 0.1); @@ -4575,27 +4674,27 @@ EvWindow .content-view .view:focus:selected { } #content_frame button { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #454545; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #405264; } #content_frame button:hover { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #292929; - background-color: #525252; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #86909b; + background-color: #4a5f74; } #content_frame button:active, #content_frame button:checked { - color: rgba(255, 255, 255, 0.87); - outline-color: rgba(255, 255, 255, 0.17); - border-color: #0f0f0f; + color: #ced6e0; + outline-color: rgba(206, 214, 224, 0.3); + border-color: #6c7682; background-color: rgba(0, 0, 0, 0.15); } #content_frame button:disabled { - color: rgba(255, 255, 255, 0.42); - border-color: rgba(41, 41, 41, 0.55); - background-color: rgba(69, 69, 69, 0.55); + color: #86909b; + border-color: rgba(134, 144, 155, 0.55); + background-color: rgba(64, 82, 100, 0.55); } #content_frame button:disabled label { color: inherit; @@ -4605,40 +4704,40 @@ EvWindow .content-view .view:focus:selected { padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: #2b2b2b; + background-color: #57606f; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; border: solid rgba(0, 0, 0, 0.1); border-width: 0 1px 1px 1px; - box-shadow: inset 0 1px #212121; + box-shadow: inset 0 1px #4e5664; } #buttonbox_frame button { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.4); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.4); } #buttonbox_frame button:hover { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(127, 127, 127, 0.5); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(128, 151, 174, 0.5); } #buttonbox_frame button:active, #buttonbox_frame button:checked { - color: #dbdbdb; - outline-color: rgba(219, 219, 219, 0.3); - border-color: rgba(22, 22, 22, 0.4); + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + border-color: rgba(36, 46, 57, 0.4); background-color: rgba(0, 0, 0, 0.15); } #buttonbox_frame button:disabled { - color: #676767; - border-color: rgba(22, 22, 22, 0.4); - background-color: rgba(109, 109, 109, 0.25); + color: #737f8d; + border-color: rgba(36, 46, 57, 0.4); + background-color: rgba(106, 133, 160, 0.25); } #login_window #user_combobox { - color: rgba(255, 255, 255, 0.87); + color: #ced6e0; font-size: 13px; } #login_window #user_combobox menu { @@ -4652,46 +4751,46 @@ EvWindow .content-view .view:focus:selected { #shutdown_button.button { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #F04A50; - border-color: #F04A50; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff5f45; + border-color: #ff5f45; } #shutdown_button.button:hover { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #f4797e; - border-color: #f4797e; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff8b78; + border-color: #ff8b78; } #shutdown_button.button:active, #shutdown_button.button:checked { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #ec1b22; - border-color: #ec1b22; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #ff3312; + border-color: #ff3312; } #restart_button.button { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #6db442; - border-color: #6db442; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: rgb(26, 196, 88); + border-color: rgb(26, 196, 88); } #restart_button.button:hover { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #88c663; - border-color: #88c663; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #2ee370; + border-color: #2ee370; } #restart_button.button:active, #restart_button.button:checked { background-clip: border-box; - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - background-color: #568f34; - border-color: #568f34; + color: #f2f5fc; + outline-color: rgba(242, 245, 252, 0.3); + background-color: #149744; + border-color: #149744; } #greeter_infobar { @@ -4707,13 +4806,13 @@ window.background.lightdm button.flat.option-button { color: #dadada; } window.background.lightdm button.flat.option-button:hover { - border-color: rgba(41, 41, 41, 0.2); + border-color: rgba(134, 144, 155, 0.2); background-color: rgba(0, 0, 0, 0.5); } window.background.lightdm button.flat.option-button:active { - border-color: #292929; - background-color: #8fa876; - color: #ffffff; + border-color: #86909b; + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } window.background.lightdm button, window.background.lightdm button.toggle-button { border-color: transparent; @@ -4721,13 +4820,13 @@ window.background.lightdm button, window.background.lightdm button.toggle-button color: #dadada; } window.background.lightdm button:hover, window.background.lightdm button.toggle-button:hover { - border-color: rgba(41, 41, 41, 0.2); + border-color: rgba(134, 144, 155, 0.2); background-color: rgba(0, 0, 0, 0.5); } window.background.lightdm button:active, window.background.lightdm button.selected, window.background.lightdm button.toggle-button:active, window.background.lightdm button.toggle-button.selected { - border-color: rgba(41, 41, 41, 0.2); - background-color: #8fa876; - color: #ffffff; + border-color: rgba(134, 144, 155, 0.2); + background-color: rgba(100, 181, 246, 0.35); + color: #f2f5fc; } window.background.lightdm entry, window.background.lightdm .lightdm-combo entry { @@ -4743,50 +4842,50 @@ window.background.lightdm .lightdm-combo { background-color: transparent; } -@define-color theme_fg_color rgba(255, 255, 255, 0.87); -@define-color theme_text_color #DADADA; -@define-color theme_bg_color #383838; -@define-color theme_base_color #404040; -@define-color theme_selected_bg_color #8fa876; -@define-color theme_selected_fg_color #ffffff; -@define-color fg_color rgba(255, 255, 255, 0.87); -@define-color text_color #DADADA; -@define-color bg_color #383838; -@define-color base_color #404040; -@define-color selected_bg_color #8fa876; -@define-color selected_fg_color #ffffff; -@define-color insensitive_bg_color #3d3d3d; -@define-color insensitive_fg_color alpha(white, 0.5); -@define-color insensitive_base_color #404040; -@define-color theme_unfocused_fg_color rgba(255, 255, 255, 0.87); -@define-color theme_unfocused_text_color #DADADA; -@define-color theme_unfocused_bg_color #383838; -@define-color theme_unfocused_base_color #404040; -@define-color borders #292929; -@define-color unfocused_borders #292929; +@define-color theme_fg_color #ced6e0; +@define-color theme_text_color #dae1e9; +@define-color theme_bg_color #57606f; +@define-color theme_base_color #3c4d5e; +@define-color theme_selected_bg_color rgba(100, 181, 246, 0.35); +@define-color theme_selected_fg_color #f2f5fc; +@define-color fg_color #ced6e0; +@define-color text_color #dae1e9; +@define-color bg_color #57606f; +@define-color base_color #3c4d5e; +@define-color selected_bg_color rgba(100, 181, 246, 0.35); +@define-color selected_fg_color #f2f5fc; +@define-color insensitive_bg_color #5b6575; +@define-color insensitive_fg_color alpha(#86909b, 0.5); +@define-color insensitive_base_color #3c4d5e; +@define-color theme_unfocused_fg_color #ced6e0; +@define-color theme_unfocused_text_color #dae1e9; +@define-color theme_unfocused_bg_color #57606f; +@define-color theme_unfocused_base_color #3c4d5e; +@define-color borders #86909b; +@define-color unfocused_borders #86909b; @define-color warning_color #f27835; -@define-color error_color #FC4138; -@define-color success_color #73d216; +@define-color error_color #fc7661; +@define-color success_color rgb(70, 221, 126); @define-color placeholder_text_color #A8A8A8; -@define-color content_view_bg #404040; -@define-color wm_title rgba(255, 255, 255, 0.87); -@define-color wm_title_unfocused #a7a7a7; -@define-color wm_bg #2b2b2b; -@define-color wm_bg_unfocused #2f2f2f; -@define-color wm_highlight #373737; -@define-color wm_border #212121; -@define-color wm_border_unfocused #2e2e2e; +@define-color content_view_bg #3c4d5e; +@define-color wm_title #dae1e9; +@define-color wm_title_unfocused #86909b; +@define-color wm_bg #4d535d; +@define-color wm_bg_unfocused #5e6778; +@define-color wm_highlight #57606f; +@define-color wm_border #57606f; +@define-color wm_border_unfocused #57606f; @define-color wm_shadow alpha(black, 0.35); -@define-color wm_button_close_bg #8fa876; -@define-color wm_button_close_hover_bg #b3c4a2; -@define-color wm_button_close_active_bg #5c7147; -@define-color wm_icon_close_bg #f8f8f8; -@define-color wm_button_hover_bg #4c4c4c; -@define-color wm_button_active_bg #949494; -@define-color wm_icon_bg #909090; -@define-color wm_icon_unfocused_bg #555555; -@define-color wm_icon_hover_bg #C4C7CC; -@define-color wm_icon_active_bg #ffffff; +@define-color wm_button_close_bg rgba(0, 0, 0, 0); +@define-color wm_button_close_hover_bg rgba(0, 0, 0, 0); +@define-color wm_button_close_active_bg rgba(0, 0, 0, 0); +@define-color wm_icon_close_bg rgba(0, 0, 0, 0); +@define-color wm_button_hover_bg rgba(0, 0, 0, 0); +@define-color wm_button_active_bg rgba(0, 0, 0, 0); +@define-color wm_icon_bg rgba(0, 0, 0, 0); +@define-color wm_icon_unfocused_bg rgba(0, 0, 0, 0); +@define-color wm_icon_hover_bg rgba(0, 0, 0, 0); +@define-color wm_icon_active_bg rgba(0, 0, 0, 0); /* Based on _Adwaita-base.scss from libhandy */ popover.combo { padding: 0; @@ -4802,10 +4901,10 @@ row.expander { padding: 0px; } row.expander:checked image.expander-row-arrow:not(:disabled) { - color: #8fa876; + color: rgba(100, 181, 246, 0.35); } row.expander image.expander-row-arrow:disabled { - color: rgba(255, 255, 255, 0.42); + color: #86909b; } keypad .digit { @@ -4833,7 +4932,7 @@ viewswitcher button:not(:checked):not(:hover) { border-color: transparent; } viewswitcher button:checked, viewswitcher button:active { - border-color: #8fa876; + border-color: rgba(100, 181, 246, 0.35); } viewswitcher button > stack > box.narrow { font-size: 0.75rem; @@ -4855,7 +4954,7 @@ viewswitcher button > stack > box.wide label:dir(rtl) { padding-left: 7px; } viewswitcher button.needs-attention > stack > box label { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#8fa876), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(100, 181, 246, 0.35)), to(transparent)); background-size: 6px 6px; background-repeat: no-repeat; background-position: right 0px; @@ -4864,7 +4963,7 @@ viewswitcher button.needs-attention > stack > box label:dir(rtl) { background-position: left 0px; } viewswitcher button.needs-attention:active > stack > box label { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#ffffff), to(transparent)); + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#f2f5fc), to(transparent)); } viewswitcherbar actionbar > revealer > box { @@ -4876,20 +4975,20 @@ list.content list { background-color: transparent; } list.content list.nested > row:not(:active):not(:hover):not(:selected), list.content list.nested > row:not(:active):hover:not(.activatable):not(:selected) { - background-color: #3c3c3c; + background-color: #4a5767; } list.content list.nested > row:not(:active):hover.activatable:not(:selected) { - background-color: #464646; + background-color: #425263; } list.content > row:not(.expander):not(:active):not(:hover):not(:selected), list.content > row:not(.expander):not(:active):hover:not(.activatable):not(:selected), list.content > row.expander row.header:not(:active):not(:hover):not(:selected), list.content > row.expander row.header:not(:active):hover:not(.activatable):not(:selected) { - background-color: #404040; + background-color: #3c4d5e; } list.content > row:not(.expander):not(:active):hover.activatable:not(:selected), list.content > row.expander row.header:not(:active):hover.activatable:not(:selected) { - background-color: #464646; + background-color: #425263; } list.content > row, list.content > row list > row { - border-color: #292929; + border-color: #86909b; border-style: solid; transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } @@ -4910,7 +5009,7 @@ window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top): } .windowhandle separator.sidebar:dir(ltr), .windowhandle separator.sidebar.left, .windowhandle separator.sidebar.left:dir(rtl), .windowhandle separator.sidebar:dir(rtl), .windowhandle separator.sidebar.right { - background-color: #212121; + background-color: #4e5664; margin: 0; } diff --git a/gtk-3.0/render-assets.sh b/gtk-3.0/render-assets.sh old mode 100644 new mode 100755 index 990ddf2..07a0d0f --- a/gtk-3.0/render-assets.sh +++ b/gtk-3.0/render-assets.sh @@ -11,28 +11,23 @@ INDEX="assets.txt" for i in `cat $INDEX` do -if [ -f $ASSETS_DIR/$i.png ]; then - echo $ASSETS_DIR/$i.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-type=png \ - -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ - && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi -if [ -f $ASSETS_DIR/$i@2.png ]; then - echo $ASSETS_DIR/$i@2.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i@2.png - $INKSCAPE --export-id=$i \ - --export-dpi=192 \ - --export-id-only \ - --export-type=png \ - -o $ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null \ - && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png -fi + echo + echo Rendering $ASSETS_DIR/$i.png + $INKSCAPE --export-id=$i \ + --export-id-only \ + --export-type=png \ + -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null \ + && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png + + + echo + echo Rendering $ASSETS_DIR/$i@2.png + $INKSCAPE --export-id=$i \ + --export-dpi=192 \ + --export-id-only \ + --export-type=png \ + -o $ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null \ + && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png + done exit 0 diff --git a/gtk-3.0/sass/_colors.scss b/gtk-3.0/sass/_colors.scss deleted file mode 100644 index ea7a263..0000000 --- a/gtk-3.0/sass/_colors.scss +++ /dev/null @@ -1,122 +0,0 @@ -// When color definition differs for dark and light variant, -// it gets @if ed depending on $variant - -// We need to set this first because we use it to tint many -// of the remaining colors - -$light_tint: if($tint == 'tint', mix(#92b372, #f5f5f5, 2%), #f5f5f5); -$dark_tint: if($tint == 'tint', mix(#8fa876, #383838, 2%), #383838); - -$base_color: if($variant == 'light', #ffffff, #404040); -$text_color: if($variant == 'light', #303030, #DADADA); -$bg_color: if($variant == 'light', $light_tint, $dark_tint); -$fg_color: if($variant =='light', transparentize(black, 0.13), transparentize(white, 0.13)); - -$selected_bg_color: if($variant == 'light', #92b372, #8fa876); -$selected_fg_color: #ffffff; -$selected_borders_color: darken($selected_bg_color, 15%); -$borders_color: if($variant =='light', darken($bg_color, 18%), darken($bg_color,6%)); -$separator_color: if($variant == 'light', #DFDFDF, darken($bg_color, 6%)); - -$link_color: #5294E2; -$link_visited_color: #5294E2; - -$selection_mode_bg: $selected_bg_color; -$selection_mode_fg: $selected_fg_color; -$warning_color: #f27835; -$warning_fg_color: white; -$error_color: #FC4138; -$error_fg_color: white; -$success_color: #73d216; -$destructive_color: #F04A50; -$suggested_color: #6db442; -$question_color: #55c1ec; - -$drop_target_color: $selected_bg_color; - -//insensitive state derived colors -$insensitive_fg_color: transparentize($fg_color, 0.45); -$insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%)); - -$dim_label_fg_color: transparentize($fg_color, 0.35); - -$header_bg: if($variant == 'light', darken($bg_color, 5%), darken($bg_color, 5%)); -$header_bg_backdrop: if($variant == 'dark', lighten($header_bg, 1.5%), lighten($header_bg, 3%)); - -$header_border: if($variant == 'light', #BDBDBD, darken($header_bg, 4%)); -$header_highlight: if($variant == 'light', #EEEEEE, #373737); - -$header_fg: $fg_color; - -$menu_selected_bg_color: if($variant == 'light', transparentize(black, 0.9), transparentize(white, 0.9)); - -$dark_sidebar_bg: if($variant == 'light', saturate(darken($bg_color, 1%), 5%), #353535); -$dark_sidebar_fg: $fg_color; -$dark_sidebar_border: $borders_color; - -$filechooser_bg: $header_bg; - -$tooltip_bg_color: #fbeaa0; -$tooltip_fg_color: #4a4a4a; -$tooltip_border_color: #d0d0d0; - -$osd_fg_color: #dbdbdb; -$osd_bg_color: if($variant == 'light', #404040, #353535); - -$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); -$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); - -$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); -$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); - -$osd_insensitive_bg_color: darken($osd_bg_color, 3%); -$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); -$osd_borders_color: transparentize(black, 0.3); - -$panel_bg: #2f2f2f; -$panel_fg: #DADADA; - -$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #BABABA, darken($borders_color, 0%)); - -$header_entry_bg: if($variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($base_color, 0.1)); -$header_entry_border: if($variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); - -$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); -$button_border: $borders_color; -$button_active_bg: transparentize(black, 0.85); -$button_active_border: darken($button_border, 10%); - -$header_button_bg: if($variant == 'dark', transparentize(lighten($header_bg, 22%), 0.6), transparentize($button_bg, 0.1)); -$header_button_border: if($variant == 'dark', transparentize(darken($header_bg, 12%), 0.6), transparentize($header_fg, 0.7)); - -$trough_color_treeview: if($variant == 'light', #d9d9d9, darken($bg_color, 5%)); -$trough_color: if($variant == 'light', #ffffff, darken($bg_color, 5%)); - -// WM Colors - -$wm_title: if($variant == 'light', #404040, $fg_color); -$wm_title_unfocused: if($variant == 'light', #9d9d9d, #a7a7a7); -$wm_bg: $header_bg; -$wm_bg_unfocused: $header_bg; -$wm_highlight: $header_highlight; -$wm_border: $header_border; -$wm_border_unfocused: lighten($header_border, 5%); - -//WM Buttons - -// Close -$wm_button_close_bg: $selected_bg_color; -$wm_button_close_hover_bg: lighten($selected_bg_color, 14%); -$wm_button_close_active_bg: darken($selected_bg_color, 20%); - -$wm_icon_close_bg: #f8f8f8; - -// Minimize, Maximize -$wm_button_hover_bg: if($variant == 'light', #fdfdfd, #4c4c4c); -$wm_button_active_bg: if($variant == 'light', #909090, #949494); - -$wm_icon_bg: if($variant == 'light', #404040, #909090); -$wm_icon_unfocused_bg: if($variant == 'light', #b6b6b6, #555555); -$wm_icon_hover_bg: if($variant == 'light', #404040, #C4C7CC); -$wm_icon_active_bg: #ffffff \ No newline at end of file diff --git a/gtk-3.0/sass/_common.scss b/gtk-3.0/sass/_common.scss deleted file mode 100644 index 4cf8dce..0000000 --- a/gtk-3.0/sass/_common.scss +++ /dev/null @@ -1,3191 +0,0 @@ -@function gtkalpha($c,$a) { - @return unquote("alpha(#{$c},#{$a})"); -} - -$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); -$asset_suffix: if($variant=='dark', '-dark', ''); // use dark assets in dark variant - -* { - background-clip: padding-box; - -GtkToolButton-icon-spacing: 4; - -GtkTextView-error-underline-color: $error_color; - - -GtkScrolledWindow-scrollbar-spacing: 0; - - -GtkToolItemGroup-expander-size: 11; - - -GtkWidget-text-handle-width: 20; - -GtkWidget-text-handle-height: 20; - - -GtkDialog-button-spacing: 4; - -GtkDialog-action-area-border: 6; - - // We use the outline properties to signal the focus properties - outline-color: transparentize($fg_color, 0.7); - outline-style: dashed; - outline-offset: -3px; - outline-width: 1px; - -gtk-outline-radius: 2px; -} - - -// -// Base States -// -.background { - color: $fg_color; - background-color: transparentize($bg_color, 0.001); -} - -*:disabled { -gtk-icon-effect: dim; } - -.gtkstyle-fallback { - background-color: $bg_color; - color: $fg_color; - &:hover { - background-color: lighten($bg_color, 10%); - color: $fg_color; - } - &:active { - background-color: darken($bg_color, 10%); - color: $fg_color; - } - &:disabled { - background-color: $insensitive_bg_color; - color: $insensitive_fg_color; - } - &:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - } -} - -.view, -%view { - color: $text_color; - background-color: $base_color; - - &:selected { - &, &:focus { - @extend %selected_items; - border-radius: 2px; - } - } -} - -.view, -textview { - text { - @extend %view; - - selection { &:focus, & { @extend %selected_items; }} - } -} - -textview border { background-color: mix($bg_color, $base_color, 50%); } - -iconview { @extend .view; } - -rubberband, -.rubberband { - border: 1px solid darken($selected_bg_color, 10%); - background-color: transparentize(darken($selected_bg_color, 10%), 0.8); -} - -flowbox { - rubberband { @extend rubberband } - - flowboxchild { - padding: 3px; - border-radius: 2px; - - &:selected { - @extend %selected_items; - - outline-offset: -2px; - } - } -} - -label { - &.separator { - @extend .dim-label; - - color: $fg_color; - } - - row:selected &, - &:selected { - @extend %nobg_selected_items; - } - - selection { - color: $selected_fg_color; - background-color: $selected_bg_color; - } - - &:disabled { - color: $insensitive_fg_color; - - selection { @extend %selected_items_disabled; } - } -} - -.dim-label { - color: $dim_label_fg_color; -} - -assistant { - .sidebar { - background-color: $base_color; - border-top: 1px solid $borders_color; - &:dir(ltr) { border-right: 1px solid $borders_color; } - &:dir(rtl) { border-left: 1px solid $borders_color; } - } - - &.csd .sidebar { border-top-style: none; } - - .sidebar label { padding: 6px 12px; } - - .sidebar label.highlight { - background-color: $selected_bg_color; - color: $selected_fg_color; - } -} - -textview { // This will get overridden by .view, needed by gedit line numbers and the mintupdate package description - background-color: mix($bg_color, $base_color, 50%); - color: $text_color; -} - -%osd, .osd { - color: $osd_fg_color; - border: none; - background-color: $osd_bg_color; - background-clip: padding-box; - box-shadow: none; -} - -// -// Spinner Animations -// -@keyframes spin { - to { -gtk-icon-transform: rotate(1turn); } -} - -spinner { - background-image: none; - opacity: 0; // non spinning spinner makes no sense - -gtk-icon-source: -gtk-icontheme('process-working-symbolic'); - - &:checked { - opacity: 1; - animation: spin 1s linear infinite; - - &:disabled { - opacity: 0.5; - } - } -} - -$vert_padding: 5px; -// -// Text Entries -// -entry { - border: 1px solid; - padding: 5px 8px; - - caret-color: currentColor; - border-radius: 3px; - transition: all 200ms $ease-out-quad; - - &.search { border-radius: 4px; } - - @include entry(normal); - - image { // icons inside the entry - color: mix($fg_color,$base_color, 80%); - - &.left { - padding-left: 0; - padding-right: 5px; - } - &.right { - padding-right: 0; - padding-left: 5px; - } - } - - &.flat { - &, &:focus { - padding: 2px; - @include entry(normal); - border: none; - border-radius: 0; - } - } - - &:focus { - background-clip: border-box; - @include entry(focus); - } - - &:disabled { @include entry(insensitive); } - - selection { &:focus, & { @extend %selected_items; }} - - @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), - (error, $error_color, $error_fg_color), - // entry.search-missing for Gnome-Builder - (search-missing, $error_color, $error_fg_color) { - &.#{$e_type} { - color: $e_fg_color; - border-color: if($variant=='light', $e_color, $entry_border); - background-color: mix($e_color, $base_color, 60%); - - image { color: $e_fg_color; } - - &:focus { - color: $e_fg_color; - background-color: $e_color; - box-shadow: none; - } - selection, selection:focus { - background-color: $e_fg_color; - color: $e_color; - } - } - } - - &:drop(active) { - &:focus, & { - border-color: $drop_target_color; - box-shadow: none; - } - } - - .osd & { - @include entry(osd); - &:focus { @include entry(osd-focus); } - &:disabled { @include entry(osd-insensitive); } - - selection { - &:focus, & { - color: $selected_bg_color; - background-color: $selected_fg_color; - } - } - } - - progress { - margin: 0 -6px; - border-radius: 0; - border-width: 0 0 2px; - border-color: $selected_bg_color; - border-style: solid; - background-image: none; - background-color: transparent; - box-shadow: none; - } - - // linkded entries - .linked:not(.vertical) > &, - .linked:not(.vertical) > &:focus { @extend %linked; } - - .linked.vertical > &, - .linked.vertical > &:focus { @extend %linked_vertical; } -} - -treeview entry { - &.flat, & { - border-radius: 0; - background-image: none; - background-color: $base_color; - - &:focus { border-color: $selected_bg_color; } - } -} - -// -// Buttons -// -// stuff for .needs-attention -$_dot_color: $selected_bg_color; - -@keyframes needs_attention { - from { - background-image: -gtk-gradient(radial, - center center, 0, - center center, 0.01, - to($_dot_color), - to(transparent)); - } - to { - background-image: -gtk-gradient(radial, - center center, 0, - center center, 0.5, - to($selected_bg_color), - to(transparent)); - } -} - -$button_transition: all 200ms $ease-out-quad; - -button { - min-height: 22px; - min-width: 20px; - transition: $button_transition; - border: 1px solid; - border-radius: 3px; - padding: 5px 8px; - - @include button(normal); - - separator { margin: 4px 1px; } - - @at-root %button_basic_flat, - &.flat { - @include button(undecorated); - // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set - // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but - // it won't fade out when the pointer leave the button allocation area. To make the transition more evident - // in this case the duration is increased. - transition: none; - - &:hover { - transition: $button_transition; - transition-duration: 350ms; - - &:active { transition: $button_transition; } - } - } - - &:hover { - @include button(hover); - -gtk-icon-effect: highlight; - } - - &:active, &:checked { - @include button(active); - - background-clip: if($variant=='light', border-box, padding-box); - transition-duration: 50ms; - - &:not(:disabled) label:disabled { color: inherit; opacity: 0.6; } - } - - @at-root %button_basic_flat, - &.flat:disabled { @include button(undecorated); } - - &:disabled { - @include button(insensitive); - - &:active, &:checked { - @include button(insensitive-active); - } - } - - &.image-button { - min-width: 24px; - padding-left: 5px; - padding-right: 5px; - } - - &.text-button { - padding-left: 12px; - padding-right: 12px; - } - - &.text-button.image-button { - padding-left: 5px; - padding-right: 5px; - - label { - &:first-child { - padding-left: 8px; - padding-right: 2px; - } - &:last-child { - padding-right: 8px; - padding-left: 2px; - } - &:only-child { - padding-left: 8px; - padding-right: 8px; - } - } - - &.popup { padding-right: 8px; padding-left: 8px; } - } - - @at-root %button_basic_drop_active, - &:drop(active) { - color: $drop_target_color; - border-color: $drop_target_color; - box-shadow: none; - } - - // big standalone buttons like in Documents pager - &.osd { - color: $osd_fg_color; - outline-color: transparentize($osd_fg_color, 0.7); - background-color: $osd_bg_color; - border-color: darken($osd_bg_color, 8%); - - &.image-button { - padding: 0; - min-height: 36px; - min-width: 36px; - } - - &:hover { color: $selected_bg_color; } - &:active, &:checked { @include button(osd-active); } - &:disabled { @include button(osd-insensitive); } - } - - //overlay / OSD style - .osd & { - @include button(osd); - - &:hover { @include button(osd-hover); } - &:active, &:checked { - background-clip: padding-box; - @include button(osd-active); - } - &:disabled { @include button(osd-insensitive); } - - &.flat { - @include button(undecorated); - box-shadow: none; - &:hover { @include button(osd-hover); } - &:disabled { - @include button(osd-insensitive); - background-image: none; - } - &:active, &:checked { @include button(osd-active); } - } - } - .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active):not(:only-child), - .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; } - - // Suggested and Destructive Action buttons - @each $b_type, $b_color in (suggested-action, $suggested_color), - (destructive-action, $destructive_color) { - &.#{$b_type} { - @include button(suggested_destructive, $b_color); - - &.flat { - @include button(undecorated); - color: $b_color; - outline-color: transparentize($b_color, 0.7); - } - &:hover { - @include button(suggested_destructive, lighten($b_color, 10%)); - } - &:active, &:checked { - @include button(suggested_destructive, darken($b_color, 10%)); - } - &.flat:disabled { - @include button(undecorated); - color: $insensitive_fg_color; - } - &:disabled { @include button(insensitive); } - } - } - - .stack-switcher > & { - // to position the needs attention dot, padding is added to the button - // child, a label needs just lateral padding while an icon needs vertical - // padding added too. - - outline-offset: -3px; // needs to be set or it gets overridden by GtkRadioButton outline-offset - - > label { - padding-left: 6px; // label padding - padding-right: 6px; // - } - > image { - padding-left: 6px; - padding-right: 6px; - padding-top: 3px; - padding-bottom: 3px; - } - &.text-button { - padding-left: 10px; - padding-right: 10px; - } - &.image-button { - padding-left: 2px; - padding-right: 2px; - } - - &.needs-attention { - - > label, > image { @extend %needs_attention; } - - &:active, &:checked { - > label, > image { - animation: none; - background-image: none; - } - } - } - } - - %needs_attention { - animation: needs_attention 150ms ease-in; - background-image: -gtk-gradient(radial, - center center, 0, - center center, 0.5, - to($_dot_color), - to(transparent)); - background-size: 6px 6px, 6px 6px; - background-repeat: no-repeat; - @if $variant == 'light' { background-position: right 3px, right 4px; } - @else { background-position: right 3px, right 2px; } - &:dir(rtl) { - @if $variant == 'light' { background-position: left 3px, left 4px; } - @else { background-position: left 3px, left 2px; } - } - } - - // hide separators - &.font, - &.file { separator { background-color: transparent; }} - - //inline-toolbar buttons - .inline-toolbar &, .inline-toolbar &:backdrop { - border-radius: 2px; - border-width: 1px; - @extend %linked; - } - - .linked:not(.vertical) > &, - .linked:not(.vertical) > &:hover, - .linked:not(.vertical) > &:active, - .linked:not(.vertical) > &:checked { - @extend %linked; - } - - .linked.vertical > &, - .linked.vertical > &:hover, - .linked.vertical > &:active, - .linked.vertical > &:checked { - @extend %linked_vertical; - } -} - -// all the following is for the +|- buttons on inline toolbars, that way -// should really be deprecated... -.inline-toolbar toolbutton > button { // redefining the button look is - // needed since those are flat... - @include button(normal); - &:hover { @include button(hover); } - &:active, - &:checked{ @include button(active); } - &:disabled { @include button(insensitive); } - &:disabled:active, - &:disabled:checked { @include button(insensitive-active); } -} - -// More inline toolbar buttons -toolbar.inline-toolbar toolbutton { - & > button.flat { @extend %linked_middle; } - &:first-child > button.flat { @extend %linked_left; } - &:last-child > button.flat { @extend %linked_right; } - &:only-child > button.flat { @extend %linked_only_child; } -} - -%linked_middle { - border-radius: 0; - border-right-style: none; -} - -%linked_left { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -%linked_right { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-right-style: solid; -} - -%linked_only_child { - border-radius: 3px; - border-style: solid; -} - -%linked { - @extend %linked_middle; - - &:first-child { @extend %linked_left; } - &:last-child { @extend %linked_right; } - &:only-child { @extend %linked_only_child; } -} - -%linked_vertical_middle { - border-radius: 0; - border-bottom-style: none; -} - -%linked_vertical_top { - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} - -%linked_vertical_bottom { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - border-bottom-style: solid; -} - -%linked_vertical_only_child { - border-radius: 3px; - border-style: solid; -} - -%linked_vertical { - @extend %linked_vertical_middle; - - &:first-child { @extend %linked_vertical_top; } - &:last-child { @extend %linked_vertical_bottom; } - &:only-child { @extend %linked_vertical_only_child; } -} - -%undecorated_button { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -// menu buttons -menuitem.button.flat, -modelbutton.flat { - transition: none; - min-height: 24px; - padding-left: 8px; - padding-right: 8px; - outline-offset: -3px; - border-radius: 2px; - - @extend %undecorated_button; - - &:hover { background-color: $menu_selected_bg_color; } - &:active, &:selected { &, arrow { background-color: $menu_selected_bg_color; } } - &:checked { color: $fg_color; } - - // FIXME: temporary workaround - check:last-child, - radio:last-child { margin-left: 8px; } - - check:first-child, - radio:first-child { margin-right: 8px; } -} - -modelbutton.flat arrow { - &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } - &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -} - -// -// Links -// -%link, -*:link { - color: $link_color; - - &:visited { - color: $link_visited_color; - *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); } - } - &:hover { - color: lighten($link_color,10%); - *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); } - } - &:active { - color: $link_color; - *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); } - } - - @at-root %link_selected, - &:selected, - *:selected & { - color: mix($selected_fg_color, $selected_bg_color, 80%); - } -} - -button:link, button:visited { - @extend %undecorated_button; - @extend %link; - - &:hover, &:active, &:checked { - @extend %undecorated_button; - } - > label { text-decoration-line: underline; } -} - -// -// Spinbuttons -// -spinbutton { - &:drop(active) { box-shadow: none; } - - // button:active { color: $selected_fg_color; } - &:disabled { color: $insensitive_fg_color; } - - &:not(.vertical) { - entry { min-width: 28px; } - - button, entry { @extend %linked; } - - &:dir(ltr) entry, - &:dir(rtl) button.up { border-radius: 3px 0 0 3px; } - - > button + button { border-left-style: none; } - - > button + button, - > button:hover:not(:active), - > button:hover + button { box-shadow: inset 1px 0 $button_border; } - - > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), - > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: inset 1px 0 transparentize($button_border, 0.5); } - - > button:first-child:hover:not(:active), - > button.up:dir(rtl):hover:not(:active), - > entry + button:not(:active):hover { box-shadow: none; } - - > entry:focus + button { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); } - - > entry:drop(active) + button { border-left-color: $drop_target_color; } - - .osd & { - > button:hover:not(:active), - > button:hover + button { box-shadow: inset 1px 0 $osd_button_border; } - - > button:first-child:hover:not(:active), - > button.up:dir(rtl):hover:not(:active), - > entry + button:not(:active):hover { box-shadow: none; } - - > entry:focus + button { border-left-color: $osd_button_border; } - } - } - - &.vertical { - button, entry { - padding-left: 4px; - padding-right: 4px; - min-width: 0; - - @extend %linked_vertical; - } - - button.up { border-radius: 3px 3px 0 0; } - - > entry:focus + button { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); } - - > entry:drop(active) + button { border-top-color: $drop_target_color; } - } -} - -// -// Comboboxes -// -combobox { - button.combo { // Otherwise combos - padding-top: 3px; // are bigger than - padding-bottom: 3px; // buttons - } - arrow { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - min-height: 16px; - min-width: 16px; - } - - &:drop(active) button.combo { @extend %button_basic_drop_active; } - - .linked:not(.vertical) > & > box > button.combo { - // the combobox is a composite widget so the way we do button linking doesn't - // work, special case needed. - &:dir(ltr), - &:dir(rtl) { @extend %linked_middle; } - } - - .linked:not(.vertical) > &:first-child > box > button.combo { @extend %linked_left; } - .linked:not(.vertical) > &:last-child > box > button.combo { @extend %linked_right; } - .linked:not(.vertical) > &:only-child > box > button.combo { @extend %linked_only_child; } - - .linked.vertical > & > box > button.combo { @extend %linked_vertical_middle; } - .linked.vertical > &:first-child > box > button.combo { @extend %linked_vertical_top; } - .linked.vertical > &:last-child > box > button.combo { @extend %linked_vertical_bottom; } - .linked.vertical > &:only-child > box > button.combo { @extend %linked_vertical_only_child; } -} - -toolbar { - -GtkWidget-window-dragging: true; - padding: 4px; - background-color: $bg_color; - - separator { background: none; } - &.horizontal separator { margin: 0 6px; } - &.vertical separator { margin: 6px 0; } - - .osd & { background-color: transparent; } - - &.osd { - padding: 7px; - border: 1px solid transparentize(black, 0.5); - border-radius: 3px; - background-color: transparentize($osd_bg_color, 0.1); - - &.left, - &.right, - &.top, - &.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars - - &.top { border-width: 0 0 1px 0; } - &.bottom { border-width: 1px 0 0 0; } - &.left { border-width: 0 1px 0 0; } - &.right { border-width: 0 0 0 1px; } - } - - &:not(.inline-toolbar) { - switch, - scale, - entry, - spinbutton, - button { - margin-right: 1px; - margin-bottom: 1px; - } - .linked > button, - .linked > entry { margin-right:0; } - } -} - -.primary-toolbar toolbar, -.primary-toolbar:not(.libreoffice-toolbar) { // LO messes up the toolbar styling, so exclude LO toolbars - color: $header_fg; - background-color: opacify($header_bg, 1); - box-shadow: none; - border-width: 0 0 1px 0; - border-style: solid; - border-image: linear-gradient(to bottom, opacify($header_bg, 1), - darken($header_bg, 12%)) 1 0 1 0; //temporary hack for rhythmbox 3.1 - - separator { @extend %header_separator; } -} - -.primary-toolbar toolbar, -.primary-toolbar { @extend %header_widgets; } - -.inline-toolbar { - @extend toolbar; - background-color: darken($bg_color, 3%); - border-style: solid; - border-color: $borders_color; - border-width: 0 1px 1px; - padding: 3px; - border-radius: 0 0 3px 3px; -} - -searchbar { - background-color: $bg_color; - border-style: solid; - border-color: $borders_color; - border-width: 0 0 1px; - padding: 3px; - //box-shadow: inset 0 1px 2px rgba(0,0,0,0.25); -} - -actionbar { - padding: 6px; - border-top: 1px solid $borders_color; - background-color: darken($bg_color, 3%) -} - -// -// Headerbars -// -headerbar, -%titlebar { - min-height: 42px; - padding: 0 7px; - - border-width: 0 0 1px; - border-style: solid; - border-radius: 0; - border-color: opacify($header_border, 1); - - color: $header_fg; - background-color: opacify($header_bg, 1); - box-shadow: inset 0 1px $header_highlight; - - .csd & { // Transparent header-bars only in csd windows - background-color: $header_bg; - border-color: $header_border; - } - - &:backdrop { - color: transparentize($header_fg, 0.4); - box-shadow: none; - } - - .title { - font-weight: bold; - padding-left: 12px; - padding-right: 12px; - } - - .subtitle { - font-size: smaller; - padding-left: 12px; - padding-right: 12px; - } - - // Selectionmode - &.selection-mode { - color: $selected_fg_color; - background-color: $selection_mode_bg; - border-color: darken($selection_mode_bg, 4%); - box-shadow: none; - - &:backdrop { - background-color: $selection_mode_bg; - color: transparentize($selected_fg_color, 0.4); - } - - .subtitle:link { @extend %link_selected; } - - button { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - background-color: transparentize($selected_fg_color, 1); - border-color: transparentize($selected_fg_color, 1); - - &.flat { - @include button(undecorated); - color: $selected_fg_color; - background-color: transparentize($selected_fg_color, 1); - } - &:hover { - color: $selected_fg_color; - outline-color: transparentize($selected_fg_color, 0.7); - background-color: transparentize($selected_fg_color, 0.95); - border-color: transparentize($selected_fg_color, 0.5); - } - &:active, &:checked { - color: $selection_mode_bg; - outline-color: transparentize($selection_mode_bg, 0.7); - background-color: $selected_fg_color; - border-color: $selected_fg_color; - } - &:disabled { - color: transparentize($selected_fg_color, 0.6); - background-color: transparentize($selected_fg_color, 1); - border-color: transparentize($selected_fg_color, 1); - - &:active, &:checked { - color: transparentize($selection_mode_bg, 0.6); - background-color: transparentize($selected_fg_color, 0.85); - border-color: transparentize($selected_fg_color, 0.85); - } - } - } - - .selection-menu { - box-shadow: none; - padding-left: 10px; - padding-right: 10px; - GtkArrow { -GtkArrow-arrow-scaling: 1; } - .arrow { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - } - } - .maximized & { background-color: opacify($selection_mode_bg, 1); } - } - - .tiled &, .tiled &:backdrop, - .maximized &, .maximized &:backdrop { - border-radius: 0; // squared corners when the window is max'd or tiled - } - - .maximized & { - background-color: opacify($header_bg, 1); - border-color: opacify($header_border, 1); - } - - &.default-decoration, - .csd &.default-decoration, // needed under wayland, since all gtk3 windows are csd windows - &.default-decoration:backdrop, - .csd &.default-decoration:backdrop { - min-height: 28px; - padding: 0 7px; - background-color: opacify($header_bg, 1); - border-bottom-width: 0; - - .maximized & { background-color: opacify($header_bg, 1); } - } -} - -.titlebar { - border-radius: 8px 8px 0 0; -} - -headerbar { - @extend %header_widgets; - - entry, button, separator { - margin-top: 6px; - margin-bottom: 6px; - } - - // Fixes split headerbars - separator:first-child + &, - &:first-child { - &, &:backdrop { - border-top-left-radius: 8px; - - .maximized &, - .tiled & { border-radius: 0; } - } - } - - &:last-child { - &, &:backdrop { - border-top-right-radius: 8px; - - .maximized &, - .tiled & { border-radius: 0; } - } - } -} - -// Fixes split headerbars too -.titlebar:not(headerbar) { - window > &, - window.csd > & { - &, &:backdrop { - padding: 0; - background: none; - border: none; - box-shadow: none; - } - } - - > separator { background-image: _solid($header_border); } - - @extend %titlebar; -} - -%header_separator { - min-width: 1px; - min-height: 1px; - border-width: 0 1px; - border-image: linear-gradient(to bottom, - transparentize($header_fg, 1) 25%, - transparentize($header_fg, 0.65) 25%, - transparentize($header_fg, 0.65) 75%, - transparentize($header_fg, 1) 75%) 0 1/0 1px stretch; - - &:backdrop { opacity: 0.6; } -} - -%header_widgets { - // Headerbar Entries - entry { - @include entry(header-normal); - - &:backdrop { opacity: 0.85; } - - &:focus { - @include entry(header-focus); - background-clip: if($variant=='light', border-box, padding-box); - - image { color: transparentize($header_fg, 0.15); } - } - &:disabled { @include entry(header-insensitive); } - - selection:focus { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - progress { - border-color: $selected_bg_color; - background-image: none; - background-color: transparent; - } - - @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), - (error, $error_color, $error_fg_color) { - &.#{$e_type} { - color: $e_fg_color; - border-color: if($variant=='light', $e_color, $header_entry_border); - background-color: mix($e_color, $header_bg, 60%); - - &:focus { - color: $e_fg_color; - background-color: $e_color; - } - selection, selection:focus { - background-color: $e_fg_color; - color: $e_color; - } - } - } - } - - // Headerbar Buttons - button { - - @include button(header-normal); - - &:backdrop { opacity: 0.7; } - - &:hover { @include button(header-hover); } - &:active, &:checked { - @include button(header-active); - background-clip: if($variant=='light', border-box, padding-box); - } - &:disabled { @include button(header-insensitive); } - &:disabled:active, &:disabled:checked { @include button(header-insensitive-active); } - } - - &.selection-mode button { - - &, &.flat { - @include button(undecorated); - color: $selection_mode_fg; - background-color: transparentize($selection_mode_fg, 1); - } - &:hover { @extend %selected_button_normal; } - &:active, &:checked { @extend %selected_button_active; } - - &:disabled { - @extend %selected_button_flat_disabled; - - &:checked, &:active { @extend %selected_button_disabled_checked; } - } - } - - // Linking stuff - - // Disconnect linked buttons - .linked:not(.vertical):not(.path-bar):not(.stack-switcher) { - button:not(:last-child):not(:only-child) { margin-right: 1px; } - } - - // Reset buttons - .linked:not(.vertical):not(.path-bar) > button { - &, &:hover, &:active, &:checked, &:disabled { - border-radius: 3px; - border-style: solid; - } - } - .linked:not(.vertical):not(.path-bar) { - $_uncolored_button: 'button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; - - > #{$_uncolored_button} + #{$_uncolored_button}, - > #{$_uncolored_button}:hover:not(:only-child), - > #{$_uncolored_button}:hover + #{$_uncolored_button}, - > #{$_uncolored_button}:disabled:not(:only-child), - > #{$_uncolored_button}:disabled + #{$_uncolored_button}:not(:hover) { box-shadow: none; } - } - - // special case for path-bars and stack-switchers - .linked:not(.vertical):not(.path-bar).stack-switcher, - .linked:not(.vertical).path-bar { - - > button { - @include button(header-hover); - - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:disabled { color: transparentize($header_fg, 0.4); } - - &, &:hover, &:active, &:checked, &:disabled { @extend %linked; } - } - } - - // special case widgets like the linked entry and button in mintinstall toolbar - .linked:not(.vertical) entry { - box-shadow: none; - - &:focus { - @include entry(header-normal); - background-clip: padding-box; - } - - & + button:last-child { - @include button(header-hover); - - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:disabled { - color: transparentize($header_fg, 0.4); - background-color: transparentize($header_button_bg, 0.2); - border-color: $header_button_border; - - &:checked { - background-color: transparentize($selected_bg_color, 0.35); - color: transparentize($selected_fg_color, 0.25); - } - } - - &, &:hover, &:active, &:checked, &:disabled { @extend %linked; } - } - } - - // Headerbar Suggested and Destructive Action buttons - @each $b_type, $b_color in (suggested-action, $suggested_color), - (destructive-action, $destructive_color) { - button.#{$b_type} { - @include button(suggested_destructive, $b_color); - - &.flat { - @include button(undecorated); - color: $b_color; - outline-color: transparentize($b_color, 0.7); - } - &:hover { - @include button(suggested_destructive, lighten($b_color, 10%)); - } - &:active, &:checked { - @include button(suggested_destructive, darken($b_color, 10%)); - } - &.flat:disabled, - &:disabled { @include button(header-insensitive); } - } - button.#{$b_type}:backdrop, - button.#{$b_type}:backdrop { - opacity: 0.8; - } - } - - // Headerbar Spinbuttons - & spinbutton { - - &:focus button { - color: $selected_fg_color; - - &:hover { background-color: transparentize($selected_fg_color, 0.9); border-color: transparent; } - &:disabled { color: transparentize($selected_fg_color, 0.6); } - } - button { - color: $header_fg; - - &:hover { background-color: transparentize($header_fg, 0.75); border-color: transparent; } - &:disabled { color: transparentize($header_fg, 0.3); } - &:active { background-color: rgba(0,0,0,0.1); } - } - } - - // Headerbar ComboBoxes - combobox { - &:disabled { color: transparentize($header_fg, 0.6); } - - > .linked > button.combo { - @include entry(header-normal); - - &:hover { @include entry(header-focus); box-shadow: none; } - &:disabled { @include entry(header-insensitive); } - } - - > .linked > entry.combo { - &:dir(ltr) { - border-right-style: none; - - &:focus { box-shadow: none; } - @if $variant=='light' { &:focus { box-shadow: 1px 0 $selected_bg_color; } } - } - &:dir(rtl) { - border-left-style: none; - - &:focus { box-shadow: none; } - @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } } - } - } - > .linked > button.combo { - &:dir(ltr) { - &, &:hover, &:active, &:checked, &:disabled { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - } - &:dir(rtl) { - &, &:hover, &:active, &:checked, &:disabled { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - } - } - } - - // Headerbar Switches - switch { - &:backdrop { opacity: 0.75; } - } - - progressbar { - trough { background-color: if($variant=='light', opacify($header_button_border, 0.05), $header_button_border); } - - &:backdrop { opacity: 0.75; } - } - - // Headerbar Scale - scale { - $_trough_bg: if($variant=='light', opacify($header_button_border, 0.05), $header_button_border); - - &:backdrop { opacity: 0.75; } - - slider { - $_slider_border: if($variant=='light', opacify($header_button_border, 0.2), opacify($header_button_border, 0.3)); - $_slider_bg: if($variant=='light', opacify($header_button_bg,1), lighten(opacify($header_bg,1), 10%)); - - background-color: $_slider_bg; - border-color: $_slider_border; - - &:hover { - background-color: lighten($_slider_bg, 5%); - border-color: $_slider_border; - } - &:active { - background-color: $selected_bg_color; - border-color: $selected_bg_color; - } - &:disabled { - background-color: mix($_slider_bg, $header_bg, 70%); - border-color: $_slider_border; - } - } - trough { - background-color: $_trough_bg; - - &:disabled { background-color: if($variant=='light', transparentize($_trough_bg, 0.05), transparentize($_trough_bg, 0.1)); } - } - } -} - -// -// Pathbars -// -.path-bar button { - &.text-button, &.image-button, & { - padding-left: 6px; - padding-right: 6px; - } - - &.text-button.image-button label { padding-left: 0; padding-right: 0; } - - &.text-button.image-button, & { - label:last-child { padding-right: 10px; } - label:first-child { padding-left: 10px; } - } - - &.slider-button, - &:not(.image-button):not(.text-button) { - padding-left: 1px; - padding-right: 1px; - } - - image { - padding-left: 4px; - padding-right: 4px; - } -} - -// -// Tree Views -// -treeview.view { - @at-root * { - -GtkTreeView-horizontal-separator: 4; - -GtkTreeView-grid-line-width: 1; - -GtkTreeView-grid-line-pattern: ''; - -GtkTreeView-tree-line-width: 1; - -GtkTreeView-tree-line-pattern: ''; - -GtkTreeView-expander-size: 16; - } - - border-left-color: transparentize($fg_color, 0.85); // this is actually the tree lines color, - border-top-color: transparentize(black, 0.9); // while this is the grid lines color, better then nothing - - rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props - - acceleditor > label { background-color: $selected_bg_color; } - - &:selected { - &, &:focus { - border-radius: 0; - border-left-color: mix($selected_fg_color, $selected_bg_color, 50%); - border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly - - @extend %selected_items; - } - } - - &:disabled { - color: $insensitive_fg_color; - - &:selected { - color: mix($selected_fg_color, $selected_bg_color, 40%); - } - } - - &.separator { - min-height: 2px; - color: transparentize(black, 0.9); - } - - &:drop(active) { - border-style: solid none; - border-width: 1px; - border-color: mix($fg_color, $selected_bg_color, 50%); - - &.after { border-top-style: none; } - &.before { border-bottom-style: none; } - } - - &.expander { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - - color: mix($fg_color, $base_color, 50%); - - &:hover { color: $fg_color; } - - &:selected { - color: mix($selected_fg_color, $selected_bg_color, 70%); - &:hover { color: $selected_fg_color; } - } - - &:checked { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - } - } - - &.progressbar, &.progressbar:focus { // progress bar in treeviews - color: $selected_fg_color; - border-radius: 2px; - background-color: $selected_bg_color; - - &:selected, &:selected:focus { - color: $selected_bg_color; - box-shadow: none; - background-color: $selected_fg_color; - } - } - &.trough { // progress bar trough in treeviews - color: $fg_color; - background-color: $trough_color_treeview; - border-radius: 2px; - border: 1px solid $button_border; - - &:selected, &:selected:focus { - color: $selected_fg_color; - background-color: transparentize(black, 0.8); - border-radius: 2px; - border-width: 0; - } - } - - header { - button { - $_column_header_color: mix($fg_color,$base_color,80%); - - padding: 3px 6px; - font-weight: bold; - - color: $_column_header_color; - background-color: darken($bg_color, 1%); - background-image: none; - border-style: none solid solid none; - border-radius: 0; - border-color: $borders_color; - - &:active, &:hover { background-color: lighten($bg_color, 2%); } - &:active:hover { color: $fg_color; } - &:disabled { - border-color: $bg_color; - background-image: none; - } - &:last-child { - border-right-style: none; - } - } - } - - button.dnd, - header.button.dnd { - &, &:selected, &:hover, &:active { - transition: none; - color: $selected_bg_color; - box-shadow: inset 1px 1px 0 1px $selected_bg_color, - inset -1px 0 0 1px $selected_bg_color, - inset 1px 1px $base_color, inset -1px 0 $base_color; - } - } -} - -// -// Menus -// -menubar, -.menubar { - -GtkWidget-window-dragging: true; - padding: 0px; - background-color: opacify($header_bg, 1); - color: $header_fg; - - &:backdrop { - color: transparentize($header_fg, 0.3); - //background-color: opacify($header_bg_backdrop, 1); - } - - > menuitem { - padding: 6px 8px; - border: solid transparent; - border-width: 0; - - &:hover { //Seems like it :hover even with keyboard focus - background-color: $menu_selected_bg_color; - color: $fg_color; - } - &:disabled { - color: transparentize($header_fg, 0.6); - border-color: transparent; - } - - > label:disabled { color: transparentize($header_fg, 0.45); } - } -} - -menu, -.menu { - $_menu_bg: if($variant=='light', $base_color, $bg_color); - margin: 4px; - padding: 0; - border-radius: 0; - background-color: $_menu_bg; - border: 1px solid $borders_color; - - .csd & { - padding: 4px 0px; - border-radius: 2px; - border: none; - } - - separator, - .csd & separator { - margin: 2px 0; - background-color: $separator_color; - } - - // Firefox workaround - .separator:not(label), - .csd & .separator:not(label) { color: $_menu_bg; } - // Firefox workaround end - - menuitem { - min-height: 16px; - min-width: 40px; - padding: 5px; - - &:hover { - color: $fg_color; - background-color: $menu_selected_bg_color; - } - &:disabled { - color: $insensitive_fg_color; - } - - //submenu indicators - arrow { - min-height: 16px; - min-width: 16px; - - &:dir(ltr) { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - margin-left: 10px; - } - &:dir(rtl) { - -gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); - margin-right: 10px; - } - } - @at-root menuitem { - accelerator { color: gtkalpha(currentColor,0.55); } - - check, radio { - min-height: 16px; - min-width: 16px; - &:dir(ltr) { margin-right: 6px; margin-left: 2px; } - &:dir(rtl) { margin-left: 6px; margin-right: 2px; } - } - } - } - - // overflow buttons - > arrow { - @include button(undecorated); - min-width: 16px; - min-height: 16px; - padding: 4px; - background-color: $_menu_bg; - border-radius: 0; - - &.top { - margin-top: -6px; - border-bottom: 1px solid mix($fg_color, $base_color, 10%); - -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); - } - &.bottom { - margin-bottom: -6px; - border-top: 1px solid mix($fg_color, $base_color, 10%); - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - } - &:hover { background-color: mix($fg_color, $base_color, 10%); } - &:disabled { - color: transparent; - background-color: transparent; - border-color: transparent ; - } - } -} - -.csd .popup { border-radius: 2px; } - -// -// Popovers -// -popover, -popover.background { - $_popover_bg: if($variant=='light', $base_color, $bg_color); - padding: 2px; - // border: 1px solid darken($borders_color, 5%); - border-radius: 3px; - background-clip: border-box; - background-color: $_popover_bg; - - box-shadow: 0 2px 6px 1px if($variant=='light', transparentize(black, 0.93), transparentize(black, 0.65)); - - .csd &, & { border: 1px solid darken($borders_color, 5%); } - - & separator { background-color: $_popover_bg; } - label.separator { - @extend .dim-label; - - color: $fg_color; - } - - > list, - > .view, - > toolbar { - border-style: none; - background-color: transparent; - } - - &, .csd & { - &.osd, &.magnifier { @extend %osd; } - &.touch-selection { @extend .context-menu } - - &.osd { @extend %osd; } - } -} - -//touch selection handlebars for the Popover.osd above -cursor-handle { - background-color: transparent; - background-image: none; - box-shadow: none; - border-style: none; - &.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); } - &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); } -} - -// -// Notebooks and Tabs -// -notebook { - padding: 0; - - &.frame { - border: 1px solid $borders_color; - - > header { - // ugly hack to hide the borders around the header - margin: -1px; - &.top { margin-bottom: 0; } - &.bottom { margin-top: 0; } - &.left { margin-right: 0; } - &.right { margin-left: 0; } - - &.top, &.bottom { padding-left: 0; padding-right: 0; } - &.left, &.right { padding-top: 0; padding-bottom: 0; } - } - } - - > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks - background-color: $base_color; - } - - > header { - padding: 2px; - background-color: $bg_color; - - &.top { box-shadow: inset 0 -1px $borders_color; } - &.bottom { box-shadow: inset 0 1px $borders_color; } - &.right { box-shadow: inset 1px 0 $borders_color; } - &.left { box-shadow: inset -1px 0 $borders_color; } - - @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) { - // sizing and borders - &.#{$_pos} { - padding-#{$_bpos}: 0; - - > tabs > tab { - padding: 2px 10px; - min-width: 20px; - min-height: 20px; - - outline-offset: -4px; - - border: 1px solid transparent; - border-#{$_bpos}: none; - - // tab overlap - + tab { - @if $_pos==top or $_pos==bottom { margin-left: -1px; } - @else { margin-top: -1px; } - } - - // tab border radius - @if $_pos==top { border-radius: 1px 1px 0 0; } - @else if $_pos==bottom { border-radius: 0 0 1px 1px; } - @else if $_pos==left { border-radius: 1px 0 0 1px; } - @else if $_pos==right { border-radius: 0 1px 1px 0; } - } - } - } - // overflow arrows - &.top, &.bottom { - > tabs > arrow.up { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - &:last-child { margin-left: 2px; } - } - > tabs > arrow.down { - -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); - &:first-child { margin-right: 2px; } - } - } - &.left, &.right { - > tabs > arrow.up { - -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); - &:last-child { margin-top: 2px; } - } - > tabs > arrow.down { - -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); - &:first-child { margin-bottom: 2px; } - } - } - > tabs > arrow { - color: $insensitive_fg_color; - - &:hover { color: mix($fg_color, $insensitive_fg_color, 50%); } - &:active { color: $fg_color; } - &:disabled { color: transparentize($insensitive_fg_color,0.3); } - } - - // tab colors - - &.top > tabs > tab:hover:not(:checked) { box-shadow: inset 0 -1px $borders_color; } - &.bottom > tabs > tab:hover:not(:checked) { box-shadow: inset 0 1px $borders_color; } - &.left > tabs > tab:hover:not(:checked) { box-shadow: inset -1px 0 $borders_color; } - &.right > tabs > tab:hover:not(:checked) { box-shadow: inset 1px 0 $borders_color; } - - > tabs > tab { - color: $insensitive_fg_color; - background-color: transparentize($base_color, 1); - - &:hover:not(:checked) { - color: mix($fg_color, $insensitive_fg_color, 50%); - background-color: transparentize($base_color, 0.5); - border-color: $borders_color; - } - &:checked { - color: $fg_color; - background-color: $base_color; - border-color: $borders_color; - } - // close button - button.flat { - min-height: 22px; - min-width: 16px; - padding: 0; - color: mix($bg_color, $fg_color, 35%); - - &:hover { - @extend %undecorated_button; - color: lighten(red, 15%); - } - &:active, &:active:hover { - @extend %undecorated_button; - color: $selected_bg_color; - } - } - } - - /* button in headers */ - button.flat { padding: 2px; } - } -} - -// -// Scrollbars -// -$_scrollbar_bg_color: darken($base_color, 1%); - -scrollbar { - @at-root * { - -GtkScrollbar-has-backward-stepper: false; - -GtkScrollbar-has-forward-stepper: false; - } - - $_slider_min_length: 40px; - - background-color: $_scrollbar_bg_color; - transition: 300ms $ease-out-quad; - - &.top { border-bottom: 1px solid $borders_color; } - &.bottom { border-top: 1px solid $borders_color; } - &.left { border-right: 1px solid $borders_color; } - &.right { border-left: 1px solid $borders_color; } - - button { border: none; } - - // slider - slider { - min-width: 6px; - min-height: 6px; - margin: -1px; - border: 4px solid transparent; - border-radius: 8px; - background-clip: padding-box; - background-color: mix($fg_color, $bg_color, 40%); - - &:hover { background-color: mix($fg_color, $bg_color, 30%); } - &:hover:active { background-color: $selected_bg_color; } - &:disabled { background-color: transparent; } - } - - &.fine-tune { - slider { - min-width: 4px; - min-height: 4px; - } - - &.horizontal slider { border-width: 5px 4px; } - &.vertical slider { border-width: 4px 5px; } - } - - &.overlay-indicator { - &:not(.dragging):not(.hovering) { // Overlay scrolling indicator - opacity: 0.4; - border-color: transparent; - background-color: transparent; - - slider { - margin: 0; - min-width: 4px; - min-height: 4px; - background-color: mix($fg_color, $bg_color, 70%); - border: 1px solid if($variant == 'light', transparentize(white, 0.4), transparentize(black, 0.7)); - // background-clip: padding-box; - } - - // w/o the following margin tweaks the slider shrinks when hovering/dragging - &.vertical slider { - margin: 2px 0; - min-height: $_slider_min_length; - } - - &.horizontal slider { - margin: 0 2px; - min-width: $_slider_min_length; - } - - } - - &.dragging, - &.hovering { opacity: 0.99; } - } - - &.horizontal slider { min-width: $_slider_min_length; } - &.vertical slider { min-height: $_slider_min_length; } -} - -// -// Switches -// -switch { - font-size: 1px; - min-width: 52px; - min-height: 24px; - background-size: 52px 24px; - background-repeat: no-repeat; - background-position: center center; - - slider { - min-width: 1px; - min-height: 1px; - } - - &, slider { - outline-color: transparent; - color: transparent; - border: none; - box-shadow: none; - } -} - -@each $k,$l in ('',''), - (':checked','-active'), - (':disabled','-insensitive'), - (':checked:disabled','-active-insensitive') { - - // load switch troughs from .png files in assets directory - - switch#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$asset_suffix}@2.png")); - } - - menuitem:hover switch#{$k}, - row:selected switch#{$k}, - infobar switch#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-selected.png"),url("assets/switch#{$l}-selected@2.png")); - } - - headerbar switch#{$k}, - .primary-toolbar switch#{$k}, - .primary-toolbar toolbar switch#{$k} { - background-image: -gtk-scaled(url("assets/switch#{$l}-header#{$asset_suffix}.png"),url("assets/switch#{$l}-header#{$asset_suffix}@2.png")); - } -} - -// -// Check and Radio items * -// -@each $w,$a in ('check', 'checkbox'), - ('radio','radio') { - - //standard checks and radios - @each $s,$as in ('','-unchecked'), - (':disabled','-unchecked-insensitive'), - (':indeterminate', '-mixed'), - (':indeterminate:disabled', '-mixed-insensitive'), - (':checked', '-checked'), - (':checked:disabled','-checked-insensitive') { - .#{$w}#{$s}, - #{$w}#{$s}, - treeview.#{$w}#{$s} { - -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"), - url("assets/#{$a}#{$as}#{$asset_suffix}@2.png")); - } - - .osd, - %osd_check_radio { - #{$w}#{$s} { - -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-dark.png"), - url("assets/#{$a}#{$as}-dark@2.png")); - } - } - // the borders of checks and radios are - // too similar in luminosity to the selected background color, hence - // we need special casing. - .view #{$w}#{$s}:selected, - treeview.#{$w}#{$s}:selected, - row:selected #{$w}#{$s}, - infobar #{$w}#{$s} { - -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-selected.png"), - url("assets/#{$a}#{$as}-selected@2.png")); - } - } -} - -// Selectionmode -@each $s,$as in ('','-selectionmode'), - (':checked', '-checked-selectionmode') { - .view.content-view.check#{$s}:not(.list) { - -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}#{$asset_suffix}.png"), - url("assets/checkbox#{$as}#{$asset_suffix}@2.png")); - background-color: transparent; - } -} - -checkbutton, radiobutton { - // this is for a nice focus on check and radios text - &.text-button { - padding: 2px 0; - outline-offset: 0; - } - - label:not(:only-child) { - &:first-child { margin-left: 4px; } - &:last-child { margin-right: 4px; } - } -} - -check, -radio { - min-width: 16px; - min-height: 16px; - margin: 0 2px; - - &:only-child, - menu menuitem & { margin: 0; } -} - -// -// GtkScale -// -scale { - $_marks_length: 3px; - $_marks_distance: 1px; - - min-height: 15px; - min-width: 15px; - padding: 3px; - - &.horizontal { - trough { padding: 0 4px; } - highlight, fill { margin: 0 -4px; } - } - - &.vertical { - trough { padding: 4px 0; } - highlight, fill { margin: -4px 0; } - } - - // The slider is inside the trough, negative margin to make it bigger - slider { - min-height: 15px; - min-width: 15px; - margin: -6px; - } - - // Click-and-hold the slider to activate - &.fine-tune { - // Make the trough grow in fine-tune mode - slider { margin: -4px; } - - fill, - highlight, - trough { - border-radius: 5px; - -gtk-outline-radius: 7px; - } - } - - slider { - $_slider_border: if($variant=='light', transparentize(darken($button_border,25%), 0.5), darken($button_border,2%)); - - background-clip: border-box; - background-color: $button_bg; - border: 1px solid $_slider_border; - border-radius: 50%; - box-shadow: none; - - &:disabled { - background-color: mix($entry_bg, $bg_color, 55%); - border-color: transparentize($_slider_border, 0.2); - } - &:active { - background-color: $selected_bg_color; - border-color: $selected_bg_color; - } - //OSD sliders - .osd & { - background-color: $osd_bg_color; - border-color: $selected_bg_color; - - &:hover { background-color: $selected_bg_color; } - &:active { - background-color: darken($selected_bg_color, 10%); - border-color: darken($selected_bg_color, 10%); - } - } - //selected list-row and infobar sliders - menuitem:hover &, - row:selected &, - infobar & { - background-color: $selected_fg_color; - border-color: $selected_fg_color; - - &:hover { - background-color: mix($selected_fg_color, $selected_bg_color, 85%); - border-color: mix($selected_fg_color, $selected_bg_color, 85%); - } - &:active { - background-color: mix($selected_fg_color, $selected_bg_color, 50%); - border-color: mix($selected_fg_color, $selected_bg_color, 50%); - } - &:disabled { - background-color: mix($selected_fg_color, $selected_bg_color, 55%); - border-color: mix($selected_fg_color, $selected_bg_color, 55%); - } - } - } - - trough { - $_scale_trough_bg: if($variant == 'light', $button_border, darken($bg_color, 5%)); - - outline-offset: 2px; - -gtk-outline-radius: 4.5px; - - border-radius: 2.5px; - background-color: $_scale_trough_bg; - - &:disabled { - background-color: transparentize($_scale_trough_bg, 0.45); - } - - //OSD troughs - .osd & { - background-color: lighten($osd_bg_color, 7%); - outline-color: transparentize($osd_fg_color, 0.8); - highlight { - background-color: $selected_bg_color; - } - - &:disabled { } - } - // troughs in selected list-rows and infobars - menuitem:hover & - row:selected &, - infobar & { - background-color: transparentize(black, 0.8); - - highlight { - background-color: $selected_fg_color; - - &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, 55%); } - } - - &:disabled { background-color: transparentize(black, 0.9); } - } - } - - // The colored part of the trough - highlight { - border-radius: 2.5px; - background-color: $selected_bg_color; - - &:disabled { - background-color: transparentize($selected_bg_color, 0.45); - } - } - - // this is another differently styled part of the trough, the most relevant use case is for example - // in media player to indicate how much video stream as been cached - fill { - border-radius: 2.5px; - background-color: transparentize($selected_bg_color, 0.5); - - &:disabled { background-color: transparent; } - } - - value { color: gtkalpha(currentColor, 0.4); } - - marks { - color: gtkalpha(currentColor, 0.4); - - @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), - (bottom, bottom, top), - (top, left, right), - (bottom, right, left) { - &.#{$marks_class} { - margin-#{$marks_margin}: $_marks_distance; - margin-#{$marks_pos}: -($_marks_distance + $_marks_length); - } - } - } - - &.fine-tune marks { - @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), - (bottom, bottom, top), - (top, left, right), - (bottom, right, left) { - &.#{$marks_class} { - margin-#{$marks_margin}: ($_marks_distance - 1px); - margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 2px); - } - } - } - &.horizontal { - indicator { - min-height: $_marks_length; - min-width: 1px; - } - - &.fine-tune indicator { min-height: ($_marks_length - 1px); } - } - &.vertical { - indicator { - min-height: 1px; - min-width: $_marks_length; - } - - &.fine-tune indicator { min-width: ($_marks_length - 1px); } - } -} - -// -// Progress bars -// -progressbar { - padding: 0; - font-size: smaller; - color: transparentize($fg_color, 0.3); - - &.osd { - min-width: 3px; - min-height: 3px; - background-color: transparent; - - trough { - border-style: none; - background-color: transparent; - box-shadow: none; - } - } - - // Moving bit - progress { - background-color: $selected_bg_color; - border-radius: 0px; - box-shadow: none; //needed for clipping - - row:selected &, - infobar & { background-color: $selected_fg_color; } - } - - // Trough - trough { - border: 1px solid $button_border; - border-radius: 2px; - background-color: $trough_color; - - row:selected &, - infobar & { background-color: transparentize(black, 0.8); } - } -} - -// Needed by the Mate osd when Marco with compositing is enabled -.osd { - .progressbar { background-color: $selected_bg_color; } - .trough { background-color: lighten($osd_bg_color, 75%); } -} - -// -// Level Bar -// -levelbar { - block { - min-width: 32px; - min-height: 1px; - } - &.vertical block { - min-width: 1px; - min-height: 32px; - } - - trough { - border: none; - padding: 3px; - border-radius: 3px; - background-color: if($variant == 'light', $button_border, darken($bg_color, 5%)); - } - - &.horizontal.discrete block { margin: 0 1px; } - &.vertical.discrete block { margin: 1px 0; } - - block:not(.empty) { - border: 1px solid $selected_bg_color; - background-color: $selected_bg_color; - border-radius: 2px; - } - block.low { - border-color: $warning_color; - background-color: $warning_color; - } - block.high { - border-color: $selected_bg_color; - background-color: $selected_bg_color; - } - block.full { - border-color: $success_color; - background-color: $success_color; - } - block.empty { - background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); - border-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); - } -} - -frame > border, -.frame { - margin: 0; - padding: 0; - border-radius: 0; - border: 1px solid $borders_color; -} - -frame.flat > border, -frame > border.flat, -.frame.flat { - border-style: none; -} - -scrolledwindow { - viewport.frame { // avoid double borders when viewport inside scrolled window - border-style: none; - } - - // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. - // This draws a box on top of the content, the size changes programmatically. - overshoot { - &.top { @include overshoot(top); } - &.bottom { @include overshoot(bottom); } - &.left { @include overshoot(left); } - &.right { @include overshoot(right); } - } - - // Overflow indication, works similarly to the overshoot, the size if fixed tho. - undershoot { - &.top { @include undershoot(top); } - &.bottom { @include undershoot(bottom); } - &.left { @include undershoot(left); } - &.right { @include undershoot(right); } - } - - junction { // the small square between two scrollbars - border-color: transparent; - // the border image is used to add the missing dot between the borders, details, details, details... - border-image: linear-gradient(to bottom, $borders_color 1px, transparent 1px) 0 0 0 1 / 0 1px stretch; - background-color: $_scrollbar_bg_color; - - &:dir(rtl) { border-image-slice: 0 1 0 0; } - } -} - -//vbox and hbox separators -separator { - background-color: transparentize(black, 0.9); - min-width: 1px; - min-height: 1px; -} - -// -// Lists -// -list { - background-color: $base_color; - border-color: $borders_color; - - row { padding: 2px; } -} - -row { - &:not(:hover) { transition: all 150ms $ease-out-quad; } - - &:selected { - @extend %selected_items; - - button { @extend %selected_button; } - } - - &.activatable { - &.has-open-popup, - &:hover { background-color: if($variant == 'light', transparentize(black, 0.97), transparentize(white, 0.95)); } - - &:active { color: $fg_color; } - &:disabled { - color: $insensitive_fg_color; - image { color: inherit; } - } - - &:selected { - &:active { color: $selected_fg_color; } - - &.has-open-popup, - &:hover { background-color: mix(black, $selected_bg_color, 10%); } - } - } -} - -// -// App Notifications -// -.app-notification { - padding: 10px; - color: $osd_fg_color; - background-color: $osd_bg_color; - background-clip: border-box; - border-radius: 0 0 2px 2px; - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: darken($osd_bg_color, 10%); - - border { border: none; } - - button { - @include button(osd); - &.flat { - @extend %undecorated_button; - border-color: transparentize($selected_bg_color, 1); - &:disabled { @extend %undecorated_button; } - } - &:hover { @include button(osd-hover); } - &:active, &:checked { @include button(osd-active); background-clip: padding-box; } - &:disabled { @include button(osd-insensitive); - } - } -} - -// -// Expanders -// -expander { - arrow { - min-width: 16px; - min-height: 16px; - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - - &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } - &:hover { color: lighten($fg_color,30%); } //only lightens the arrow - &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } - } -} - -// -// Calendar -// -calendar { - color: $fg_color; - border: 1px solid $borders_color; - border-radius: 3px; - padding: 2px; - - &:selected { - background-color: $selected_bg_color; - color: $selected_fg_color; - border-radius: 1.5px; - } - &.header { - color: $fg_color; - border: none; - border-radius: 0; - } - &.button, &.button:focus { - color: transparentize($fg_color,0.55); - @include button(undecorated); - - &:hover { - color: $fg_color; - } - &:disabled { - color: $insensitive_fg_color; - background-color: transparent; - background-image: none; - } - } - &:indeterminate { color: gtkalpha(currentColor,0.55); } - &.highlight { - color: $fg_color; - } -} - -// -// Dialogs -// -.dialog-action-area .button.text-button { - padding: 6px 16px; -} - -.message-dialog .dialog-action-area .button { - padding: 8px; -} - -.message-dialog { // Message Dialog styling - -GtkDialog-button-spacing: 0; - - .titlebar { background-color: $header_bg; border-bottom: 1px solid darken($header_bg, 7%) } - - &.csd { // rounded bottom border styling for csd version - &.background { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - border: none; - } - .dialog-action-area .button { - padding: 8px; - border-radius: 0; - - @extend %middle_button; - - &:hover, &:active, &:disabled { - @extend %middle_button; - } - - &:first-child{ @extend %first_button; } - &:last-child { @extend %last_button; } - } - %middle_button { - border-right-style: none; - border-bottom-style: none; - } - %last_button { - border-bottom-right-radius: 3px; - } - %first_button { - border-left-style: none; - border-bottom-left-radius: 3px; - } - } -} - -// -// FileChooser -// -filechooser { - #pathbarbox { - background-color: $filechooser_bg; - border-bottom: 1px solid $borders_color; - } - - .search-bar { background-color: $filechooser_bg; } - - actionbar { background-color: $bg_color; } -} - -filechooserbutton:drop(active) { - box-shadow: none; - border-color: transparent; -} - -// -// Sidebar -// -.sidebar { - border-style: none; - background-color: lighten($bg_color, 2%); - - @at-root %sidebar_left, - &:dir(ltr), - &.left, - &.left:dir(rtl) { - border-right: 1px solid $borders_color; - border-left-style: none; - } - - @at-root %sidebar_right, - &:dir(rtl), - &.right { - border-left: 1px solid $borders_color; - border-right-style: none; - } - - list { background-color: $base_color; } - - paned & { &.left, &.right, &.left:dir(rtl), &:dir(rtl), &:dir(ltr), & { border-style: none; }} -} - -stacksidebar { - &.sidebar { - &:dir(ltr) list, - &.left list, - &.left:dir(rtl) list { @extend %sidebar_left; } - - &:dir(rtl) list, - &.right list { @extend %sidebar_right; } - } - - row { - padding: 10px 4px; - - > label { - padding-left: 6px; - padding-right: 6px; - } - &.needs-attention { - background-image: radial-gradient(circle closest-side at 5% 25%, $destructive_color 0%, $destructive_color 100%, transparent 100%); - background-size: 70px; - background-position: 4px; - background-repeat: no-repeat; - } - &.activatable:selected.needs-attention { - background-image: radial-gradient(circle closest-side at 5% 25%, $selected_fg_color 0%, $selected_fg_color 100%, transparent 100%); - background-size: 70px; - background-position: 4px; - background-repeat: no-repeat; - } - } -} - -placessidebar { - > viewport.frame { border-style: none; } - - row { - // Needs overriding of the GtkListBoxRow padding - min-height: 30px; - padding: 0px; - // Using margins/padding directly in the SidebarRow - // will make the animation of the new bookmark row jump - > revealer { - padding: 0 10px; - } - image.sidebar-icon { - &:dir(ltr) { padding-right: 8px; } - &:dir(rtl) { padding-left: 8px; } - } - label.sidebar-label { - &:dir(ltr) { padding-right: 2px; } - &:dir(rtl) { padding-left: 2px; } - } - @at-root button.sidebar-button { - min-width: 22px; - min-height: 22px; - margin-top: 2px; - margin-bottom: 2px; - padding: 0; - @extend %button_basic_flat; - border-radius: 100%; - -gtk-outline-radius: 100%; - - &:not(:hover):not(:active) > image { opacity: 0.5 }; - } - - &.sidebar-placeholder-row { - padding: 0 8px; - min-height: 2px; - background-image: _solid($drop_target_color); - background-clip: content-box; - } - - &.sidebar-new-bookmark-row { color: $selected_bg_color; } - - &:drop(active):not(:disabled) { - &, label, image { color: $drop_target_color; } - - box-shadow: inset 0 1px $drop_target_color, - inset 0 -1px $drop_target_color; - - &:selected { - &, label, image { color: $selected_fg_color; } - background-color: $drop_target_color; - } - } - } -} - -// -// PlacesView -// -placesview { - .server-list-button > image { - transition: 200ms $ease-out-quad; - -gtk-icon-transform: rotate(0turn); - } - - .server-list-button:checked > image { - transition: 200ms $ease-out-quad; - -gtk-icon-transform: rotate(-0.5turn); - } - - // this selects the "connect to server" label - > actionbar > revealer > box > label { - padding-left: 8px; - padding-right: 8px; - } -} - -// -// Paned -// -paned { - > separator { - min-width: 1px; - min-height: 1px; - -gtk-icon-source: none; - border-style: none; - background-color: transparent; - background-image: _solid($borders_color); - background-size: 1px 1px; - - &:selected { background-image: _solid($selected_bg_color); } - - &.wide { - min-width: 5px; - min-height: 5px; - background-color: transparent; - } - } - - &.horizontal > separator { - background-repeat: repeat-y; - margin: 0 -3px 0 -3px; - padding: 0 3px 0 3px; - background-position: center; - - &.wide { - margin: 0; - padding: 0; - background-repeat: no-repeat; - background-position: center; - background-image: -gtk-scaled(url("assets/pane-separator-vertical.png"), url("assets/pane-separator-vertical@2.png")); - background-size: 2px 24px; - } - } - - &.vertical > separator { - margin: -3px 0 -3px 0; - padding: 3px 0 3px 0; - background-repeat: repeat-x; - background-position: center; - - &.wide { - margin: 0; - padding: 0; - background-repeat: no-repeat; - background-position: center; - background-image: -gtk-scaled(url("assets/pane-separator.png"), url("assets/pane-separator@2.png")); - background-size: 24px 2px; - } - } -} - -// -// GtkInfoBar -// -infobar { - border-style: none; - - &.info, - &.question, - &.warning, - &.error { - background-color: $selected_bg_color; - color: $selected_fg_color; - caret-color: currentColor; - - button { @extend %selected_button } - - selection { - color: $selected_bg_color; - background-color: $selected_fg_color; - } - - *:link { @extend %link_selected; } - - &:disabled { - label, image { color: transparentize($selected_fg_color, 0.5); } - } - } - - &.warning { background-color: $warning_color; } - &.error { background-color: $destructive_color; } - &.question { background-color: $question_color; } -} - -// -// Buttons on selected backgrounds -// -%selected_button { - - @at-root %selected_button_normal, & { - color: $selected_fg_color; - background-color: transparentize($selected_fg_color, 1); - border-color: transparentize($selected_fg_color, 0.5); - } - - &.flat { - @include button(undecorated); - color: $selected_fg_color; - background-color: transparentize($selected_fg_color, 1); - - @at-root %selected_button_flat_disabled, - &:disabled { - &, label { color: transparentize($selected_fg_color, 0.6); } - } - } - &:hover { - color: $selected_fg_color; - background-color: transparentize($selected_fg_color, 0.8); - border-color: transparentize($selected_fg_color, 0.2); - } - @at-root %selected_button_active, - &:active, &:active:hover, &:checked { - color: $selected_bg_color; - background-color: $selected_fg_color; - border-color: $selected_fg_color; - } - &:disabled { - &, label { color: transparentize($selected_fg_color, 0.5); } - background-color: transparentize($selected_fg_color, 1); - border-color: transparentize($selected_fg_color, 0.6); - - @at-root %selected_button_disabled_checked, - &:active, &:checked { - color: $selected_bg_color; - background-color: transparentize($selected_fg_color, 0.5); - border-color: transparentize($selected_fg_color, 0.6); - } - } -} - -// -// Tooltips -// -tooltip, -.tooltip { - &.background { - // background-color needs to be set this way otherwise it gets drawn twice - // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. - background-color: $tooltip_bg_color; - background-clip: padding-box; - - label { padding: 4px; } - } - - color: $tooltip_fg_color; - border-radius: 2px; - border: 1px solid $tooltip_border_color; - - decoration { background-color: transparent; } - - * { // Yeah this is ugly - background-color: transparent; - color: $tooltip_fg_color; - } -} - -// -// Color Chooser -// - -colorswatch { - // This widget is made of two boxes one on top of the other, the lower box is GtkColorSwatch {} the other one - // is GtkColorSwatch .overlay {}, GtkColorSwatch has the programmatically set background, so most of the style - // is applied to the overlay box. - - // take care of colorswatches on selected elements - // :selected & { - // box-shadow: none; - // &.overlay, &.overlay:hover { - // border-color: $selected_fg_color; - // } - // } - - &, &:drop(active) { border-style: none; } - - // border rounding - &.top { - border-top-left-radius: 3px; - border-top-right-radius: 3px; - - overlay { - border-top-left-radius: 3px; - border-top-right-radius: 3px; - } - } - &.bottom { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - - overlay { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - } - } - &.left, &:first-child:not(.top) { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - - overlay { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - } - &.right, &:last-child:not(.bottom) { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - - overlay { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - } - } - &.dark overlay { - color: transparentize(white, 0.3); - &:hover { - border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); - } - } - &.light overlay { - color: transparentize(black, 0.3); - &:hover { - border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color); - } - } - - overlay { - border: 1px solid if($variant == 'light', transparentize(black, 0.85), $borders_color); - &:hover { background-color: transparentize(white, 0.8) } - } - - &:disabled { - opacity: 0.5; - overlay { - border-color: transparentize(black, 0.4); - box-shadow: none; - } - } - - // make the add color button looks like, well, a button - &#add-color-button { - border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi - border-width: 1px; // translucent on the colored background, here it's not necessary so they need to be set - @include button(normal); - &:hover { @include button(hover); } - overlay { @include button(undecorated); } // reset the overlay to not cover the button style underneath - } -} - -button.color { - padding: 0; - - colorswatch:first-child:last-child { - &, overlay { - margin: 4px; - border-radius: 0; - } - } -} - -// colorscale popup -colorchooser .popover.osd { border-radius: 3px; } - -// -// Misc -// -//content view (grid/list) -.content-view { - background-color: $base_color; - &:hover { -gtk-icon-effect: highlight; } - rubberband { @extend rubberband; } -} - -.scale-popup { - .osd & { @extend %osd } - - button { - &:hover { // +/- buttons on GtkVolumeButton popup - @include button(hover); - } - } -} - -// Decouple the font of context menus from their entry/textview -.touch-selection, -.context-menu { font: initial;} -.monospace { font-family: Monospace; } - -// -// Shortcuts Help -// -button.circular, -button.circular-button, -.stack-switcher > button.circular { - min-width: 24px; - min-height: 24px; - padding: 5px; - border-radius: 50%; - -gtk-outline-radius: 50%; - - label { padding: 0; } -} - -.keycap { - min-width: 16px; - min-height: 20px; - - padding: 3px 6px 4px 6px; - - color: $fg_color; - background-color: $base_color; - border: 1px solid $borders_color; - border-radius: 2.5px; - box-shadow: inset 0px -2px 0px if($variant=='light', transparentize(black, 0.95), transparentize(black, 0.85)); -} - -// -// Dnd -// -*:drop(active):focus, -*:drop(active) { - box-shadow: inset 0 0 0 1px $selected_bg_color; -} - - -// -// Window Decorations -// -decoration { - border-radius: 8px 8px 0 0; - border-width: 0px; - - $_wm_border: if($variant=='light', transparentize(black, 0.80), transparentize(black, 0.65)); - $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.7)); - - box-shadow: 0 3px 9px 1px transparentize(black, 0.5), - 0 0 0 1px $wm_border; //doing borders with box-shadow - - // this is used for the resize cursor area - margin: 10px; - - &:backdrop { - // the transparent shadow here is to enforce that the shadow extents don't - // change when we go to backdrop, to prevent jumping windows - box-shadow: 0 3px 9px 1px transparent, - 0 2px 6px 2px transparentize(black, 0.8), - 0 0 0 1px $wm_border_unfocused; - } - - .fullscreen &, - .maximized &, - .tiled &, - .tiled &:backdrop { - border-radius: 0; - box-shadow: 0 3px 9px 1px transparent, - 0 2px 6px 2px transparent, - 0 0 0 1px $wm_border_unfocused; - } - .popup & { - box-shadow: none; - border-radius: 0; - } - // server-side decorations as used by mutter - .ssd & { - border-radius: 8px 8px 0 0; - box-shadow: 0 0 0 1px if($variant == 'dark', transparentize(black, 0.35), $wm_border); - - &.maximized { border-radius: 0; } - } - .csd.popup & { - border-radius: 2px; - box-shadow: 0 1px 4px transparentize(black, 0.8), - 0 0 0 1px transparentize($wm_border, 0.1); - } - tooltip.csd & { - border-radius: 2px; - box-shadow: 0 1px 3px 1px $_wm_border; - } - message-dialog.csd & { border-radius: 3px; } - .solid-csd & { - border-radius: 0; - margin: 1px; - background-color: $header_bg; - box-shadow: none; - } -} - -// -// Titlebuttons -// -headerbar, -.titlebar { - - &.default-decoration button.titlebutton { // no vertical padding for ssd buttons - padding-top: 0px; // already handled by the titlebar-padding - padding-bottom: 0px; - min-width: 22px; - min-height: 22px; - margin: 0; - } - - button.titlebutton { - $_wm_backdrop_icon_color: if($variant == 'light', darken($wm_icon_unfocused_bg, 5%), lighten($wm_icon_unfocused_bg, 5%)); - - min-width: 18px; - min-height: 18px; - @extend .image-button; - - padding: 10px 3px; - margin: 0; - transition: none; - - @include button(undecorated); - background-color: transparentize($header_bg, 1); - - &:hover { - @include button(header-hover); - } - &:active, &:checked { - @include button(header-active); - } - - &.close, &.maximize, &.minimize { - -gtk-icon-theme: "Mint-Y"; - - background-color: transparent; - background-size: 18px 18px; - background-position: center; - background-repeat: no-repeat; - border-width: 0; - } - - &.close { - color: $selected_fg_color; - @include draw_circle($selected_bg_color); - - &:hover { @include draw-circle(lighten($selected_bg_color, 5%)); } - &:active { @include draw-circle(darken($selected_bg_color, 5%)); } - &:backdrop { @include draw-circle($_wm_backdrop_icon_color); } - } - - &.maximize, - &.minimize { - &:hover, - &:hover:backdrop { - @include draw-circle($wm_button_hover_bg); - } - &:active, - &:active:backdrop { - @include draw-circle($wm_button_active_bg); - } - &:backdrop { - color: $_wm_backdrop_icon_color; - } - } - } -} - -// catch all extend -%selected_items { - background-color: $selected_bg_color; - - @at-root %nobg_selected_items, & { - color: $selected_fg_color; - - @at-root %selected_items_disabled, - &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); } - } -} diff --git a/gtk-3.0/sass/common.scss b/gtk-3.0/sass/common.scss new file mode 100644 index 0000000..a308912 --- /dev/null +++ b/gtk-3.0/sass/common.scss @@ -0,0 +1,265 @@ + + +// +// Buttons on selected backgrounds +// +%selected_button { + @at-root %selected_button_normal, + & { + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 0.5); + } + + &.flat { + @include button(undecorated); + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + + @at-root %selected_button_flat_disabled, + &:disabled { + &, + label { + color: transparentize($selected_fg_color, 0.6); + } + } + } + &:hover { + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 0.8); + border-color: transparentize($selected_fg_color, 0.2); + } + @at-root %selected_button_active, + &:active, + &:active:hover, + &:checked { + color: $selected_bg_color; + background-color: $selected_fg_color; + border-color: $selected_fg_color; + } + &:disabled { + &, + label { + color: transparentize($selected_fg_color, 0.5); + } + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 0.6); + + @at-root %selected_button_disabled_checked, + &:active, + &:checked { + color: $selected_bg_color; + background-color: transparentize($selected_fg_color, 0.5); + border-color: transparentize($selected_fg_color, 0.6); + } + } +} + +// catch all extend +%selected_items { + background-color: $selected_bg_color; + + @at-root %nobg_selected_items, + & { + color: $selected_fg_color; + + @at-root %selected_items_disabled, + &:disabled { + color: mix($selected_fg_color, $selected_bg_color, 50%); + } + } +} + + +@import "./ui/basic.scss"; + + +@import "./ui/entry.scss"; + +@import "./ui/button.scss"; + +@import "./ui/toolbar.scss"; + +@import "./ui/treeview.scss"; + +@import "./ui/menu.scss"; + + +@import "./ui/notebook.scss"; + + +@import "./ui/scrollbar.scss"; + + +@import "./ui/switch-check.scss"; + + +@import "./ui/other.scss"; + + +@import "./ui/list.scss"; + + + + +// +// Calendar +// +calendar { + color: $fg_color; + border: 1px solid $borders_color; + border-radius: 3px; + padding: 2px; + + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + border-radius: 1.5px; + } + &.header { + color: $fg_color; + border: none; + border-radius: 0; + } + &.button, + &.button:focus { + color: transparentize($fg_color, 0.55); + @include button(undecorated); + + &:hover { + color: $fg_color; + } + &:disabled { + color: $insensitive_fg_color; + background-color: transparent; + background-image: none; + } + } + &:indeterminate { + color: gtkalpha(currentColor, 0.55); + } + &.highlight { + color: $fg_color; + } +} + + +@import "./ui/dialog.scss"; + + + +@import "./ui/sidebar.scss"; + + + +@import "./ui/color.scss"; + + +@import "./ui/misc.scss"; + + + +// +// Shortcuts Help +// +button.circular, +button.circular-button, +.stack-switcher > button.circular { + min-width: 24px; + min-height: 24px; + padding: 5px; + border-radius: 50%; + -gtk-outline-radius: 50%; + + label { + padding: 0; + } +} + +.keycap { + min-width: 16px; + min-height: 20px; + + padding: 3px 6px 4px 6px; + + color: $fg_color; + background-color: $base_color; + border: 1px solid $borders_color; + border-radius: 2.5px; + box-shadow: inset 0px -2px 0px transparentize(black, 0.85); +} + +// +// Dnd +// +*:drop(active):focus, +*:drop(active) { + box-shadow: inset 0 0 0 1px $selected_bg_color; +} + +// +// Window Decorations +// +decoration { + border-radius: 8px; + border-width: 0px; + + $_wm_border: transparentize(black, 0.65); + $_wm_border_backdrop: transparentize(black, 0.7); + + box-shadow: 0 3px 9px 1px transparentize(black, 0.5), 0 0 0 1px $wm_border; //doing borders with box-shadow + + // this is used for the resize cursor area + margin: 10px; + + &:backdrop { + // the transparent shadow here is to enforce that the shadow extents don't + // change when we go to backdrop, to prevent jumping windows + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px transparentize(black, 0.8), + 0 0 0 1px $wm_border_unfocused; + } + + .fullscreen &, + .maximized &, + .tiled &, + .tiled &:backdrop { + border-radius: 0; + box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px transparent, 0 0 0 1px $wm_border_unfocused; + } + .popup & { + box-shadow: none; + border-radius: 0; + } + // server-side decorations as used by mutter + .ssd & { + border-radius: 8px; + box-shadow: 0 0 0 1px transparentize(black, 0.35); + + &.maximized { + border-radius: 0; + } + } + .csd.popup & { + border-radius: 2px; + box-shadow: 0 1px 4px transparentize(black, 0.8), 0 0 0 1px transparentize($wm_border, 0.1); + } + tooltip.csd & { + border-radius: 2px; + box-shadow: 0 1px 3px 1px $_wm_border; + } + message-dialog.csd & { + border-radius: 3px; + } + .solid-csd & { + border-radius: 0; + margin: 1px; + background-color: $header_bg; + box-shadow: none; + } +} + +@import "./ui/headerbar.scss"; + + + + diff --git a/gtk-3.0/sass/gtk.scss b/gtk-3.0/sass/gtk.scss index cb1ffe7..6b8a499 100644 --- a/gtk-3.0/sass/gtk.scss +++ b/gtk-3.0/sass/gtk.scss @@ -1,10 +1,7 @@ -$variant: 'dark'; -$tint: 'no-tint'; - -@import 'colors'; -@import 'drawing'; -@import 'common'; -@import 'applications'; -@import 'lightdm'; -@import 'colors-public'; -@import 'libhandy'; \ No newline at end of file +@import 'var/colors.scss'; +@import 'var/drawing.scss'; +@import 'common.scss'; +@import 'ui/applications.scss'; +@import 'ui/lightdm.scss'; +@import 'ui/colors-public.scss'; +@import 'ui/libhandy.scss'; diff --git a/gtk-3.0/sass/_applications.scss b/gtk-3.0/sass/ui/applications.scss similarity index 62% rename from gtk-3.0/sass/_applications.scss rename to gtk-3.0/sass/ui/applications.scss index 22c3262..7e19148 100644 --- a/gtk-3.0/sass/_applications.scss +++ b/gtk-3.0/sass/ui/applications.scss @@ -7,28 +7,27 @@ EphyNotebook.notebook, MidoriNotebook .notebook, TerminalWindow .notebook, PantheonTerminalPantheonTerminalWindow .notebook { - - tab.reorderable-page.top, tab.top { - &:active, &.active-page, &.active-page:hover { - box-shadow: inset 0 1px $borders_color, - inset 0 -1px $borders_color, - inset 1px 0 $borders_color, - inset -1px 0 $borders_color; + tab.reorderable-page.top, + tab.top { + &:active, + &.active-page, + &.active-page:hover { + box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color, + inset 1px 0 $borders_color, inset -1px 0 $borders_color; } } } TerminalWindow .notebook, PantheonTerminalPantheonTerminalWindow .notebook { - - tab.reorderable-page.top, tab.top { + tab.reorderable-page.top, + tab.top { padding-top: 7px; border-top-width: 3px; } &.header.top { - box-shadow: inset 0 1px opacify($header_border, 1), - inset 0 -1px $borders_color; + box-shadow: inset 0 1px opacify($header_border, 1), inset 0 -1px $borders_color; } } @@ -37,7 +36,7 @@ PantheonTerminalPantheonTerminalWindow .notebook { // // needed for webkit/GtkStyle/Evolution compatibility GtkHTML { - background-color: $base_color; + background-color: $bg_color; color: $text_color; &:active { @@ -67,7 +66,7 @@ SushiFontWidget { // GNOME Terminal // vte-terminal.terminal-screen { - -TerminalScreen-background-darkness: 1.0; + -terminalscreen-background-darkness: 1; background-color: #3f3f3f; color: #fff; } @@ -89,11 +88,18 @@ TerminalWindow { background-color: $button_bg; } } - .active-page, .prelight-page { + .active-page, + .prelight-page { .button { @extend %undecorated_button; - &:hover { color: lighten(red, 15%); @extend %undecorated_button;} - &:active { color: $selected_bg_color; @extend %undecorated_button;} + &:hover { + color: lighten(red, 15%); + @extend %undecorated_button; + } + &:active { + color: $selected_bg_color; + @extend %undecorated_button; + } } } } @@ -103,7 +109,7 @@ TerminalWindow { // MATE Terminal // vte-terminal { - -TerminalScreen-background-darkness: 1.0; + -terminalscreen-background-darkness: 1; background-color: #3f3f3f; color: #fff; } @@ -120,31 +126,36 @@ vte-terminal { color: $selected_fg_color; text-shadow: 1px 1px transparentize(black, 0.4); - &:active { color: $fg_color; } - &:selected { color: $selected_fg_color; } + &:active { + color: $fg_color; + } + &:selected { + color: $selected_fg_color; + } } .nautilus-canvas-item.dim-label, .nautilus-list-dim-label { color: mix($fg_color, $bg_color, 50%); - &:selected, &:selected:focus { color: mix($selected_fg_color, $selected_bg_color, 80%); } + &:selected, + &:selected:focus { + color: mix($selected_fg_color, $selected_bg_color, 80%); + } } .nautilus-window { paned > separator { background-image: _solid($dark_sidebar_border); - - @if $variant=='light' { - &:dir(ltr) { margin-left: -1px; } - &:dir(rtl) { margin-right: -1px; } - } } } .nautilus-window, filechooser { - .csd.background, placessidebar list { background-color: transparent; } + .csd.background, + placessidebar list { + background-color: transparent; + } placessidebar.sidebar list { background-color: $dark_sidebar_bg; @@ -154,48 +165,78 @@ filechooser { color: $dark_sidebar_fg; &.has-open-popup, - &:hover { background-color: transparentize($dark_sidebar_fg, 0.85); } + &:hover { + background-color: transparentize($dark_sidebar_fg, 0.85); + } &:disabled { - &, label, image { color: transparentize($dark_sidebar_fg, 0.6); } + &, + label, + image { + color: transparentize($dark_sidebar_fg, 0.6); + } } &:selected.has-open-popup, - &:selected, &:selected:hover, &:active:hover { + &:selected, + &:selected:hover, + &:active:hover { @extend %selected_items; - .sidebar-icon { color: inherit; } + .sidebar-icon { + color: inherit; + } } &:not(:selected) button.sidebar-button { color: $dark_sidebar_fg; - &:hover { @include button(osd-hover); } - &:active { @include button(active); } + &:hover { + @include button(osd-hover); + } + &:active { + @include button(active); + } - &:not(:hover):not(:active) > image { opacity: 0.5 }; + &:not(:hover):not(:active) > image { + opacity: 0.5; + } } &.sidebar-new-bookmark-row { color: $selected_bg_color; - .sidebar-icon { color: inherit; } + .sidebar-icon { + color: inherit; + } } &:drop(active):not(:disabled) { - &, label, .sidebar-icon { color: $drop_target_color; } + &, + label, + .sidebar-icon { + color: $drop_target_color; + } &:selected { - &, label, .sidebar-icon { color: $selected_fg_color; } + &, + label, + .sidebar-icon { + color: $selected_fg_color; + } background-color: $drop_target_color; } } } - separator { background-color: transparent; } + separator { + background-color: transparent; + } } - &.maximized placessidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); } + &.maximized placessidebar.sidebar { + background-color: opacify($dark_sidebar_bg, 1); + } } filechooser placessidebar > viewport.frame { @@ -238,47 +279,67 @@ $disk_space_free: darken($bg_color, 3%); } // View -NautilusListView .view { border-bottom: 1px solid $borders_color; } +NautilusListView .view { + border-bottom: 1px solid $borders_color; +} // // Nemo // -.nemo-desktop.nemo-canvas-item { @extend %nautilus_canvas_item; } +.nemo-desktop.nemo-canvas-item { + @extend %nautilus_canvas_item; +} .nemo-window { - .nemo-window-pane widget.entry { border: 1px solid; border-radius: 3px; @include entry(focus); - &:selected { &:focus, & { @extend %selected_items; }} + &:selected { + &:focus, + & { + @extend %selected_items; + } + } } .nemo-inactive-pane .view { background-color: darken($base_color, 5%); - &:selected { &:focus, & { @extend %selected_items; }} + &:selected { + &:focus, + & { + @extend %selected_items; + } + } } .places-treeview { - -NemoPlacesTreeView-disk-full-bg-color: if($variant == 'light', #aaaaaa, $dark_sidebar_fg); - -NemoPlacesTreeView-disk-full-fg-color: darken($selected_bg_color, 10%); + -nemoplacestreeview-disk-full-bg-color: $dark_sidebar_fg; + -nemoplacestreeview-disk-full-fg-color: darken($selected_bg_color, 10%); -GtkTreeView-vertical-separator: 7; - .view.cell:hover { background-color: transparentize($dark_sidebar_fg, 0.75); } + .view.cell:hover { + background-color: transparentize($dark_sidebar_fg, 0.75); + } } - .nemo-places-sidebar.frame { border-width: 0; } + .nemo-places-sidebar.frame { + border-width: 0; + } .sidebar { color: $dark_sidebar_fg; background-color: $dark_sidebar_bg; - .frame { border: none; } + .frame { + border: none; + } - .view, row { + .view, + row { background-color: transparent; color: $dark_sidebar_fg; @@ -290,17 +351,23 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } &.expander { color: mix($dark_sidebar_fg, $dark_sidebar_bg, 50%); - &:hover { color: $dark_sidebar_fg; } + &:hover { + color: $dark_sidebar_fg; + } } } } /* This is to keep the separator next to the sidebar dark so we don't see a gap between it and the trash bar */ - grid > paned > separator { background-image: _solid($borders_color); } + grid > paned > separator { + background-image: _solid($borders_color); + } // Fix padding of the statusbar buttons - & widget .toolbar .image-button { padding: 0; } + & widget .toolbar .image-button { + padding: 0; + } } // @@ -308,23 +375,24 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // .caja-navigation-window { - /* This seems to be needed to get proper highlighting in the caja view * when split panes are used. Without it the inactive pane isn't displayed * properly */ .view .cell:selected { - &, &:focus { + &, + &:focus { background-image: _solid($selected_bg_color); @extend %selected_items; } } - .frame { border-width: 1px 0 1px 0; } + .frame { + border-width: 1px 0 1px 0; + } .caja-side-pane { - .view, textview text, notebook { @@ -332,7 +400,9 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } color: $dark_sidebar_fg; } - .frame { border-width: 1px 0 0 0; } + .frame { + border-width: 1px 0 0 0; + } .view > box, viewport.frame { @@ -345,13 +415,19 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // // Gedit // -.gedit-headerbar-paned { color: $header_border; } -.gedit-side-panel-paned > separator { background-image: _solid($dark_sidebar_border); } -.gedit-bottom-panel-paned > separator { background-image: _solid($borders_color); } +.gedit-headerbar-paned { + color: $header_border; +} +.gedit-side-panel-paned > separator { + background-image: _solid($dark_sidebar_border); +} +.gedit-bottom-panel-paned > separator { + background-image: _solid($borders_color); +} .open-document-selector-treeview.view { padding: 3px 6px 3px 6px; - border-color: $base_color; // disable borders, making them transparent doesn't work for some reason + border-color: $base_color; // disable borders, making them transparent doesn't work for some reason &:hover { background-color: transparentize(black, 0.95); @@ -368,10 +444,12 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } } .open-document-selector-path-label { - color: mix($fg_color, $base_color, 50%); - font-size: smaller; + color: mix($fg_color, $base_color, 50%); + font-size: smaller; - &:selected { color: transparentize($selected_fg_color, 0.1); } + &:selected { + color: transparentize($selected_fg_color, 0.1); + } } .gedit-document-panel { @@ -388,9 +466,12 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } color: $selected_fg_color; background-color: $selected_bg_color; - button { color: $selected_fg_color; } + button { + color: $selected_fg_color; + } } - &:selected, &:selected:hover { + &:selected, + &:selected:hover { color: $selected_fg_color; background-color: $selected_bg_color; } @@ -408,14 +489,20 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } box-shadow: none; padding: 4px; - image { color: inherit; } + image { + color: inherit; + } } row:hover:not(:selected) button { color: mix($bg_color, $fg_color, 35%); - &:hover { color: lighten(red, 15%); } - &:active { color: $fg_color; } + &:hover { + color: lighten(red, 15%); + } + &:active { + color: $fg_color; + } } row:hover:selected button:hover { @@ -424,7 +511,9 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } border: none; box-shadow: none; - &:active { color: $selected_fg_color; } + &:active { + color: $selected_fg_color; + } } } @@ -452,11 +541,14 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } .gedit-map-frame { border { - @if $variant=='light' { border-color: transparentize(black, 0.7); } border-width: 0; - &:dir(ltr) { border-left-width: 1px; } - &:dir(rtl) { border-right-width: 1px; } + &:dir(ltr) { + border-left-width: 1px; + } + &:dir(rtl) { + border-right-width: 1px; + } } } @@ -473,9 +565,13 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // Pluma // -.pluma-window statusbar frame > border { border: none; } +.pluma-window statusbar frame > border { + border: none; +} -.pluma-window notebook > stack scrolledwindow { border-width: 0 0 1px 0; } +.pluma-window notebook > stack scrolledwindow { + border-width: 0 0 1px 0; +} #pluma-status-combo-button { min-height: 0; @@ -489,7 +585,9 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // // Gnome Builder // -.gb-search-entry-occurrences-tag { background: none; } +.gb-search-entry-occurrences-tag { + background: none; +} workbench.csd > stack.titlebar:not(headerbar) { padding: 0; @@ -500,11 +598,15 @@ workbench.csd > stack.titlebar:not(headerbar) { headerbar { &, &:first-child, - &:last-child { border-radius: 3px 3px 0 0; } + &:last-child { + border-radius: 3px 3px 0 0; + } } } -editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: $selected_bg_color; } +editortweak .linked > entry.search:focus + .gb-linked-scroller { + border-top-color: $selected_bg_color; +} layouttab { background-color: $base_color; @@ -512,7 +614,7 @@ layouttab { layout { border: 1px solid $borders_color; - -PnlDockBin-handle-size: 1; + -pnldockbin-handle-size: 1; } eggsearchbar box.search-bar { @@ -524,7 +626,9 @@ pillbox { background-color: $selected_bg_color; border-radius: 3px; - &:disabled label { color: transparentize($selected_fg_color, 0.5) } + &:disabled label { + color: transparentize($selected_fg_color, 0.5); + } } docktabstrip { @@ -538,8 +642,15 @@ docktabstrip { border: solid transparent; border-width: 0 1px; - label { opacity: 0.5; } - &:checked, &:hover { label { opacity: 1; }} + label { + opacity: 0.5; + } + &:checked, + &:hover { + label { + opacity: 1; + } + } &:checked { border-color: $borders_color; @@ -550,7 +661,7 @@ docktabstrip { dockbin { border: 1px solid $borders_color; - -PnlDockBin-handle-size: 1; + -pnldockbin-handle-size: 1; } dockpaned { @@ -572,13 +683,19 @@ dockoverlayedge { } popover.messagepopover { - &.background { padding: 0; } + &.background { + padding: 0; + } - .popover-content-area { margin: 16px; } + .popover-content-area { + margin: 16px; + } .popover-action-area { margin: 8px; - button:not(:first-child):not(:last-child) { margin: 0 4px; } + button:not(:first-child):not(:last-child) { + margin: 0 4px; + } } } @@ -586,8 +703,13 @@ popover.popover-selector { padding: 0; list { - row { padding: 5px 0; } - row image { margin-left: 3px; margin-right: 10px; } + row { + padding: 5px 0; + } + row image { + margin-left: 3px; + margin-right: 10px; + } } } @@ -599,65 +721,95 @@ entry.search.preferences-search { } preferences stacksidebar.sidebar { - list { background-image: _solid($base_color); } + list { + background-image: _solid($base_color); + } - list separator { background-color: transparent; } + list separator { + background-color: transparent; + } } devhelppanel entry:focus, symboltreepanel entry:focus { - border-color: $borders_color + border-color: $borders_color; } button.run-arrow-button { min-width: 12px; } -omnibar.linked > entry:not(:only-child) { border-style: solid; border-radius: 3px; margin-left: 1px; margin-right: 1px; } +omnibar.linked > entry:not(:only-child) { + border-style: solid; + border-radius: 3px; + margin-left: 1px; + margin-right: 1px; +} gstyleslidein { #scale_box, #strings_controls, #palette_controls, #components_controls { - button.toggle:checked { color: $fg_color; } + button.toggle:checked { + color: $fg_color; + } } } configurationview { - entry.flat { background: none; } - list { border-width: 0; } + entry.flat { + background: none; + } + list { + border-width: 0; + } } // // Epiphany / Xreader // -EphyWindow .floating-bar { // Epiphany overrides the floating-bar style, so reset it +EphyWindow .floating-bar { + // Epiphany overrides the floating-bar style, so reset it color: $fg_color; } .xreader-window .primary-toolbar .button.the-button-in-the-combobox { - @include button(header-hover); + @include button(header-hover); - &:hover { background-color: lighten($header_button_bg, 15%); } - &:disabled { color: transparentize($header_fg, 0.4); } + &:hover { + background-color: lighten($header_button_bg, 15%); + } + &:disabled { + color: transparentize($header_fg, 0.4); + } } // // Gnome Calendar // calendar-view event { - &.color-light label { color: black; } - &.color-light.timed label { color: $fg_color; } + &.color-light label { + color: black; + } + &.color-light.timed label { + color: $fg_color; + } - &.color-dark label { color: white; } - &.color-dark.timed label { color: $fg_color; } + &.color-dark label { + color: white; + } + &.color-dark.timed label { + color: $fg_color; + } } // // Gnome Documents // -.documents-scrolledwin.frame { border-width: 0; } +.documents-scrolledwin.frame { + border-width: 0; +} button.documents-load-more { border-width: 1px 0 0; @@ -701,18 +853,22 @@ button.documents-load-more { // // Gnome Photos // -.photos-entry-tag { @extend .documents-entry-tag; } +.photos-entry-tag { + @extend .documents-entry-tag; +} -.photos-collection-icon { @extend .documents-collection-icon; } +.photos-collection-icon { + @extend .documents-collection-icon; +} .photos-fade-in { - opacity: 1.0; - transition: opacity 0.2s ease-out; + opacity: 1; + transition: opacity 0.2s ease-out; } .photos-fade-out { - opacity: 0.0; - transition: opacity 0.2s ease-out; + opacity: 0; + transition: opacity 0.2s ease-out; } // @@ -726,7 +882,7 @@ button.documents-load-more { .content-view.document-page { border-style: solid; border-width: 3px 3px 6px 4px; - border-image: url("assets/thumbnail-frame.png") 3 3 6 4; + border-image: url('assets/thumbnail-frame.png') 3 3 6 4; } // @@ -740,7 +896,9 @@ TotemGrilo.vertical GdMainView.frame { // Synapse // SynapseGuiSelectionContainer *:selected, -SynapseGuiViewVirgilio *:selected { background-color: $selected_bg_color; } +SynapseGuiViewVirgilio *:selected { + background-color: $selected_bg_color; +} // // Transmission @@ -758,21 +916,31 @@ SynapseGuiViewVirgilio *:selected { background-color: $selected_bg_color; } color: $panel_fg; background-color: $panel_bg; - &, menubar { background-color: $panel_bg; } + &, + menubar { + background-color: $panel_bg; + } menubar, #PanelApplet label, - #PanelApplet image { color: $panel_fg; } + #PanelApplet image { + color: $panel_fg; + } menu > menuitem { color: $fg_color; } - button:not(#tasklist-button) { @extend %panelbutton; } + button:not(#tasklist-button) { + @extend %panelbutton; + } button, #tasklist-button { - label, image { color: inherit; } + label, + image { + color: inherit; + } } #tasklist-button { @@ -782,45 +950,55 @@ SynapseGuiViewVirgilio *:selected { background-color: $selected_bg_color; } padding-bottom: 0; padding-top: 0; - &:hover { background-color: transparentize(white, 0.95); } + &:hover { + background-color: transparentize(white, 0.95); + } &:checked, &:active { background-color: $selected_bg_color; - label { color: white; } + label { + color: white; + } } } PanelSeparator { - color: rgba(255,255,255, 0); + color: rgba(255, 255, 255, 0); padding-top: 4px; padding-bottom: 4px; } na-tray-applet { - -NaTrayApplet-icon-padding: 1px; + -natrayapplet-icon-padding: 1px; } } MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { - background-image: none; - background-color: transparent; - background-repeat: no-repeat; - background-position: left; + background-image: none; + background-color: transparent; + background-repeat: no-repeat; + background-position: left; } -.mintmenu:hover { background-color: lighten($panel_bg, 5%); } +.mintmenu:hover { + background-color: lighten($panel_bg, 5%); +} .mintmenu:selected { color: $selected_fg_color; background-color: $selected_bg_color; } .wnck-pager { - background-color: transparentize(black, 0.96); + background-color: transparentize(black, 0.96); - &:selected { background-color: transparentize($selected_bg_color, 0.4); } - &:hover { background-color: transparentize($selected_bg_color, 0.8); } + &:selected { + background-color: transparentize($selected_bg_color, 0.4); + } + &:hover { + background-color: transparentize($selected_bg_color, 0.8); + } } // Xfce Panel @@ -832,8 +1010,12 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { @extend %panelbutton; } - frame > border { border: 0; } - label { font-weight: normal; } + frame > border { + border: 0; + } + label { + font-weight: normal; + } } %panelbutton { @@ -847,13 +1029,17 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-color: lighten($panel_bg, 10%); } - &:active, &:checked { + &:active, + &:checked { color: $selected_fg_color; border: none; background-color: $selected_bg_color; } - label, image { color: inherit; } + label, + image { + color: inherit; + } } // @@ -863,10 +1049,18 @@ MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-color: $selected_bg_color; color: $selected_fg_color; - &.top { border-radius: 0 0 2px 2px; } - &.right { border-radius: 2px 0 0 2px; } - &.bottom { border-radius: 2px 2px 0 0; } - &.left { border-radius: 0 2px 2px 0; } + &.top { + border-radius: 0 0 2px 2px; + } + &.right { + border-radius: 2px 0 0 2px; + } + &.bottom { + border-radius: 2px 2px 0 0; + } + &.left { + border-radius: 0 2px 2px 0; + } .button { background-color: transparent; @@ -889,16 +1083,24 @@ BirdieWidgetsTweetList * { // Marlin / Pantheon Files // MarlinViewWindow { - - *:selected, *:selected:focus { + *:selected, + *:selected:focus { color: $selected_fg_color; background-color: $selected_bg_color; outline-color: transparent; } GtkIconView.view:selected { - &, &:focus, &:hover, &:focus:hover { background-color: transparent; } + &, + &:focus, + &:hover, + &:focus:hover { + background-color: transparent; + } + } + FMListView, + FMColumnView { + outline-color: transparent; } - FMListView, FMColumnView { outline-color: transparent; } } .marlin-pathbar.pathbar { @@ -908,11 +1110,16 @@ MarlinViewWindow { @include entry(header-normal); - &:focus { @include entry(header-focus) } + &:focus { + @include entry(header-focus); + } - &:disabled { @include entry(header-insensitive) } + &:disabled { + @include entry(header-insensitive); + } - &:active, &:checked { + &:active, + &:checked { color: $selected_bg_color; } } @@ -921,12 +1128,13 @@ MarlinViewWindow { // Gala // .gala-notification { - border: 1px solid rgba(0, 0, 0, 0.35); - border-radius: 3px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - background-color: white; + border: 1px solid rgba(0, 0, 0, 0.35); + border-radius: 3px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); + background-color: white; - .title, .label { + .title, + .label { color: #5c616c; } } @@ -935,7 +1143,7 @@ MarlinViewWindow { // Pantheon Terminal // PantheonTerminalPantheonTerminalWindow.background { - background-color: transparent; + background-color: transparent; } // @@ -951,7 +1159,7 @@ SwitchboardCategoryView .view:selected:focus { // .cs-header { padding: 6px; - background-color: if($variant == 'light', darken($bg_color, 2%), darken($bg_color, 1%)); + background-color: darken($bg_color, 1%); border-bottom: 1px solid $borders_color; } @@ -959,13 +1167,18 @@ SwitchboardCategoryView .view:selected:focus { // Xed // .xed-window { - .xed-panel { - &.side notebook tab.top { padding: 8px 12px; } - &.bottom notebook.frame { border: none; } + &.side notebook tab.top { + padding: 8px 12px; + } + &.bottom notebook.frame { + border: none; + } } - .small-button { padding: 2px 4px; } + .small-button { + padding: 2px 4px; + } .xed-searchbar { border: 0px solid $borders_color; @@ -973,12 +1186,20 @@ SwitchboardCategoryView .view:selected:focus { } statusbar { - & widget border { border-color: transparent; } + & widget border { + border-color: transparent; + } // remove some extra padding - button, widget frame, widget frame border { padding: 0; } + button, + widget frame, + widget frame border { + padding: 0; + } } - .xed-goto-line-box { @extend %search_slider } + .xed-goto-line-box { + @extend %search_slider; + } } // @@ -993,9 +1214,16 @@ EvWindow .content-view .view:focus:selected { %dark_sidebar_button { @include button(osd); - &:hover { @include button(osd-hover); } - &:active, &:checked { @include button(osd-active); } - &:disabled { @include button(osd-insensitive); } + &:hover { + @include button(osd-hover); + } + &:active, + &:checked { + @include button(osd-active); + } + &:disabled { + @include button(osd-insensitive); + } } // @@ -1006,7 +1234,8 @@ EvWindow .content-view .view:focus:selected { background-color: $dark_sidebar_bg; color: $dark_sidebar_fg; - &:selected, &:active { + &:selected, + &:active { background: $selected_bg_color; color: $selected_fg_color; } @@ -1015,11 +1244,4 @@ EvWindow .content-view .view:focus:selected { toolbar.horizontal button image { -gtk-icon-transform: scale(0.9); } - - @if $variant=='light' { - toolbar { - color: $header_fg; - background-color: $header_bg; - } - } } diff --git a/gtk-3.0/sass/ui/basic.scss b/gtk-3.0/sass/ui/basic.scss new file mode 100644 index 0000000..d73f2f9 --- /dev/null +++ b/gtk-3.0/sass/ui/basic.scss @@ -0,0 +1,216 @@ +@function gtkalpha($c, $a) { + @return unquote('alpha(#{$c},#{$a})'); +} + +$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); + +* { + background-clip: padding-box; + -GtkToolButton-icon-spacing: 4; + -GtkTextView-error-underline-color: $error_color; + + -GtkScrolledWindow-scrollbar-spacing: 0; + + -GtkToolItemGroup-expander-size: 11; + + -GtkWidget-text-handle-width: 20; + -GtkWidget-text-handle-height: 20; + + -GtkDialog-button-spacing: 4; + -GtkDialog-action-area-border: 6; + + // We use the outline properties to signal the focus properties + outline-color: transparentize($fg_color, .7); + outline-style: dashed; + outline-offset: -3px; + outline-width: 1px; + -gtk-outline-radius: 2px; +} + +// +// Base States +// +.background { + color: $fg_color; + background-color: $bg_color; +} + +*:disabled { + -gtk-icon-effect: dim; +} + +.gtkstyle-fallback { + background-color: $bg_color; + color: $fg_color; + &:hover { + background-color: lighten($bg_color, 10%); + color: $fg_color; + } + &:active { + background-color: darken($bg_color, 10%); + color: $fg_color; + } + &:disabled { + background-color: $insensitive_bg_color; + color: $insensitive_fg_color; + } + &:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } +} + +.view, +%view { + color: $text_color; + background-color: $bg_color; + + &:selected { + &, + &:focus { + @extend %selected_items; + border-radius: 2px; + } + } +} + +.view, +textview { + text { + @extend %view; + + selection { + &:focus, + & { + @extend %selected_items; + } + } + } +} + +textview border { + background-color: mix($bg_color, $base_color, 50%); +} + +iconview { + @extend .view; +} + +rubberband, +.rubberband { + border: 1px solid darken($selected_bg_color, 10%); + // background-color: transparentize(darken($selected_bg_color, 10%), 0.8); + background-colo:#f30; +} + +flowbox { + rubberband { + @extend rubberband; + } + + flowboxchild { + padding: 3px; + border-radius: 2px; + + &:selected { + @extend %selected_items; + + outline-offset: -2px; + } + } +} + +label { + &.separator { + @extend .dim-label; + + color: $fg_color; + } + + row:selected &, + &:selected { + @extend %nobg_selected_items; + } + + selection { + color: $selected_fg_color; + background-color: $selected_bg_color; + } + + &:disabled { + color: $insensitive_fg_color; + + selection { + @extend %selected_items_disabled; + } + } +} + +.dim-label { + color: $dim_label_fg_color; +} + +assistant { + .sidebar { + background-color: $base_color; + border-top: 1px solid $borders_color; + &:dir(ltr) { + border-right: 1px solid $borders_color; + } + &:dir(rtl) { + border-left: 1px solid $borders_color; + } + } + + &.csd .sidebar { + border-top-style: none; + } + + .sidebar label { + padding: 6px 12px; + } + + .sidebar label.highlight { + background-color: $selected_bg_color; + color: $selected_fg_color; + } +} + +textview { + // This will get overridden by .view, needed by gedit line numbers and the mintupdate package description + background-color: mix($bg_color, $base_color, 50%); + color: $text_color; +} + +%osd, +.osd { + color: $osd_fg_color; + border: none; + background-color: $osd_bg_color; + background-clip: padding-box; + box-shadow: none; +} + +// +// Spinner Animations +// +@keyframes spin { + to { + -gtk-icon-transform: rotate(1turn); + } +} + +spinner { + background-image: none; + opacity: 0; // non spinning spinner makes no sense + -gtk-icon-source: -gtk-icontheme('process-working-symbolic'); + + &:checked { + opacity: 1; + animation: spin 1s linear infinite; + + &:disabled { + opacity: 0.5; + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/button.scss b/gtk-3.0/sass/ui/button.scss new file mode 100644 index 0000000..be63a44 --- /dev/null +++ b/gtk-3.0/sass/ui/button.scss @@ -0,0 +1,647 @@ +// +// Buttons +// +// stuff for .needs-attention +$_dot_color: $selected_bg_color; + +@keyframes needs_attention { + from { + background-image: -gtk-gradient( + radial, + center center, + 0, + center center, + 0.01, + to($_dot_color), + to(transparent) + ); + } + to { + background-image: -gtk-gradient( + radial, + center center, + 0, + center center, + 0.5, + to($selected_bg_color), + to(transparent) + ); + } +} + +$button_transition: all 200ms $ease-out-quad; + +button { + min-height: 22px; + min-width: 20px; + transition: $button_transition; + border: 1px solid; + border-radius: 3px; + padding: 5px 8px; + + @include button(normal); + + separator { + margin: 4px 1px; + } + + @at-root %button_basic_flat, + &.flat { + @include button(undecorated); + // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set + // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but + // it won't fade out when the pointer leave the button allocation area. To make the transition more evident + // in this case the duration is increased. + transition: none; + + &:hover { + transition: $button_transition; + transition-duration: 350ms; + + &:active { + transition: $button_transition; + } + } + } + + &:hover { + @include button(hover); + -gtk-icon-effect: highlight; + } + + &:active, + &:checked { + @include button(active); + + background-clip: padding-box; + transition-duration: 50ms; + + &:not(:disabled) label:disabled { + color: inherit; + opacity: 0.6; + } + } + + @at-root %button_basic_flat, + &.flat:disabled { + @include button(undecorated); + } + + &:disabled { + @include button(insensitive); + + &:active, + &:checked { + @include button(insensitive-active); + } + } + + &.image-button { + min-width: 24px; + padding-left: 5px; + padding-right: 5px; + } + + &.text-button { + padding-left: 12px; + padding-right: 12px; + } + + &.text-button.image-button { + padding-left: 5px; + padding-right: 5px; + + label { + &:first-child { + padding-left: 8px; + padding-right: 2px; + } + &:last-child { + padding-right: 8px; + padding-left: 2px; + } + &:only-child { + padding-left: 8px; + padding-right: 8px; + } + } + + &.popup { + padding-right: 8px; + padding-left: 8px; + } + } + + @at-root %button_basic_drop_active, + &:drop(active) { + color: $drop_target_color; + border-color: $drop_target_color; + box-shadow: none; + } + + // big standalone buttons like in Documents pager + &.osd { + color: $osd_fg_color; + outline-color: transparentize($osd_fg_color, 0.7); + background-color: $osd_bg_color; + border-color: darken($osd_bg_color, 8%); + + &.image-button { + padding: 0; + min-height: 36px; + min-width: 36px; + } + + &:hover { + color: $selected_bg_color; + } + &:active, + &:checked { + @include button(osd-active); + } + &:disabled { + @include button(osd-insensitive); + } + } + + //overlay / OSD style + .osd & { + @include button(osd); + + &:hover { + @include button(osd-hover); + } + &:active, + &:checked { + background-clip: padding-box; + @include button(osd-active); + } + &:disabled { + @include button(osd-insensitive); + } + + &.flat { + @include button(undecorated); + box-shadow: none; + &:hover { + @include button(osd-hover); + } + &:disabled { + @include button(osd-insensitive); + background-image: none; + } + &:active, + &:checked { + @include button(osd-active); + } + } + } + .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active):not(:only-child), + .osd + .linked:not(.vertical):not(.path-bar) + > &:hover:not(:checked):not(:active) + + &:not(:checked):not(:active) { + box-shadow: none; + } + + // Suggested and Destructive Action buttons + @each $b_type, $b_color in (suggested-action, $suggested_color), + (destructive-action, $destructive_color) + { + &.#{$b_type} { + @include button(suggested_destructive, $b_color); + + &.flat { + @include button(undecorated); + color: $b_color; + outline-color: transparentize($b_color, 0.7); + } + &:hover { + @include button(suggested_destructive, lighten($b_color, 10%)); + } + &:active, + &:checked { + @include button(suggested_destructive, darken($b_color, 10%)); + } + &.flat:disabled { + @include button(undecorated); + color: $insensitive_fg_color; + } + &:disabled { + @include button(insensitive); + } + } + } + + .stack-switcher > & { + // to position the needs attention dot, padding is added to the button + // child, a label needs just lateral padding while an icon needs vertical + // padding added too. + + outline-offset: -3px; // needs to be set or it gets overridden by GtkRadioButton outline-offset + + > label { + padding-left: 6px; // label padding + padding-right: 6px; // + } + > image { + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; + padding-bottom: 3px; + } + &.text-button { + padding-left: 10px; + padding-right: 10px; + } + &.image-button { + padding-left: 2px; + padding-right: 2px; + } + + &.needs-attention { + > label, + > image { + @extend %needs_attention; + } + + &:active, + &:checked { + > label, + > image { + animation: none; + background-image: none; + } + } + } + } + + %needs_attention { + animation: needs_attention 150ms ease-in; + background-image: -gtk-gradient( + radial, + center center, + 0, + center center, + 0.5, + to($_dot_color), + to(transparent) + ); + background-size: 6px 6px, 6px 6px; + background-repeat: no-repeat; + + background-position: right 3px, right 2px; + + &:dir(rtl) { + background-position: left 3px, left 2px; + } + } + + // hide separators + &.font, + &.file { + separator { + background-color: transparent; + } + } + + //inline-toolbar buttons + .inline-toolbar &, + .inline-toolbar &:backdrop { + border-radius: 2px; + border-width: 1px; + @extend %linked; + } + + .linked:not(.vertical) > &, + .linked:not(.vertical) > &:hover, + .linked:not(.vertical) > &:active, + .linked:not(.vertical) > &:checked { + @extend %linked; + } + + .linked.vertical > &, + .linked.vertical > &:hover, + .linked.vertical > &:active, + .linked.vertical > &:checked { + @extend %linked_vertical; + } +} + + + + + + +// all the following is for the +|- buttons on inline toolbars, that way +// should really be deprecated... +.inline-toolbar toolbutton > button { + // redefining the button look is + // needed since those are flat... + @include button(normal); + &:hover { + @include button(hover); + } + &:active, + &:checked { + @include button(active); + } + &:disabled { + @include button(insensitive); + } + &:disabled:active, + &:disabled:checked { + @include button(insensitive-active); + } +} + +// More inline toolbar buttons +toolbar.inline-toolbar toolbutton { + & > button.flat { + @extend %linked_middle; + } + &:first-child > button.flat { + @extend %linked_left; + } + &:last-child > button.flat { + @extend %linked_right; + } + &:only-child > button.flat { + @extend %linked_only_child; + } +} + +%linked_middle { + border-radius: 0; + border-right-style: none; +} + +%linked_left { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +%linked_right { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + border-top-left-radius: 0; + border-bottom-left-radius: 0; + border-right-style: solid; +} + +%linked_only_child { + border-radius: 3px; + border-style: solid; +} + +%linked { + @extend %linked_middle; + + &:first-child { + @extend %linked_left; + } + &:last-child { + @extend %linked_right; + } + &:only-child { + @extend %linked_only_child; + } +} + +%linked_vertical_middle { + border-radius: 0; + border-bottom-style: none; +} + +%linked_vertical_top { + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} + +%linked_vertical_bottom { + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border-bottom-style: solid; +} + +%linked_vertical_only_child { + border-radius: 3px; + border-style: solid; +} + +%linked_vertical { + @extend %linked_vertical_middle; + + &:first-child { + @extend %linked_vertical_top; + } + &:last-child { + @extend %linked_vertical_bottom; + } + &:only-child { + @extend %linked_vertical_only_child; + } +} + +%undecorated_button { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +// menu buttons +menuitem.button.flat, +modelbutton.flat { + transition: none; + min-height: 24px; + padding-left: 8px; + padding-right: 8px; + outline-offset: -3px; + border-radius: 2px; + + @extend %undecorated_button; + + &:hover { + background-color: $menu_selected_bg_color; + } + &:active, + &:selected { + &, + arrow { + background-color: $menu_selected_bg_color; + } + } + &:checked { + color: $fg_color; + } + + // FIXME: temporary workaround + check:last-child, + radio:last-child { + margin-left: 8px; + } + + check:first-child, + radio:first-child { + margin-right: 8px; + } +} + +modelbutton.flat arrow { + &.left { + -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); + } + &.right { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + } +} + +// +// Links +// +%link, +*:link { + color: $link_color; + + &:visited { + color: $link_visited_color; + *:selected & { + color: mix($selected_fg_color, $selected_bg_color, 60%); + } + } + &:hover { + color: lighten($link_color, 10%); + *:selected & { + color: mix($selected_fg_color, $selected_bg_color, 90%); + } + } + &:active { + color: $link_color; + *:selected & { + color: mix($selected_fg_color, $selected_bg_color, 80%); + } + } + + @at-root %link_selected, + &:selected, + *:selected & { + color: mix($selected_fg_color, $selected_bg_color, 80%); + } +} + +button:link, +button:visited { + @extend %undecorated_button; + @extend %link; + + &:hover, + &:active, + &:checked { + @extend %undecorated_button; + } + > label { + text-decoration-line: underline; + } +} + +// +// Spinbuttons +// +spinbutton { + &:drop(active) { + box-shadow: none; + } + + // button:active { color: $selected_fg_color; } + &:disabled { + color: $insensitive_fg_color; + } + + &:not(.vertical) { + entry { + min-width: 28px; + } + + button, + entry { + @extend %linked; + } + + &:dir(ltr) entry, + &:dir(rtl) button.up { + border-radius: 3px 0 0 3px; + } + + > button + button { + border-left-style: none; + } + + > button + button, + > button:hover:not(:active), + > button:hover + button { + box-shadow: inset 1px 0 $button_border; + } + + > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), + > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { + box-shadow: inset 1px 0 transparentize($button_border, 0.5); + } + + > button:first-child:hover:not(:active), + > button.up:dir(rtl):hover:not(:active), + > entry + button:not(:active):hover { + box-shadow: none; + } + + > entry:focus + button { + border-left-color: $entry_border; + } + + > entry:drop(active) + button { + border-left-color: $drop_target_color; + } + + .osd & { + > button:hover:not(:active), + > button:hover + button { + box-shadow: inset 1px 0 $osd_button_border; + } + + > button:first-child:hover:not(:active), + > button.up:dir(rtl):hover:not(:active), + > entry + button:not(:active):hover { + box-shadow: none; + } + + > entry:focus + button { + border-left-color: $osd_button_border; + } + } + } + + &.vertical { + button, + entry { + padding-left: 4px; + padding-right: 4px; + min-width: 0; + + @extend %linked_vertical; + } + + button.up { + border-radius: 3px 3px 0 0; + } + + > entry:focus + button { + border-top-color: $entry_border; + } + + > entry:drop(active) + button { + border-top-color: $drop_target_color; + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/color.scss b/gtk-3.0/sass/ui/color.scss new file mode 100644 index 0000000..d827f10 --- /dev/null +++ b/gtk-3.0/sass/ui/color.scss @@ -0,0 +1,122 @@ + + + +// +// Color Chooser +// + +colorswatch { + // This widget is made of two boxes one on top of the other, the lower box is GtkColorSwatch {} the other one + // is GtkColorSwatch .overlay {}, GtkColorSwatch has the programmatically set background, so most of the style + // is applied to the overlay box. + + // take care of colorswatches on selected elements + // :selected & { + // box-shadow: none; + // &.overlay, &.overlay:hover { + // border-color: $selected_fg_color; + // } + // } + + &, + &:drop(active) { + border-style: none; + } + + // border rounding + &.top { + border-top-left-radius: 3px; + border-top-right-radius: 3px; + + overlay { + border-top-left-radius: 3px; + border-top-right-radius: 3px; + } + } + &.bottom { + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + + overlay { + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + } + } + &.left, + &:first-child:not(.top) { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + + overlay { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + } + } + &.right, + &:last-child:not(.bottom) { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + + overlay { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + } + } + &.dark overlay { + color: transparentize(white, 0.3); + &:hover { + border-color: $borders_color; + } + } + &.light overlay { + color: transparentize(black, 0.3); + &:hover { + border-color: $borders_color; + } + } + + overlay { + border: 1px solid $borders_color; + &:hover { + background-color: transparentize(white, 0.8); + } + } + + &:disabled { + opacity: 0.5; + overlay { + border-color: transparentize(black, 0.4); + box-shadow: none; + } + } + + // make the add color button looks like, well, a button + &#add-color-button { + border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi + border-width: 1px; // translucent on the colored background, here it's not necessary so they need to be set + @include button(normal); + &:hover { + @include button(hover); + } + overlay { + @include button(undecorated); + } // reset the overlay to not cover the button style underneath + } +} + +button.color { + padding: 0; + + colorswatch:first-child:last-child { + &, + overlay { + margin: 4px; + border-radius: 0; + } + } +} + +// colorscale popup +colorchooser .popover.osd { + border-radius: 3px; +} \ No newline at end of file diff --git a/gtk-3.0/sass/_colors-public.scss b/gtk-3.0/sass/ui/colors-public.scss similarity index 100% rename from gtk-3.0/sass/_colors-public.scss rename to gtk-3.0/sass/ui/colors-public.scss diff --git a/gtk-3.0/sass/ui/dialog.scss b/gtk-3.0/sass/ui/dialog.scss new file mode 100644 index 0000000..4eb858c --- /dev/null +++ b/gtk-3.0/sass/ui/dialog.scss @@ -0,0 +1,173 @@ +// +// Dialogs +// +.dialog-action-area .button.text-button { + padding: 6px 16px; +} + +.message-dialog .dialog-action-area .button { + padding: 8px; +} + +.message-dialog { + // Message Dialog styling + -GtkDialog-button-spacing: 0; + + .titlebar { + background-color: $header_bg; + border-bottom: 1px solid darken($header_bg, 7%); + } + + &.csd { + // rounded bottom border styling for csd version + &.background { + border-bottom-left-radius: 3px; + border-bottom-right-radius: 3px; + border: none; + } + .dialog-action-area .button { + padding: 8px; + border-radius: 0; + + @extend %middle_button; + + &:hover, + &:active, + &:disabled { + @extend %middle_button; + } + + &:first-child { + @extend %first_button; + } + &:last-child { + @extend %last_button; + } + } + %middle_button { + border-right-style: none; + border-bottom-style: none; + } + %last_button { + border-bottom-right-radius: 3px; + } + %first_button { + border-left-style: none; + border-bottom-left-radius: 3px; + } + } +} + + +// +// FileChooser +// +filechooser { + #pathbarbox { + background-color: $filechooser_bg; + border-bottom: 1px solid $borders_color; + } + + .search-bar { + background-color: $filechooser_bg; + } + + actionbar { + background-color: $bg_color; + } +} + +filechooserbutton:drop(active) { + box-shadow: none; + border-color: transparent; +} + + + + + + +// +// GtkInfoBar +// +infobar { + border-style: none; + + &.info, + &.question, + &.warning, + &.error { + background-color: $selected_bg_color; + color: $selected_fg_color; + caret-color: currentColor; + + button { + @extend %selected_button; + } + + selection { + color: $selected_bg_color; + background-color: $selected_fg_color; + } + + *:link { + @extend %link_selected; + } + + &:disabled { + label, + image { + color: transparentize($selected_fg_color, 0.5); + } + } + } + + &.warning { + background-color: $warning_color; + } + &.error { + background-color: $destructive_color; + } + &.question { + background-color: $question_color; + } +} + + + + + + + + + +// +// Tooltips +// +tooltip, +.tooltip { + &.background { + // background-color needs to be set this way otherwise it gets drawn twice + // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details. + background-color: $tooltip_bg_color; + background-clip: padding-box; + + label { + padding: 4px; + } + } + + color: $tooltip_fg_color; + border-radius: 2px; + border: 1px solid $tooltip_border_color; + + decoration { + background-color: transparent; + } + + * { + // Yeah this is ugly + background-color: transparent; + color: $tooltip_fg_color; + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/entry.scss b/gtk-3.0/sass/ui/entry.scss new file mode 100644 index 0000000..ab23568 --- /dev/null +++ b/gtk-3.0/sass/ui/entry.scss @@ -0,0 +1,146 @@ +$vert_padding: 5px; +// +// Text Entries +// +entry { + border: 1px solid; + padding: 5px 8px; + + caret-color: currentColor; + border-radius: 3px; + transition: all 200ms $ease-out-quad; + + &.search { + border-radius: 4px; + } + + @include entry(normal); + + image { + // icons inside the entry + color: mix($fg_color, $base_color, 80%); + + &.left { + padding-left: 0; + padding-right: 5px; + } + &.right { + padding-right: 0; + padding-left: 5px; + } + } + + &.flat { + &, + &:focus { + padding: 2px; + @include entry(normal); + border: none; + border-radius: 0; + } + } + + &:focus { + background-clip: border-box; + @include entry(focus); + } + + &:disabled { + @include entry(insensitive); + } + + selection { + &:focus, + & { + @extend %selected_items; + } + } + + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), + (error, $error_color, $error_fg_color), + // entry.search-missing for Gnome-Builder + (search-missing, $error_color, $error_fg_color) + { + &.#{$e_type} { + color: $e_fg_color; + border-color: $entry_border; + background-color: mix($e_color, $base_color, 60%); + + image { + color: $e_fg_color; + } + + &:focus { + color: $e_fg_color; + background-color: $e_color; + box-shadow: none; + } + selection, + selection:focus { + background-color: $e_fg_color; + color: $e_color; + } + } + } + + &:drop(active) { + &:focus, + & { + border-color: $drop_target_color; + box-shadow: none; + } + } + + .osd & { + @include entry(osd); + &:focus { + @include entry(osd-focus); + } + &:disabled { + @include entry(osd-insensitive); + } + + selection { + &:focus, + & { + color: $selected_bg_color; + background-color: $selected_fg_color; + } + } + } + + progress { + margin: 0 -6px; + border-radius: 0; + border-width: 0 0 2px; + border-color: $selected_bg_color; + border-style: solid; + background-image: none; + background-color: transparent; + box-shadow: none; + } + + // linkded entries + .linked:not(.vertical) > &, + .linked:not(.vertical) > &:focus { + @extend %linked; + } + + .linked.vertical > &, + .linked.vertical > &:focus { + @extend %linked_vertical; + } +} + +treeview entry { + &.flat, + & { + border-radius: 0; + background-image: none; + background-color: $base_color; + + &:focus { + border-color: $selected_bg_color; + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/headerbar.scss b/gtk-3.0/sass/ui/headerbar.scss new file mode 100644 index 0000000..aba16e2 --- /dev/null +++ b/gtk-3.0/sass/ui/headerbar.scss @@ -0,0 +1,79 @@ +// +// Titlebuttons +// +headerbar, +.titlebar { + &.default-decoration button.titlebutton { + // no vertical padding for ssd buttons + padding-top: 0px; // already handled by the titlebar-padding + padding-bottom: 0px; + min-width: 22px; + min-height: 22px; + margin: 0; + } + + button.titlebutton { + $_wm_backdrop_icon_color: lighten($wm_icon_unfocused_bg, 5%); + + min-width: 18px; + min-height: 18px; + @extend .image-button; + + padding: 10px 3px; + margin: 0; + transition: none; + + @include button(undecorated); + background-color: transparentize($header_bg, 1); + + &:hover { + @include button(header-hover); + } + &:active, + &:checked { + @include button(header-active); + } + + &.close, + &.maximize, + &.minimize { + -gtk-icon-theme: 'Mint-Y'; + + background-color: transparent; + background-size: 18px 18px; + background-position: center; + background-repeat: no-repeat; + border-width: 0; + } + + &.close { + color: $selected_fg_color; + @include draw_circle($selected_bg_color); + + &:hover { + @include draw-circle(lighten($selected_bg_color, 5%)); + } + &:active { + @include draw-circle(darken($selected_bg_color, 5%)); + } + &:backdrop { + @include draw-circle($_wm_backdrop_icon_color); + } + } + + &.maximize, + &.minimize { + &:hover, + &:hover:backdrop { + @include draw-circle($wm_button_hover_bg); + } + &:active, + &:active:backdrop { + @include draw-circle($wm_button_active_bg); + } + &:backdrop { + color: $_wm_backdrop_icon_color; + } + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/_libhandy.scss b/gtk-3.0/sass/ui/libhandy.scss similarity index 81% rename from gtk-3.0/sass/_libhandy.scss rename to gtk-3.0/sass/ui/libhandy.scss index 9120074..f556047 100644 --- a/gtk-3.0/sass/_libhandy.scss +++ b/gtk-3.0/sass/ui/libhandy.scss @@ -12,19 +12,31 @@ popover.combo { padding: 0 10px; min-height: 50px; - &:first-child { @extend %linked_vertical_top; } - &:last-child { @extend %linked_vertical_bottom; } + &:first-child { + @extend %linked_vertical_top; + } + &:last-child { + @extend %linked_vertical_bottom; + } } } - overshoot.top { @extend %linked_vertical_top; } - overshoot.bottom { @extend %linked_vertical_bottom; } + overshoot.top { + @extend %linked_vertical_top; + } + overshoot.bottom { + @extend %linked_vertical_bottom; + } scrollbar.vertical { //background-color: $_popover_bg; - &:dir(ltr) { @extend %linked_right; } - &:dir(rtl) { @extend %linked_left; } + &:dir(ltr) { + @extend %linked_right; + } + &:dir(rtl) { + @extend %linked_left; + } } } @@ -62,7 +74,8 @@ keypad { // HdyViewSwitcher viewswitcher { - &, & button { + &, + & button { margin: 0; padding: 0; } @@ -77,7 +90,8 @@ viewswitcher { border-color: transparent; } - &:checked, &:active { + &:checked, + &:active { border-color: $selected_bg_color; } @@ -112,7 +126,15 @@ viewswitcher { &.needs-attention { > stack > box label { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($selected_bg_color), to(transparent)); + background-image: -gtk-gradient( + radial, + center center, + 0, + center center, + 0.5, + to($selected_bg_color), + to(transparent) + ); background-size: 6px 6px; background-repeat: no-repeat; background-position: right 0px; @@ -123,7 +145,15 @@ viewswitcher { } &:active > stack > box label { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($selected_fg_color), to(transparent)); + background-image: -gtk-gradient( + radial, + center center, + 0, + center center, + 0.5, + to($selected_fg_color), + to(transparent) + ); } } } @@ -151,7 +181,7 @@ list.content { } &:hover.activatable:not(:selected) { - background-color: if($variant != 'dark', mix($base_color, black, 95%), mix($base_color, white, 97%)); + background-color: mix($base_color, white, 97%); } } @@ -166,7 +196,7 @@ list.content { &:not(.expander):not(:active):hover.activatable:not(:selected), &.expander row.header:not(:active):hover.activatable:not(:selected) { - background-color: if($variant != 'dark', mix($base_color, black, 95%), mix($base_color, white, 97%)); + background-color: mix($base_color, white, 97%); } &, @@ -230,8 +260,11 @@ window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top): // HdyWindowHandle separator .windowhandle separator.sidebar { - &:dir(ltr), &.left, &.left:dir(rtl), - &:dir(rtl), &.right { + &:dir(ltr), + &.left, + &.left:dir(rtl), + &:dir(rtl), + &.right { background-color: $header_border; margin: 0; } @@ -244,4 +277,4 @@ hdyleaflet { &:first-child headerbar { border-top-left-radius: 8px; } -} \ No newline at end of file +} diff --git a/gtk-3.0/sass/_lightdm.scss b/gtk-3.0/sass/ui/lightdm.scss similarity index 74% rename from gtk-3.0/sass/_lightdm.scss rename to gtk-3.0/sass/ui/lightdm.scss index bd767bf..aa153ec 100644 --- a/gtk-3.0/sass/_lightdm.scss +++ b/gtk-3.0/sass/ui/lightdm.scss @@ -16,9 +16,13 @@ menubar menuitem:disabled { color: transparentize($panel_fg, 0.5); - label { color: inherit; } + label { + color: inherit; + } + } + menubar menu > menuitem { + font-weight: normal; } - menubar menu > menuitem { font-weight: normal; } } // the login window @@ -44,9 +48,16 @@ #content_frame button { @include button(normal); - &:hover { @include button(hover); } - &:active, &:checked { @include button(active); } - &:disabled { @include button(insensitive); } + &:hover { + @include button(hover); + } + &:active, + &:checked { + @include button(active); + } + &:disabled { + @include button(insensitive); + } } // the lower half of the login-window, in GtkDialog terms the buttonbox or action area @@ -54,27 +65,36 @@ padding-top: 20px; padding-bottom: 0px; border-style: none; - background-color: if($variant=='light', $osd_bg_color, $header_bg); + background-color: $header_bg; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; border: solid transparentize(black, 0.9); border-width: 0 1px 1px 1px; - box-shadow: inset 0 1px if($variant=="light", $dark_sidebar_border, $header_border); + box-shadow: inset 0 1px $header_border; } #buttonbox_frame button { @include button(osd); - &:hover { @include button(osd-hover); } - &:active, &:checked { @include button(osd-active); } - &:disabled { @include button(osd-insensitive); } + &:hover { + @include button(osd-hover); + } + &:active, + &:checked { + @include button(osd-active); + } + &:disabled { + @include button(osd-insensitive); + } } #login_window #user_combobox { color: $fg_color; font-size: 13px; - menu { font-weight: normal; } + menu { + font-weight: normal; + } } // the user's avatar box @@ -84,22 +104,33 @@ } // the border around the user's avatar box -#user_image_border {} +#user_image_border { +} // the shutdown button #shutdown_button.button { @include button(suggested_destructive, $destructive_color); - &:hover { @include button(suggested_destructive, lighten($destructive_color, 10%)); } - &:active, &:checked { @include button(suggested_destructive, darken($destructive_color, 10%)); } + &:hover { + @include button(suggested_destructive, lighten($destructive_color, 10%)); + } + &:active, + &:checked { + @include button(suggested_destructive, darken($destructive_color, 10%)); + } } // the restart button #restart_button.button { @include button(suggested_destructive, $suggested_color); - &:hover { @include button(suggested_destructive, lighten($suggested_color, 10%)); } - &:active, &:checked { @include button(suggested_destructive, darken($suggested_color, 10%)); } + &:hover { + @include button(suggested_destructive, lighten($suggested_color, 10%)); + } + &:active, + &:checked { + @include button(suggested_destructive, darken($suggested_color, 10%)); + } } // the warning, in case a wrong password is entered or something else goes wrong according to PAM @@ -114,11 +145,12 @@ window.background.lightdm { menubar { - > menuitem { padding : 0 5px 0 5px; } + > menuitem { + padding: 0 5px 0 5px; + } } button { - &.flat.option-button { background-color: transparent; color: #dadada; @@ -161,7 +193,8 @@ window.background.lightdm { color: white; } - entry:active { // for spinner + entry:active { + // for spinner -gtk-icon-source: -gtk-icontheme('process-working-symbolic'); animation: spinner 1s linear infinite; } diff --git a/gtk-3.0/sass/ui/list.scss b/gtk-3.0/sass/ui/list.scss new file mode 100644 index 0000000..9e92307 --- /dev/null +++ b/gtk-3.0/sass/ui/list.scss @@ -0,0 +1,55 @@ + + +// +// Lists +// +list { + background-color: $base_color; + border-color: $borders_color; + + row { + padding: 2px; + } +} + +row { + &:not(:hover) { + transition: all 150ms $ease-out-quad; + } + + &:selected { + @extend %selected_items; + + button { + @extend %selected_button; + } + } + + &.activatable { + &.has-open-popup, + &:hover { + background-color: transparentize(white, 0.95); + } + + &:active { + color: $fg_color; + } + &:disabled { + color: $insensitive_fg_color; + image { + color: inherit; + } + } + + &:selected { + &:active { + color: $selected_fg_color; + } + + &.has-open-popup, + &:hover { + background-color: mix(black, $selected_bg_color, 10%); + } + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/menu.scss b/gtk-3.0/sass/ui/menu.scss new file mode 100644 index 0000000..a2bb5e1 --- /dev/null +++ b/gtk-3.0/sass/ui/menu.scss @@ -0,0 +1,211 @@ + +// +// Menus +// +menubar, +.menubar { + -GtkWidget-window-dragging: true; + padding: 0px; + background-color: $header_bg; + color: $header_fg; + + &:backdrop { + color: transparentize($header_fg, 0.3); + //background-color: opacify($header_bg_backdrop, 1); + } + + > menuitem { + padding: 6px 8px; + border: solid transparent; + border-width: 0; + + &:hover { + //Seems like it :hover even with keyboard focus + background-color: $menu_selected_bg_color; + color: $fg_color; + } + &:disabled { + color: transparentize($header_fg, 0.6); + border-color: transparent; + } + + > label:disabled { + color: transparentize($header_fg, 0.45); + } + } +} + +menu, +.menu { + $_menu_bg: $bg_color; + margin: 4px; + padding: 0; + border-radius: 0; + background-color: $_menu_bg; + border: 1px solid $borders_color; + + .csd & { + padding: 4px 0px; + border-radius: 2px; + border: none; + } + + separator, + .csd & separator { + margin: 2px 0; + background-color: $separator_color; + } + + // Firefox workaround + .separator:not(label), + .csd & .separator:not(label) { + color: $_menu_bg; + } + // Firefox workaround end + + menuitem { + min-height: 16px; + min-width: 40px; + padding: 5px; + + &:hover { + color: $fg_color; + background-color: $menu_selected_bg_color; + } + &:disabled { + color: $insensitive_fg_color; + } + + //submenu indicators + arrow { + min-height: 16px; + min-width: 16px; + + &:dir(ltr) { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + margin-left: 10px; + } + &:dir(rtl) { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); + margin-right: 10px; + } + } + @at-root menuitem { + accelerator { + color: gtkalpha(currentColor, 0.55); + } + + check, + radio { + min-height: 16px; + min-width: 16px; + &:dir(ltr) { + margin-right: 6px; + margin-left: 2px; + } + &:dir(rtl) { + margin-left: 6px; + margin-right: 2px; + } + } + } + } + + // overflow buttons + > arrow { + @include button(undecorated); + min-width: 16px; + min-height: 16px; + padding: 4px; + background-color: $_menu_bg; + border-radius: 0; + + &.top { + margin-top: -6px; + border-bottom: 1px solid mix($fg_color, $base_color, 10%); + -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); + } + &.bottom { + margin-bottom: -6px; + border-top: 1px solid mix($fg_color, $base_color, 10%); + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + } + &:hover { + background-color: mix($fg_color, $base_color, 10%); + } + &:disabled { + color: transparent; + background-color: transparent; + border-color: transparent; + } + } +} + +.csd .popup { + border-radius: 2px; +} + +// +// Popovers +// +popover, +popover.background { + $_popover_bg: $bg_color; + padding: 2px; + // border: 1px solid darken($borders_color, 5%); + border-radius: 3px; + background-clip: border-box; + background-color: $_popover_bg; + + box-shadow: 0 2px 6px 1px transparentize(black, 0.65); + + .csd &, + & { + border: 1px solid darken($borders_color, 5%); + } + + & separator { + background-color: $_popover_bg; + } + label.separator { + @extend .dim-label; + + color: $fg_color; + } + + > list, + > .view, + > toolbar { + border-style: none; + background-color: transparent; + } + + &, + .csd & { + &.osd, + &.magnifier { + @extend %osd; + } + &.touch-selection { + @extend .context-menu; + } + + &.osd { + @extend %osd; + } + } +} + +//touch selection handlebars for the Popover.osd above +cursor-handle { + background-color: transparent; + background-image: none; + box-shadow: none; + border-style: none; + &.top { + -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); + } + &.bottom { + -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/misc.scss b/gtk-3.0/sass/ui/misc.scss new file mode 100644 index 0000000..b21cd57 --- /dev/null +++ b/gtk-3.0/sass/ui/misc.scss @@ -0,0 +1,38 @@ + + + +// +// Misc +// +//content view (grid/list) +.content-view { + background-color: $base_color; + &:hover { + -gtk-icon-effect: highlight; + } + rubberband { + @extend rubberband; + } +} + +.scale-popup { + .osd & { + @extend %osd; + } + + button { + &:hover { + // +/- buttons on GtkVolumeButton popup + @include button(hover); + } + } +} + +// Decouple the font of context menus from their entry/textview +.touch-selection, +.context-menu { + font: initial; +} +.monospace { + font-family: Monospace; +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/notebook.scss b/gtk-3.0/sass/ui/notebook.scss new file mode 100644 index 0000000..f2c461e --- /dev/null +++ b/gtk-3.0/sass/ui/notebook.scss @@ -0,0 +1,202 @@ + + + + + + +// +// Notebooks and Tabs +// +notebook { + padding: 0; + + &.frame { + border: 1px solid $borders_color; + + > header { + // ugly hack to hide the borders around the header + margin: -1px; + &.top { + margin-bottom: 0; + } + &.bottom { + margin-top: 0; + } + &.left { + margin-right: 0; + } + &.right { + margin-left: 0; + } + + &.top, + &.bottom { + padding-left: 0; + padding-right: 0; + } + &.left, + &.right { + padding-top: 0; + padding-bottom: 0; + } + } + } + + > stack:not(:only-child) { + // the :not(:only-child) is for "hidden" notebooks + background-color: $base_color; + } + + > header { + padding: 2px; + background-color: $bg_color; + + &.top { + box-shadow: inset 0 -1px $borders_color; + } + &.bottom { + box-shadow: inset 0 1px $borders_color; + } + &.right { + box-shadow: inset 1px 0 $borders_color; + } + &.left { + box-shadow: inset -1px 0 $borders_color; + } + + @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) { + // sizing and borders + &.#{$_pos} { + padding-#{$_bpos}: 0; + + > tabs > tab { + padding: 2px 10px; + min-width: 20px; + min-height: 20px; + + outline-offset: -4px; + + border: 1px solid transparent; + border-#{$_bpos}: none; + + // tab overlap + + tab { + @if $_pos==top or $_pos==bottom { + margin-left: -1px; + } @else { + margin-top: -1px; + } + } + + // tab border radius + @if $_pos==top { + border-radius: 1px 1px 0 0; + } @else if $_pos==bottom { + border-radius: 0 0 1px 1px; + } @else if $_pos==left { + border-radius: 1px 0 0 1px; + } @else if $_pos==right { + border-radius: 0 1px 1px 0; + } + } + } + } + // overflow arrows + &.top, + &.bottom { + > tabs > arrow.up { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + &:last-child { + margin-left: 2px; + } + } + > tabs > arrow.down { + -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); + &:first-child { + margin-right: 2px; + } + } + } + &.left, + &.right { + > tabs > arrow.up { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + &:last-child { + margin-top: 2px; + } + } + > tabs > arrow.down { + -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); + &:first-child { + margin-bottom: 2px; + } + } + } + > tabs > arrow { + color: $insensitive_fg_color; + + &:hover { + color: mix($fg_color, $insensitive_fg_color, 50%); + } + &:active { + color: $fg_color; + } + &:disabled { + color: transparentize($insensitive_fg_color, 0.3); + } + } + + // tab colors + + &.top > tabs > tab:hover:not(:checked) { + box-shadow: inset 0 -1px $borders_color; + } + &.bottom > tabs > tab:hover:not(:checked) { + box-shadow: inset 0 1px $borders_color; + } + &.left > tabs > tab:hover:not(:checked) { + box-shadow: inset -1px 0 $borders_color; + } + &.right > tabs > tab:hover:not(:checked) { + box-shadow: inset 1px 0 $borders_color; + } + + > tabs > tab { + color: $insensitive_fg_color; + background-color: transparentize($base_color, 1); + + &:hover:not(:checked) { + color: mix($fg_color, $insensitive_fg_color, 50%); + background-color: transparentize($base_color, 0.5); + border-color: $borders_color; + } + &:checked { + color: $fg_color; + background-color: $base_color; + border-color: $borders_color; + } + // close button + button.flat { + min-height: 22px; + min-width: 16px; + padding: 0; + color: mix($bg_color, $fg_color, 35%); + + &:hover { + @extend %undecorated_button; + color: lighten(red, 15%); + } + &:active, + &:active:hover { + @extend %undecorated_button; + color: $selected_bg_color; + } + } + } + + /* button in headers */ + button.flat { + padding: 2px; + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/other.scss b/gtk-3.0/sass/ui/other.scss new file mode 100644 index 0000000..20cc631 --- /dev/null +++ b/gtk-3.0/sass/ui/other.scss @@ -0,0 +1,420 @@ + + +// +// GtkScale +// +scale { + $_marks_length: 3px; + $_marks_distance: 1px; + + min-height: 15px; + min-width: 15px; + padding: 3px; + + &.horizontal { + trough { + padding: 0 4px; + } + highlight, + fill { + margin: 0 -4px; + } + } + + &.vertical { + trough { + padding: 4px 0; + } + highlight, + fill { + margin: -4px 0; + } + } + + // The slider is inside the trough, negative margin to make it bigger + slider { + min-height: 15px; + min-width: 15px; + margin: -6px; + } + + // Click-and-hold the slider to activate + &.fine-tune { + // Make the trough grow in fine-tune mode + slider { + margin: -4px; + } + + fill, + highlight, + trough { + border-radius: 5px; + -gtk-outline-radius: 7px; + } + } + + slider { + $_slider_border: darken($button_border, 2%); + + background-clip: border-box; + background-color: $button_bg; + border: 1px solid $_slider_border; + border-radius: 50%; + box-shadow: none; + + &:disabled { + background-color: mix($entry_bg, $bg_color, 55%); + border-color: transparentize($_slider_border, 0.2); + } + &:active { + background-color: $selected_bg_color; + border-color: $selected_bg_color; + } + //OSD sliders + .osd & { + background-color: $osd_bg_color; + border-color: $selected_bg_color; + + &:hover { + background-color: $selected_bg_color; + } + &:active { + background-color: darken($selected_bg_color, 10%); + border-color: darken($selected_bg_color, 10%); + } + } + //selected list-row and infobar sliders + menuitem:hover &, + row:selected &, + infobar & { + background-color: $selected_fg_color; + border-color: $selected_fg_color; + + &:hover { + background-color: mix($selected_fg_color, $selected_bg_color, 85%); + border-color: mix($selected_fg_color, $selected_bg_color, 85%); + } + &:active { + background-color: mix($selected_fg_color, $selected_bg_color, 50%); + border-color: mix($selected_fg_color, $selected_bg_color, 50%); + } + &:disabled { + background-color: mix($selected_fg_color, $selected_bg_color, 55%); + border-color: mix($selected_fg_color, $selected_bg_color, 55%); + } + } + } + + trough { + $_scale_trough_bg: darken($bg_color, 5%); + + outline-offset: 2px; + -gtk-outline-radius: 4.5px; + + border-radius: 2.5px; + background-color: $_scale_trough_bg; + + &:disabled { + background-color: transparentize($_scale_trough_bg, 0.45); + } + + //OSD troughs + .osd & { + background-color: lighten($osd_bg_color, 7%); + outline-color: transparentize($osd_fg_color, 0.8); + highlight { + background-color: $selected_bg_color; + } + + &:disabled { + } + } + // troughs in selected list-rows and infobars + menuitem:hover & row:selected &, + infobar & { + background-color: transparentize(black, 0.8); + + highlight { + background-color: $selected_fg_color; + + &:disabled { + background-color: mix($selected_fg_color, $selected_bg_color, 55%); + } + } + + &:disabled { + background-color: transparentize(black, 0.9); + } + } + } + + // The colored part of the trough + highlight { + border-radius: 2.5px; + background-color: $selected_bg_color; + + &:disabled { + background-color: transparentize($selected_bg_color, 0.45); + } + } + + // this is another differently styled part of the trough, the most relevant use case is for example + // in media player to indicate how much video stream as been cached + fill { + border-radius: 2.5px; + background-color: transparentize($selected_bg_color, 0.5); + + &:disabled { + background-color: transparent; + } + } + + value { + color: gtkalpha(currentColor, 0.4); + } + + marks { + color: gtkalpha(currentColor, 0.4); + + @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), (bottom, bottom, top), + (top, left, right), (bottom, right, left) + { + &.#{$marks_class} { + margin-#{$marks_margin}: $_marks_distance; + margin-#{$marks_pos}: -($_marks_distance + $_marks_length); + } + } + } + + &.fine-tune marks { + @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom), (bottom, bottom, top), + (top, left, right), (bottom, right, left) + { + &.#{$marks_class} { + margin-#{$marks_margin}: ($_marks_distance - 1px); + margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 2px); + } + } + } + &.horizontal { + indicator { + min-height: $_marks_length; + min-width: 1px; + } + + &.fine-tune indicator { + min-height: ($_marks_length - 1px); + } + } + &.vertical { + indicator { + min-height: 1px; + min-width: $_marks_length; + } + + &.fine-tune indicator { + min-width: ($_marks_length - 1px); + } + } +} + +// +// Progress bars +// +progressbar { + padding: 0; + font-size: smaller; + color: transparentize($fg_color, 0.3); + + &.osd { + min-width: 3px; + min-height: 3px; + background-color: transparent; + + trough { + border-style: none; + background-color: transparent; + box-shadow: none; + } + } + + // Moving bit + progress { + background-color: $selected_bg_color; + border-radius: 0px; + box-shadow: none; //needed for clipping + + row:selected &, + infobar & { + background-color: $selected_fg_color; + } + } + + // Trough + trough { + border: 1px solid $button_border; + border-radius: 2px; + background-color: $trough_color; + + row:selected &, + infobar & { + background-color: transparentize(black, 0.8); + } + } +} + +// Needed by the Mate osd when Marco with compositing is enabled +.osd { + .progressbar { + background-color: $selected_bg_color; + } + .trough { + background-color: lighten($osd_bg_color, 75%); + } +} + +// +// Level Bar +// +levelbar { + block { + min-width: 32px; + min-height: 1px; + } + &.vertical block { + min-width: 1px; + min-height: 32px; + } + + trough { + border: none; + padding: 3px; + border-radius: 3px; + background-color: darken($bg_color, 5%); + } + + &.horizontal.discrete block { + margin: 0 1px; + } + &.vertical.discrete block { + margin: 1px 0; + } + + block:not(.empty) { + border: 1px solid $selected_bg_color; + background-color: $selected_bg_color; + border-radius: 2px; + } + block.low { + border-color: $warning_color; + background-color: $warning_color; + } + block.high { + border-color: $selected_bg_color; + background-color: $selected_bg_color; + } + block.full { + border-color: $success_color; + background-color: $success_color; + } + block.empty { + background-color: $base_color; + border-color: $base_color; + } +} + + + +//vbox and hbox separators +separator { + background-color: transparentize(black, 0.9); + min-width: 1px; + min-height: 1px; +} + + + + + + + + + + + + + + + + +// +// App Notifications +// +.app-notification { + padding: 10px; + color: $osd_fg_color; + background-color: $osd_bg_color; + background-clip: border-box; + border-radius: 0 0 2px 2px; + border-width: 0 1px 1px 1px; + border-style: solid; + border-color: darken($osd_bg_color, 10%); + + border { + border: none; + } + + button { + @include button(osd); + &.flat { + @extend %undecorated_button; + border-color: transparentize($selected_bg_color, 1); + &:disabled { + @extend %undecorated_button; + } + } + &:hover { + @include button(osd-hover); + } + &:active, + &:checked { + @include button(osd-active); + background-clip: padding-box; + } + &:disabled { + @include button(osd-insensitive); + } + } +} + +// +// Expanders +// +expander { + arrow { + min-width: 16px; + min-height: 16px; + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + + &:dir(rtl) { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); + } + &:hover { + color: lighten($fg_color, 30%); + } //only lightens the arrow + &:checked { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + } + } +} + + + + + + + + + + + diff --git a/gtk-3.0/sass/ui/scrollbar.scss b/gtk-3.0/sass/ui/scrollbar.scss new file mode 100644 index 0000000..28f4751 --- /dev/null +++ b/gtk-3.0/sass/ui/scrollbar.scss @@ -0,0 +1,190 @@ +// +// Scrollbars +// +$_scrollbar_bg_color: transparentize($base_color, 0.7); + +scrollbar { + @at-root * { + /* pretter ignore */ + -GtkScrollbar-has-backward-stepper: false; + -GtkScrollbar-has-forward-stepper: false; + } + + $_slider_min_length: 40px; + + background-color: $_scrollbar_bg_color; + transition: 300ms $ease-out-quad; + + &.top { + border-bottom: 1px solid $borders_color; + } + + &.bottom { + border-top: 1px solid $borders_color; + } + + &.left { + border-right: 1px solid $borders_color; + } + + &.right { + border-left: 1px solid $borders_color; + } + + button { + border: none; + } + + // slider + slider { + min-width: 6px; + min-height: 6px; + margin: -1px; + border: 4px solid transparent; + border-radius: 8px; + background-clip: padding-box; + background-color: mix($fg_color, $bg_color, 40%); + + &:hover { + background-color: mix($fg_color, $bg_color, 30%); + } + + &:hover:active { + background-color: $selected_bg_color; + } + + &:disabled { + background-color: transparent; + } + } + + &.fine-tune { + slider { + min-width: 4px; + min-height: 4px; + } + + &.horizontal slider { + border-width: 5px 4px; + } + + &.vertical slider { + border-width: 4px 5px; + } + } + + &.overlay-indicator { + &:not(.dragging):not(.hovering) { + // Overlay scrolling indicator + opacity: 0.4; + border-color: transparent; + background-color: transparent; + + slider { + margin: 0; + min-width: 4px; + min-height: 4px; + background-color: mix($fg_color, $bg_color, 70%); + border: 1px solid transparentize(black, 0.7); + // background-clip: padding-box; + } + + // w/o the following margin tweaks the slider shrinks when hovering/dragging + &.vertical slider { + margin: 2px 0; + min-height: $_slider_min_length; + } + + &.horizontal slider { + margin: 0 2px; + min-width: $_slider_min_length; + } + } + + &.dragging, + &.hovering { + opacity: 0.99; + } + } + + &.horizontal slider { + min-width: $_slider_min_length; + } + + &.vertical slider { + min-height: $_slider_min_length; + } +} + +frame > border, +.frame { + margin: 0; + padding: 0; + border-radius: 0; + border: 1px solid $borders_color; +} + +frame.flat > border, +frame > border.flat, +.frame.flat { + border-style: none; +} + +scrolledwindow { + viewport.frame { + // avoid double borders when viewport inside scrolled window + border-style: none; + } + + // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries. + // This draws a box on top of the content, the size changes programmatically. + overshoot { + &.top { + @include overshoot(top); + } + + &.bottom { + @include overshoot(bottom); + } + + &.left { + @include overshoot(left); + } + + &.right { + @include overshoot(right); + } + } + + // Overflow indication, works similarly to the overshoot, the size if fixed tho. + undershoot { + &.top { + @include undershoot(top); + } + + &.bottom { + @include undershoot(bottom); + } + + &.left { + @include undershoot(left); + } + + &.right { + @include undershoot(right); + } + } + + junction { + // the small square between two scrollbars + border-color: transparent; + // the border image is used to add the missing dot between the borders, details, details, details... + border-image: linear-gradient(to bottom, $borders_color 1px, transparent 1px) 0 0 0 1 / 0 1px + stretch; + background-color: $_scrollbar_bg_color; + + &:dir(rtl) { + border-image-slice: 0 1 0 0; + } + } +} diff --git a/gtk-3.0/sass/ui/sidebar.scss b/gtk-3.0/sass/ui/sidebar.scss new file mode 100644 index 0000000..a8046c7 --- /dev/null +++ b/gtk-3.0/sass/ui/sidebar.scss @@ -0,0 +1,257 @@ + +// +// Sidebar +// +.sidebar { + border-style: none; + background-color: lighten($bg_color, 2%); + + @at-root %sidebar_left, + &:dir(ltr), + &.left, + &.left:dir(rtl) { + border-right: 1px solid $borders_color; + border-left-style: none; + } + + @at-root %sidebar_right, + &:dir(rtl), + &.right { + border-left: 1px solid $borders_color; + border-right-style: none; + } + + list { + background-color: $base_color; + } + + paned & { + &.left, + &.right, + &.left:dir(rtl), + &:dir(rtl), + &:dir(ltr), + & { + border-style: none; + } + } +} + +stacksidebar { + &.sidebar { + &:dir(ltr) list, + &.left list, + &.left:dir(rtl) list { + @extend %sidebar_left; + } + + &:dir(rtl) list, + &.right list { + @extend %sidebar_right; + } + } + + row { + padding: 10px 4px; + + > label { + padding-left: 6px; + padding-right: 6px; + } + &.needs-attention { + background-image: radial-gradient( + circle closest-side at 5% 25%, + $destructive_color 0%, + $destructive_color 100%, + transparent 100% + ); + background-size: 70px; + background-position: 4px; + background-repeat: no-repeat; + } + &.activatable:selected.needs-attention { + background-image: radial-gradient( + circle closest-side at 5% 25%, + $selected_fg_color 0%, + $selected_fg_color 100%, + transparent 100% + ); + background-size: 70px; + background-position: 4px; + background-repeat: no-repeat; + } + } +} + +placessidebar { + > viewport.frame { + border-style: none; + } + + row { + // Needs overriding of the GtkListBoxRow padding + min-height: 30px; + padding: 0px; + // Using margins/padding directly in the SidebarRow + // will make the animation of the new bookmark row jump + > revealer { + padding: 0 10px; + } + image.sidebar-icon { + &:dir(ltr) { + padding-right: 8px; + } + &:dir(rtl) { + padding-left: 8px; + } + } + label.sidebar-label { + &:dir(ltr) { + padding-right: 2px; + } + &:dir(rtl) { + padding-left: 2px; + } + } + @at-root button.sidebar-button { + min-width: 22px; + min-height: 22px; + margin-top: 2px; + margin-bottom: 2px; + padding: 0; + @extend %button_basic_flat; + border-radius: 100%; + -gtk-outline-radius: 100%; + + &:not(:hover):not(:active) > image { + opacity: 0.5; + } + } + + &.sidebar-placeholder-row { + padding: 0 8px; + min-height: 2px; + background-image: _solid($drop_target_color); + background-clip: content-box; + } + + &.sidebar-new-bookmark-row { + color: $selected_bg_color; + } + + &:drop(active):not(:disabled) { + &, + label, + image { + color: $drop_target_color; + } + + box-shadow: inset 0 1px $drop_target_color, inset 0 -1px $drop_target_color; + + &:selected { + &, + label, + image { + color: $selected_fg_color; + } + background-color: $drop_target_color; + } + } + } +} + + + + + + + +// +// PlacesView +// +placesview { + .server-list-button > image { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(0turn); + } + + .server-list-button:checked > image { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(-0.5turn); + } + + // this selects the "connect to server" label + > actionbar > revealer > box > label { + padding-left: 8px; + padding-right: 8px; + } +} + + + + + + + +// +// Paned +// +paned { + > separator { + min-width: 1px; + min-height: 1px; + -gtk-icon-source: none; + border-style: none; + background-color: transparent; + background-image: _solid($borders_color); + background-size: 1px 1px; + + &:selected { + background-image: _solid($selected_bg_color); + } + + &.wide { + min-width: 5px; + min-height: 5px; + background-color: transparent; + } + } + + &.horizontal > separator { + background-repeat: repeat-y; + margin: 0 -3px 0 -3px; + padding: 0 3px 0 3px; + background-position: center; + + &.wide { + margin: 0; + padding: 0; + background-repeat: no-repeat; + background-position: center; + background-image: -gtk-scaled( + url('assets/pane-separator-vertical.png'), + url('assets/pane-separator-vertical@2.png') + ); + background-size: 2px 24px; + } + } + + &.vertical > separator { + margin: -3px 0 -3px 0; + padding: 3px 0 3px 0; + background-repeat: repeat-x; + background-position: center; + + &.wide { + margin: 0; + padding: 0; + background-repeat: no-repeat; + background-position: center; + background-image: -gtk-scaled( + url('assets/pane-separator.png'), + url('assets/pane-separator@2.png') + ); + background-size: 24px 2px; + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/switch-check.scss b/gtk-3.0/sass/ui/switch-check.scss new file mode 100644 index 0000000..4c06806 --- /dev/null +++ b/gtk-3.0/sass/ui/switch-check.scss @@ -0,0 +1,140 @@ + + +// +// Switches +// +switch { + font-size: 1px; + min-width: 52px; + min-height: 24px; + background-size: 52px 24px; + background-repeat: no-repeat; + background-position: center center; + + slider { + min-width: 1px; + min-height: 1px; + } + + &, + slider { + outline-color: transparent; + color: transparent; + border: none; + box-shadow: none; + } +} + +@each $k, $l in ('', ''), (':checked', '-active'), (':disabled', '-insensitive'), + (':checked:disabled', '-active-insensitive') +{ + // load switch troughs from .png files in assets directory + + switch#{$k} { + background-image: -gtk-scaled( + url('assets/switch#{$l}.png'), + url('assets/switch#{$l}@2.png') + ); + } + + menuitem:hover switch#{$k}, + row:selected switch#{$k}, + infobar switch#{$k} { + background-image: -gtk-scaled( + url('assets/switch#{$l}-selected.png'), + url('assets/switch#{$l}-selected@2.png') + ); + } + + headerbar switch#{$k}, + .primary-toolbar switch#{$k}, + .primary-toolbar toolbar switch#{$k} { + background-image: -gtk-scaled( + url('assets/switch#{$l}-header.png'), + url('assets/switch#{$l}-header@2.png') + ); + } +} + +// +// Check and Radio items * +// +@each $w, $a in ('check', 'checkbox'), ('radio', 'radio') { + //standard checks and radios + @each $s, $as in ('', '-unchecked'), (':disabled', '-unchecked-insensitive'), + (':indeterminate', '-mixed'), (':indeterminate:disabled', '-mixed-insensitive'), + (':checked', '-checked'), (':checked:disabled', '-checked-insensitive') + { + .#{$w}#{$s}, + #{$w}#{$s}, + treeview.#{$w}#{$s} { + -gtk-icon-source: -gtk-scaled( + url('assets/#{$a}#{$as}.png'), + url('assets/#{$a}#{$as}@2.png') + ); + } + + .osd, + %osd_check_radio { + #{$w}#{$s} { + -gtk-icon-source: -gtk-scaled( + url('assets/#{$a}#{$as}-dark.png'), + url('assets/#{$a}#{$as}-dark@2.png') + ); + } + } + // the borders of checks and radios are + // too similar in luminosity to the selected background color, hence + // we need special casing. + .view #{$w}#{$s}:selected, + treeview.#{$w}#{$s}:selected, + row:selected #{$w}#{$s}, + infobar #{$w}#{$s} { + -gtk-icon-source: -gtk-scaled( + url('assets/#{$a}#{$as}-selected.png'), + url('assets/#{$a}#{$as}-selected@2.png') + ); + } + } +} + +// Selectionmode +@each $s, $as in ('', '-selectionmode'), (':checked', '-checked-selectionmode') { + .view.content-view.check#{$s}:not(.list) { + -gtk-icon-source: -gtk-scaled( + url('assets/checkbox#{$as}.png'), + url('assets/checkbox#{$as}@2.png') + ); + background-color: transparent; + } +} + +checkbutton, +radiobutton { + // this is for a nice focus on check and radios text + &.text-button { + padding: 2px 0; + outline-offset: 0; + } + + label:not(:only-child) { + &:first-child { + margin-left: 4px; + } + &:last-child { + margin-right: 4px; + } + } +} + +check, +radio { + min-width: 16px; + min-height: 16px; + margin: 0 2px; + + &:only-child, + menu menuitem & { + margin: 0; + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/toolbar.scss b/gtk-3.0/sass/ui/toolbar.scss new file mode 100644 index 0000000..2967a85 --- /dev/null +++ b/gtk-3.0/sass/ui/toolbar.scss @@ -0,0 +1,788 @@ + + +// +// Comboboxes +// +combobox { + button.combo { + // Otherwise combos + padding-top: 3px; // are bigger than + padding-bottom: 3px; // buttons + } + arrow { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + min-height: 16px; + min-width: 16px; + } + + &:drop(active) button.combo { + @extend %button_basic_drop_active; + } + + .linked:not(.vertical) > & > box > button.combo { + // the combobox is a composite widget so the way we do button linking doesn't + // work, special case needed. + &:dir(ltr), + &:dir(rtl) { + @extend %linked_middle; + } + } + + .linked:not(.vertical) > &:first-child > box > button.combo { + @extend %linked_left; + } + .linked:not(.vertical) > &:last-child > box > button.combo { + @extend %linked_right; + } + .linked:not(.vertical) > &:only-child > box > button.combo { + @extend %linked_only_child; + } + + .linked.vertical > & > box > button.combo { + @extend %linked_vertical_middle; + } + .linked.vertical > &:first-child > box > button.combo { + @extend %linked_vertical_top; + } + .linked.vertical > &:last-child > box > button.combo { + @extend %linked_vertical_bottom; + } + .linked.vertical > &:only-child > box > button.combo { + @extend %linked_vertical_only_child; + } +} + +toolbar { + -GtkWidget-window-dragging: true; + padding: 4px; + background-color: $bg_color; + + separator { + background: none; + } + &.horizontal separator { + margin: 0 6px; + } + &.vertical separator { + margin: 6px 0; + } + + .osd & { + background-color: transparent; + } + + &.osd { + padding: 7px; + border: 1px solid transparentize(black, 0.5); + border-radius: 3px; + background-color: transparentize($osd_bg_color, 0.1); + + &.left, + &.right, + &.top, + &.bottom { + border-radius: 0; + } // positional classes for `attached` osd toolbars + + &.top { + border-width: 0 0 1px 0; + } + &.bottom { + border-width: 1px 0 0 0; + } + &.left { + border-width: 0 1px 0 0; + } + &.right { + border-width: 0 0 0 1px; + } + } + + &:not(.inline-toolbar) { + switch, + scale, + entry, + spinbutton, + button { + margin-right: 1px; + margin-bottom: 1px; + } + .linked > button, + .linked > entry { + margin-right: 0; + } + } +} + +.primary-toolbar toolbar, +.primary-toolbar:not(.libreoffice-toolbar) { + // LO messes up the toolbar styling, so exclude LO toolbars + color: $header_fg; + background-color: opacify($header_bg, 1); + box-shadow: none; + border-width: 0 0 1px 0; + border-style: solid; + border-image: linear-gradient(to bottom, opacify($header_bg, 1), darken($header_bg, 12%)) 1 0 1 0; //temporary hack for rhythmbox 3.1 + + separator { + @extend %header_separator; + } +} + +.primary-toolbar toolbar, +.primary-toolbar { + @extend %header_widgets; +} + +.inline-toolbar { + @extend toolbar; + background-color: darken($bg_color, 3%); + border-style: solid; + border-color: $borders_color; + border-width: 0 1px 1px; + padding: 3px; + border-radius: 0 0 3px 3px; +} + +searchbar { + background-color: $bg_color; + border-style: solid; + border-color: $borders_color; + border-width: 0 0 1px; + padding: 3px; + //box-shadow: inset 0 1px 2px rgba(0,0,0,0.25); +} + +actionbar { + padding: 6px; + border-top: 1px solid $borders_color; + background-color: darken($bg_color, 3%); +} + +// +// Headerbars +// +headerbar, +%titlebar { + min-height: 42px; + padding: 0 7px; + + border-width: 0 0 1px; + border-style: solid; + border-radius: 0; + border-color: opacify($header_border, 1); + + color: $header_fg; + background-color: opacify($header_bg, 1); + box-shadow: inset 0 1px $header_highlight; + + .csd & { + // Transparent header-bars only in csd windows + background-color: $header_bg; + border-color: $header_border; + } + + &:backdrop { + color: transparentize($header_fg, 0.4); + box-shadow: none; + } + + .title { + font-weight: bold; + padding-left: 12px; + padding-right: 12px; + } + + .subtitle { + font-size: smaller; + padding-left: 12px; + padding-right: 12px; + } + + // Selectionmode + &.selection-mode { + color: $selected_fg_color; + background-color: $selection_mode_bg; + border-color: darken($selection_mode_bg, 4%); + box-shadow: none; + + &:backdrop { + background-color: $selection_mode_bg; + color: transparentize($selected_fg_color, 0.4); + } + + .subtitle:link { + @extend %link_selected; + } + + button { + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 1); + + &.flat { + @include button(undecorated); + color: $selected_fg_color; + background-color: transparentize($selected_fg_color, 1); + } + &:hover { + color: $selected_fg_color; + outline-color: transparentize($selected_fg_color, 0.7); + background-color: transparentize($selected_fg_color, 0.95); + border-color: transparentize($selected_fg_color, 0.5); + } + &:active, + &:checked { + color: $selection_mode_bg; + outline-color: transparentize($selection_mode_bg, 0.7); + background-color: $selected_fg_color; + border-color: $selected_fg_color; + } + &:disabled { + color: transparentize($selected_fg_color, 0.6); + background-color: transparentize($selected_fg_color, 1); + border-color: transparentize($selected_fg_color, 1); + + &:active, + &:checked { + color: transparentize($selection_mode_bg, 0.6); + background-color: transparentize($selected_fg_color, 0.85); + border-color: transparentize($selected_fg_color, 0.85); + } + } + } + + .selection-menu { + box-shadow: none; + padding-left: 10px; + padding-right: 10px; + GtkArrow { + -GtkArrow-arrow-scaling: 1; + } + .arrow { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + } + } + .maximized & { + background-color: opacify($selection_mode_bg, 1); + } + } + + .tiled &, + .tiled &:backdrop, + .maximized &, + .maximized &:backdrop { + border-radius: 0; // squared corners when the window is max'd or tiled + } + + .maximized & { + background-color: opacify($header_bg, 1); + border-color: opacify($header_border, 1); + } + + &.default-decoration, + .csd &.default-decoration, // needed under wayland, since all gtk3 windows are csd windows + &.default-decoration:backdrop, + .csd &.default-decoration:backdrop { + min-height: 28px; + padding: 0 7px; + background-color: opacify($header_bg, 1); + border-bottom-width: 0; + + .maximized & { + background-color: opacify($header_bg, 1); + } + } +} + +.titlebar { + border-radius: 8px 8px 0 0; +} + +headerbar { + @extend %header_widgets; + + entry, + button, + separator { + margin-top: 6px; + margin-bottom: 6px; + } + + // Fixes split headerbars + separator:first-child + &, + &:first-child { + &, + &:backdrop { + border-top-left-radius: 8px; + + .maximized &, + .tiled & { + border-radius: 0; + } + } + } + + &:last-child { + &, + &:backdrop { + border-top-right-radius: 8px; + + .maximized &, + .tiled & { + border-radius: 0; + } + } + } +} + +// Fixes split headerbars too +.titlebar:not(headerbar) { + window > &, + window.csd > & { + &, + &:backdrop { + padding: 0; + background: none; + border: none; + box-shadow: none; + } + } + + > separator { + background-image: _solid($header_border); + } + + @extend %titlebar; +} + +%header_separator { + min-width: 1px; + min-height: 1px; + border-width: 0 1px; + border-image: linear-gradient( + to bottom, + transparentize($header_fg, 1) 25%, + transparentize($header_fg, 0.65) 25%, + transparentize($header_fg, 0.65) 75%, + transparentize($header_fg, 1) 75% + ) + 0 1/0 1px stretch; + + &:backdrop { + opacity: 0.6; + } +} + +%header_widgets { + // Headerbar Entries + entry { + @include entry(header-normal); + + &:backdrop { + opacity: 0.85; + } + + &:focus { + @include entry(header-focus); + background-clip: padding-box; + + image { + color: transparentize($header_fg, 0.15); + } + } + &:disabled { + @include entry(header-insensitive); + } + + selection:focus { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + + progress { + border-color: $selected_bg_color; + background-image: none; + background-color: transparent; + } + + @each $e_type, $e_color, $e_fg_color in (warning, $warning_color, $warning_fg_color), + (error, $error_color, $error_fg_color) + { + &.#{$e_type} { + color: $e_fg_color; + border-color: $header_entry_border; + background-color: mix($e_color, $header_bg, 60%); + + &:focus { + color: $e_fg_color; + background-color: $e_color; + } + selection, + selection:focus { + background-color: $e_fg_color; + color: $e_color; + } + } + } + } + + // Headerbar Buttons + button { + @include button(header-normal); + + &:backdrop { + opacity: 0.7; + } + + &:hover { + @include button(header-hover); + } + &:active, + &:checked { + @include button(header-active); + background-clip: padding-box; + } + &:disabled { + @include button(header-insensitive); + } + &:disabled:active, + &:disabled:checked { + @include button(header-insensitive-active); + } + } + + &.selection-mode button { + &, + &.flat { + @include button(undecorated); + color: $selection_mode_fg; + background-color: transparentize($selection_mode_fg, 1); + } + &:hover { + @extend %selected_button_normal; + } + &:active, + &:checked { + @extend %selected_button_active; + } + + &:disabled { + @extend %selected_button_flat_disabled; + + &:checked, + &:active { + @extend %selected_button_disabled_checked; + } + } + } + + // Linking stuff + + // Disconnect linked buttons + .linked:not(.vertical):not(.path-bar):not(.stack-switcher) { + button:not(:last-child):not(:only-child) { + margin-right: 1px; + } + } + + // Reset buttons + .linked:not(.vertical):not(.path-bar) > button { + &, + &:hover, + &:active, + &:checked, + &:disabled { + border-radius: 3px; + border-style: solid; + } + } + .linked:not(.vertical):not(.path-bar) { + $_uncolored_button: 'button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; + + > #{$_uncolored_button} + #{$_uncolored_button}, + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button}, + > #{$_uncolored_button}:disabled:not(:only-child), + > #{$_uncolored_button}:disabled + #{$_uncolored_button}:not(:hover) { + box-shadow: none; + } + } + + // special case for path-bars and stack-switchers + .linked:not(.vertical):not(.path-bar).stack-switcher, + .linked:not(.vertical).path-bar { + > button { + @include button(header-hover); + + &:hover { + background-color: lighten($header_button_bg, 15%); + } + &:active, + &:checked { + @include button(header-active); + } + &:disabled { + color: transparentize($header_fg, 0.4); + } + + &, + &:hover, + &:active, + &:checked, + &:disabled { + @extend %linked; + } + } + } + + // special case widgets like the linked entry and button in mintinstall toolbar + .linked:not(.vertical) entry { + box-shadow: none; + + &:focus { + @include entry(header-normal); + background-clip: padding-box; + } + + & + button:last-child { + @include button(header-hover); + + &:hover { + background-color: lighten($header_button_bg, 15%); + } + &:active, + &:checked { + @include button(header-active); + } + &:disabled { + color: transparentize($header_fg, 0.4); + background-color: transparentize($header_button_bg, 0.2); + border-color: $header_button_border; + + &:checked { + background-color: transparentize($selected_bg_color, 0.35); + color: transparentize($selected_fg_color, 0.25); + } + } + + &, + &:hover, + &:active, + &:checked, + &:disabled { + @extend %linked; + } + } + } + + // Headerbar Suggested and Destructive Action buttons + @each $b_type, $b_color in (suggested-action, $suggested_color), + (destructive-action, $destructive_color) + { + button.#{$b_type} { + @include button(suggested_destructive, $b_color); + + &.flat { + @include button(undecorated); + color: $b_color; + outline-color: transparentize($b_color, 0.7); + } + &:hover { + @include button(suggested_destructive, lighten($b_color, 10%)); + } + &:active, + &:checked { + @include button(suggested_destructive, darken($b_color, 10%)); + } + &.flat:disabled, + &:disabled { + @include button(header-insensitive); + } + } + button.#{$b_type}:backdrop, + button.#{$b_type}:backdrop { + opacity: 0.8; + } + } + + // Headerbar Spinbuttons + & spinbutton { + &:focus button { + color: $selected_fg_color; + + &:hover { + background-color: transparentize($selected_fg_color, 0.9); + border-color: transparent; + } + &:disabled { + color: transparentize($selected_fg_color, 0.6); + } + } + button { + color: $header_fg; + + &:hover { + background-color: transparentize($header_fg, 0.75); + border-color: transparent; + } + &:disabled { + color: transparentize($header_fg, 0.3); + } + &:active { + background-color: rgba(0, 0, 0, 0.1); + } + } + } + + // Headerbar ComboBoxes + combobox { + &:disabled { + color: transparentize($header_fg, 0.6); + } + + > .linked > button.combo { + @include entry(header-normal); + + &:hover { + @include entry(header-focus); + box-shadow: none; + } + &:disabled { + @include entry(header-insensitive); + } + } + + > .linked > entry.combo { + &:dir(ltr) { + border-right-style: none; + + &:focus { + box-shadow: none; + } + } + &:dir(rtl) { + border-left-style: none; + + &:focus { + box-shadow: none; + } + } + } + > .linked > button.combo { + &:dir(ltr) { + &, + &:hover, + &:active, + &:checked, + &:disabled { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } + } + &:dir(rtl) { + &, + &:hover, + &:active, + &:checked, + &:disabled { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + } + } + } + + // Headerbar Switches + switch { + &:backdrop { + opacity: 0.75; + } + } + + progressbar { + trough { + background-color: $header_button_border; + } + + &:backdrop { + opacity: 0.75; + } + } + + // Headerbar Scale + scale { + $_trough_bg: $header_button_border; + + &:backdrop { + opacity: 0.75; + } + + slider { + $_slider_border: opacify($header_button_border, 0.3); + $_slider_bg: lighten(opacify($header_bg, 1), 10%); + + background-color: $_slider_bg; + border-color: $_slider_border; + + &:hover { + background-color: lighten($_slider_bg, 5%); + border-color: $_slider_border; + } + &:active { + background-color: $selected_bg_color; + border-color: $selected_bg_color; + } + &:disabled { + background-color: mix($_slider_bg, $header_bg, 70%); + border-color: $_slider_border; + } + } + trough { + background-color: $_trough_bg; + + &:disabled { + background-color: transparentize($_trough_bg, 0.1); + } + } + } +} + +// +// Pathbars +// +.path-bar button { + &.text-button, + &.image-button, + & { + padding-left: 6px; + padding-right: 6px; + } + + &.text-button.image-button label { + padding-left: 0; + padding-right: 0; + } + + &.text-button.image-button, + & { + label:last-child { + padding-right: 10px; + } + label:first-child { + padding-left: 10px; + } + } + + &.slider-button, + &:not(.image-button):not(.text-button) { + padding-left: 1px; + padding-right: 1px; + } + + image { + padding-left: 4px; + padding-right: 4px; + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/ui/treeview.scss b/gtk-3.0/sass/ui/treeview.scss new file mode 100644 index 0000000..b3188f5 --- /dev/null +++ b/gtk-3.0/sass/ui/treeview.scss @@ -0,0 +1,162 @@ +// +// Tree Views +// +treeview.view { + @at-root * { + -GtkTreeView-horizontal-separator: 4; + -GtkTreeView-grid-line-width: 1; + -GtkTreeView-grid-line-pattern: ''; + -GtkTreeView-tree-line-width: 1; + -GtkTreeView-tree-line-pattern: ''; + -GtkTreeView-expander-size: 16; + } + + border-left-color: transparentize($fg_color, 0.85); // this is actually the tree lines color, + border-top-color: transparentize( + black, + 0.9 + ); // while this is the grid lines color, better then nothing + + rubberband { + @extend rubberband; + } // to avoid borders being overridden by the previously set props + + acceleditor > label { + background-color: $selected_bg_color; + } + + &:selected { + &, + &:focus { + border-radius: 0; + border-left-color: mix($selected_fg_color, $selected_bg_color, 50%); + border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly + + @extend %selected_items; + } + } + + &:disabled { + color: $insensitive_fg_color; + + &:selected { + color: mix($selected_fg_color, $selected_bg_color, 40%); + } + } + + &.separator { + min-height: 2px; + color: transparentize(black, 0.9); + } + + &:drop(active) { + border-style: solid none; + border-width: 1px; + border-color: mix($fg_color, $selected_bg_color, 50%); + + &.after { + border-top-style: none; + } + &.before { + border-bottom-style: none; + } + } + + &.expander { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); + &:dir(rtl) { + -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); + } + + color: mix($fg_color, $base_color, 50%); + + &:hover { + color: $fg_color; + } + + &:selected { + color: mix($selected_fg_color, $selected_bg_color, 70%); + &:hover { + color: $selected_fg_color; + } + } + + &:checked { + -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); + } + } + + &.progressbar, + &.progressbar:focus { + // progress bar in treeviews + color: $selected_fg_color; + border-radius: 2px; + background-color: $selected_bg_color; + + &:selected, + &:selected:focus { + color: $selected_bg_color; + box-shadow: none; + background-color: $selected_fg_color; + } + } + &.trough { + // progress bar trough in treeviews + color: $fg_color; + background-color: $trough_color_treeview; + border-radius: 2px; + border: 1px solid $button_border; + + &:selected, + &:selected:focus { + color: $selected_fg_color; + background-color: transparentize(black, 0.8); + border-radius: 2px; + border-width: 0; + } + } + + header { + button { + $_column_header_color: mix($fg_color, $base_color, 80%); + + padding: 3px 6px; + font-weight: bold; + + color: $_column_header_color; + background-color: darken($bg_color, 1%); + background-image: none; + border-style: none solid solid none; + border-radius: 0; + border-color: $borders_color; + + &:active, + &:hover { + background-color: lighten($bg_color, 2%); + } + &:active:hover { + color: $fg_color; + } + &:disabled { + border-color: $bg_color; + background-image: none; + } + &:last-child { + border-right-style: none; + } + } + } + + button.dnd, + header.button.dnd { + &, + &:selected, + &:hover, + &:active { + transition: none; + color: $selected_bg_color; + box-shadow: inset 1px 1px 0 1px $selected_bg_color, inset -1px 0 0 1px $selected_bg_color, + inset 1px 1px $base_color, inset -1px 0 $base_color; + } + } +} \ No newline at end of file diff --git a/gtk-3.0/sass/_ubiquity.scss b/gtk-3.0/sass/ui/ubiquity.scss similarity index 100% rename from gtk-3.0/sass/_ubiquity.scss rename to gtk-3.0/sass/ui/ubiquity.scss diff --git a/gtk-3.0/sass/var/colors.scss b/gtk-3.0/sass/var/colors.scss new file mode 100644 index 0000000..1c19d3d --- /dev/null +++ b/gtk-3.0/sass/var/colors.scss @@ -0,0 +1,124 @@ +/** + * {} + * @authors yutent + * @date 2022/05/09 11:11:02 + */ + + +$base_color: #3c4d5e; +$text_color: #dae1e9; +$bg_color: #57606f; +$fg_color: #ced6e0; + +$grey_color: #86909b; + +$selected_bg_color: rgba(100, 181, 246, 0.35); +$selected_fg_color: #f2f5fc; + +$selected_borders_color: darken($selected_bg_color, 15%); +$borders_color: $grey_color; +$separator_color: transparentize($grey_color, .5); + +$link_color: #64b5f6; +$link_visited_color: #2196f3; + +$selection_mode_bg: $selected_bg_color; +$selection_mode_fg: $selected_fg_color; + +$warning_color: #f27835; +$warning_fg_color: white; +$error_color: #fc7661; +$error_fg_color: white; +$success_color: rgb(70, 221, 126); +$destructive_color: #ff5f45; +$suggested_color: rgb(26, 196, 88); +$question_color: #64b5f6; + +$drop_target_color: $selected_bg_color; + +//insensitive state derived colors +$insensitive_fg_color: $grey_color; +$insensitive_bg_color: lighten($bg_color, 2%); + +$dim_label_fg_color: transparentize($fg_color, 0.35); + +$header_bg: $bg_color; +$header_bg_backdrop: lighten($header_bg, 3%); + +$header_border: darken($header_bg, 4%); +$header_highlight: #373737; + +$header_fg: $fg_color; + +$menu_selected_bg_color: transparentize(white, 0.9); + +$dark_sidebar_bg: #353535; +$dark_sidebar_fg: $fg_color; +$dark_sidebar_border: $borders_color; + +$filechooser_bg: $header_bg; + +$tooltip_bg_color: #fbeaa0; +$tooltip_fg_color: #4a4a4a; +$tooltip_border_color: #d0d0d0; + +$osd_fg_color: #f2f5fc; +$osd_bg_color: $base_color; + +$osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_entry_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); +$osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); + +$osd_insensitive_bg_color: darken($osd_bg_color, 3%); +$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); +$osd_borders_color: transparentize(black, 0.3); + +$panel_bg: $bg_color; +$panel_fg: $fg_color; + +$entry_bg: $base_color; +$entry_border: $borders_color; + +$header_entry_bg: transparentize($base_color, 0.1); +$header_entry_border: transparentize($header_fg, 0.7); + +$button_bg: lighten($base_color, 2%); +$button_border: $borders_color; +$button_active_bg: transparentize(black, 0.85); +$button_active_border: darken($button_border, 10%); + +$header_button_bg: transparentize($button_bg, 0.1); +$header_button_border: transparentize($header_fg, 0.7); + +$trough_color_treeview: darken($bg_color, 5%); +$trough_color: darken($bg_color, 5%); + +// WM Colors + +$wm_title: #dae1e9; +$wm_title_unfocused: #86909b; +$wm_bg: #4d535d; +$wm_bg_unfocused: #4d535d; +$wm_highlight: #57606f; +$wm_border: #57606f; +$wm_border_unfocused: #57606f; + +//WM Buttons + +// Close +$wm_button_close_bg: rgba(0,0,0,0); +$wm_button_close_hover_bg: rgba(0,0,0,0); +$wm_button_close_active_bg: rgba(0,0,0,0); + +$wm_icon_close_bg: rgba(0,0,0,0); + +// Minimize, Maximize +$wm_button_hover_bg: rgba(0,0,0,0); +$wm_button_active_bg: rgba(0,0,0,0); + +$wm_icon_bg: rgba(0,0,0,0); +$wm_icon_unfocused_bg: rgba(0,0,0,0); +$wm_icon_hover_bg: rgba(0,0,0,0); +$wm_icon_active_bg: rgba(0,0,0,0); diff --git a/gtk-3.0/sass/_drawing.scss b/gtk-3.0/sass/var/drawing.scss similarity index 58% rename from gtk-3.0/sass/_drawing.scss rename to gtk-3.0/sass/var/drawing.scss index 17b7be7..12d91af 100644 --- a/gtk-3.0/sass/_drawing.scss +++ b/gtk-3.0/sass/var/drawing.scss @@ -7,113 +7,114 @@ @return linear-gradient(to bottom, $c, $c); } -@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) { -// -// Helper function to stack up to 4 box-shadows; -// +@mixin _shadows($shadow1, $shadow2: none, $shadow3: none, $shadow4: none) { + // + // Helper function to stack up to 4 box-shadows; + // - @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; } - @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; } - @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; } - @else { box-shadow: $shadow1; } + @if $shadow4!=none { + box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; + } @else if $shadow3!=none { + box-shadow: $shadow1, $shadow2, $shadow3; + } @else if $shadow2!=none { + box-shadow: $shadow1, $shadow2; + } @else { + box-shadow: $shadow1; + } } // Entries @mixin entry($t) { -// -// Entries drawing function -// -// $t: entry type -// + // + // Entries drawing function + // + // $t: entry type + // @if $t==normal { - // - // normal entry - // + // + // normal entry + // color: $text_color; border-color: $entry_border; background-color: $entry_bg; } @if $t==focus { - // - // focused entry - // + // + // focused entry + // color: $text_color; - border-color: if($variant=='light', $selected_bg_color, $button_border); + border-color: $button_border; background-color: $entry_bg; - @if $variant == 'dark' { - box-shadow: inset 1px 0 $selected_bg_color, - inset -1px 0 $selected_bg_color, - inset 0 1px $selected_bg_color, - inset 0 -1px $selected_bg_color; - } + box-shadow: inset 1px 0 $selected_bg_color, inset -1px 0 $selected_bg_color, + inset 0 1px $selected_bg_color, inset 0 -1px $selected_bg_color; } @if $t==insensitive { - // - // insensitive entry - // + // + // insensitive entry + // color: $insensitive_fg_color; border-color: transparentize($entry_border, 0.45); background-color: transparentize($entry_bg, 0.45); } @if $t==header-normal { - // - // normal header-bar entry - // + // + // normal header-bar entry + // color: $header_fg; border-color: $header_entry_border; background-color: $header_entry_bg; - image, image:hover { color: inherit; } + image, + image:hover { + color: inherit; + } } @if $t==header-focus { - // - // focused header-bar entry - // + // + // focused header-bar entry + // color: $header_fg; border-color: $selected_bg_color; background-color: $header_entry_bg; } @if $t==header-insensitive { - // - // insensitive header-bar entry - // + // + // insensitive header-bar entry + // color: transparentize($header_fg, 0.45); background-color: transparentize($header_entry_bg, 0.15); - } - - @else if $t==osd { - // - // normal osd entry - // + } @else if $t==osd { + // + // normal osd entry + // color: $osd_fg_color; border-color: $osd_entry_border; background-color: $osd_entry_bg; - image, image:hover { color: inherit; } - } - - @else if $t==osd-focus { - // - // active osd entry - // + image, + image:hover { + color: inherit; + } + } @else if $t==osd-focus { + // + // active osd entry + // color: $selected_fg_color; border-color: $osd_entry_border; background-color: $selected_bg_color; - } - - @else if $t==osd-insensitive { - // - // insensitive osd entry - // + } @else if $t==osd-insensitive { + // + // insensitive osd entry + // color: transparentize($osd_fg_color, 0.45); background-color: transparentize($osd_entry_bg, 0.15); } @@ -121,174 +122,152 @@ // Buttons -@mixin button($t, $actionb_color:red) { -// -// Button drawing function -// -// $t: button type, -// $actionb_color: used for destructive and suggested action buttons +@mixin button($t, $actionb_color: red) { + // + // Button drawing function + // + // $t: button type, + // $actionb_color: used for destructive and suggested action buttons @if $t==normal { - // - // normal button - // + // + // normal button + // color: $fg_color; outline-color: transparentize($fg_color, 0.7); border-color: $button_border; background-color: $button_bg; - } - - @else if $t==hover { - // - // hovered button - // + } @else if $t==hover { + // + // hovered button + // color: $fg_color; outline-color: transparentize($fg_color, 0.7); border-color: $button_border; background-color: lighten($button_bg, 5%); - } - - @else if $t==active { - // - // pushed button - // + } @else if $t==active { + // + // pushed button + // color: $fg_color; outline-color: transparentize($fg_color, 0.7); border-color: $button_active_border; background-color: $button_active_bg; - } - - @else if $t==insensitive { - // - // insensitive button - // + } @else if $t==insensitive { + // + // insensitive button + // color: $insensitive_fg_color; border-color: transparentize($button_border, 0.45); background-color: transparentize($button_bg, 0.45); - label { color: inherit; } - } - - @else if $t==insensitive-active { - // - // insensitive pushed button - // + label { + color: inherit; + } + } @else if $t==insensitive-active { + // + // insensitive pushed button + // color: transparentize($fg_color, 0.2); border-color: transparentize($button_active_border, 0.15); background-color: transparentize($button_active_bg, 0.05); opacity: 0.6; - label { color: inherit; } + label { + color: inherit; + } } @if $t==header-normal { - // - // normal header-bar button - // + // + // normal header-bar button + // color: $header_fg; outline-color: transparentize($header_fg, 0.7); outline-offset: -3px; background-color: transparentize($header_bg, 1); border-color: transparentize($header_bg, 1); - } - - @else if $t==header-hover { - // - // hovered header-bar button - // + } @else if $t==header-hover { + // + // hovered header-bar button + // color: $header_fg; outline-color: transparentize($header_fg, 0.7); border-color: $header_button_border; background-color: $header_button_bg; - } - - @else if $t==header-active { - // - // pushed header-bar button - // + } @else if $t==header-active { + // + // pushed header-bar button + // color: $header_fg; outline-color: transparentize($header_fg, 0.7); - border-color: if($variant=='light', $header_button_border, $header_button_border); + border-color: $header_button_border; background-color: $button_active_bg; - } - - @else if $t==header-insensitive { - // - // insensitive header-bar button - // + } @else if $t==header-insensitive { + // + // insensitive header-bar button + // color: transparentize($header_fg, 0.45); background-color: transparentize($header_bg, 1); border-color: transparentize($header_bg, 1); - label { color: inherit; } - } - - @else if $t==header-insensitive-active { - // - // header-bar insensitive pushed button - // + label { + color: inherit; + } + } @else if $t==header-insensitive-active { + // + // header-bar insensitive pushed button + // color: transparentize($fg_color, 0.2); border-color: transparentize($button_active_border, 0.15); background-color: transparentize($button_active_bg, 0.05); - } - - @else if $t==osd { - // - // normal osd button - // + } @else if $t==osd { + // + // normal osd button + // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); border-color: $osd_button_border; background-color: $osd_button_bg; - } - - @else if $t==osd-hover { - // - // active osd button - // + } @else if $t==osd-hover { + // + // active osd button + // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); border-color: $osd_button_border; background-color: opacify(lighten($osd_button_bg, 7%), 0.1); - } - - @else if $t==osd-active { - // - // active osd button - // + } @else if $t==osd-active { + // + // active osd button + // color: $osd_fg_color; outline-color: transparentize($osd_fg_color, 0.7); border-color: $osd_button_border; background-color: transparentize(black, 0.85); - } - - @else if $t==osd-insensitive { - // - // insensitive osd button - // + } @else if $t==osd-insensitive { + // + // insensitive osd button + // color: $osd_insensitive_fg_color; border-color: $osd_button_border; background-color: transparentize($osd_button_bg, 0.15); - } - - @else if $t==suggested_destructive { - // - // suggested or destructive action buttons - // + } @else if $t==suggested_destructive { + // + // suggested or destructive action buttons + // background-clip: border-box; color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); background-color: $actionb_color; border-color: $actionb_color; - } - - @else if $t==undecorated { - // - // reset - // + } @else if $t==undecorated { + // + // reset + // border-color: transparent; background-color: transparent; background-image: none; @@ -299,23 +278,27 @@ // Titlebar circular buttons // @mixin draw_circle($c) { - background-image: -gtk-gradient(radial, - center center, 0, - center center, 0.5, - to($c), - to(transparent)); + background-image: -gtk-gradient( + radial, + center center, + 0, + center center, + 0.5, + to($c), + to(transparent) + ); } // // Overshoot // -@mixin overshoot($p, $c:$selected_bg_color) { -// $p: position -// $c: base color -// -// possible $p values: -// top, bottom, right, left -// +@mixin overshoot($p, $c: $selected_bg_color) { + // $p: position + // $c: base color + // + // possible $p values: + // top, bottom, right, left + // $_big_gradient_length: 60%; @@ -324,42 +307,42 @@ @if $p==bottom { $_position: center bottom; - } - - @else if $p==right { + } @else if $p==right { $_position: right center; $_big_gradient_size: $_big_gradient_length 100%; - } - - @else if $p==left { + } @else if $p==left { $_position: left center; $_big_gradient_size: $_big_gradient_length 100%; } - background-image: -gtk-gradient(radial, - $_position, 0, - $_position, 0.6, - from(transparentize($c, 0.8)), - to(transparentize($c, 1))); + background-image: -gtk-gradient( + radial, + $_position, + 0, + $_position, + 0.6, + from(transparentize($c, 0.8)), + to(transparentize($c, 1)) + ); background-size: $_big_gradient_size; background-repeat: no-repeat; background-position: $_position; background-color: transparent; // reset some properties to be sure to not inherit them somehow - border: none; // - box-shadow: none; // + border: none; // + box-shadow: none; // } // // Undershoot // @mixin undershoot($p) { -// $p: position -// -// possible $p values: -// top, bottom, right, left -// + // $p: position + // + // possible $p values: + // top, bottom, right, left + // $_undershoot_color_dark: transparentize(black, 0.8); $_undershoot_color_light: transparentize(white, 0.8); @@ -378,9 +361,12 @@ $_bg_pos: $p center; } - background-image: linear-gradient(to $_gradient_dir, // this is the dashed line - $_undershoot_color_light 50%, - $_undershoot_color_dark 50%); + background-image: linear-gradient( + to $_gradient_dir, + // this is the dashed line + $_undershoot_color_light 50%, + $_undershoot_color_dark 50% + ); padding-#{$p}: 1px; background-size: $_dash_bg_size; diff --git a/metacity-1/metacity-theme-3.xml b/metacity-1/metacity-theme-3.xml index da8f97e..cb6567d 100644 --- a/metacity-1/metacity-theme-3.xml +++ b/metacity-1/metacity-theme-3.xml @@ -32,7 +32,7 @@ - + @@ -44,20 +44,16 @@ - - - - - + - + @@ -261,21 +257,21 @@ - + - + - + - + @@ -349,81 +345,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/update-theme.sh b/update-theme.sh index b37f3b4..0609859 100755 --- a/update-theme.sh +++ b/update-theme.sh @@ -1,11 +1,11 @@ # 控件主题 -# echo "重置控件主题……" -# gsettings set org.cinnamon.desktop.interface gtk-theme "Mint-Y" -# echo "重置完成, 0.5秒之后, 修改为one-dark" -# sleep 0.5 -# gsettings set org.cinnamon.desktop.interface gtk-theme "one-dark" +echo "重置控件主题……" +gsettings set org.cinnamon.desktop.interface gtk-theme "Mint-Y" +echo "重置完成, 0.5秒之后, 修改为one-dark" +sleep 0.5 +gsettings set org.cinnamon.desktop.interface gtk-theme "one-dark" # 鼠标主题 # gsettings set org.cinnamon.desktop.interface cursor-theme "Adwaita" @@ -21,8 +21,8 @@ # gsettings set org.cinnamon.theme name "one-dark" # 窗口主题 -echo "重置窗口主题……" -gsettings set org.cinnamon.desktop.wm.preferences theme "Mint-Y" -echo "重置完成, 0.5秒之后, 修改为one-dark" -sleep 0.5 -gsettings set org.cinnamon.desktop.wm.preferences theme "one-dark" \ No newline at end of file +# echo "重置窗口主题……" +# gsettings set org.cinnamon.desktop.wm.preferences theme "Mint-Y" +# echo "重置完成, 0.5秒之后, 修改为one-dark" +# sleep 0.5 +# gsettings set org.cinnamon.desktop.wm.preferences theme "one-dark" \ No newline at end of file diff --git a/xfwm4/assets.svg b/xfwm4/assets.svg index caf9277..e11ed84 100644 --- a/xfwm4/assets.svg +++ b/xfwm4/assets.svg @@ -1,2484 +1,882 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + - - - - - - + + + + - - - - - - + + + + - - - - - - + + + - - - - + + + - - + + + - - - - - - + + + - - - - + + + + - - + + + - - - - - - + + + + - - + + + + - - - - - - + + + - - - - + + + + - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xfwm4/render-assets.sh b/xfwm4/render-assets.sh index b0c9387..893b14d 100644 --- a/xfwm4/render-assets.sh +++ b/xfwm4/render-assets.sh @@ -17,13 +17,12 @@ mkdir -p $ASSETS_DIR for i in `cat $INDEX` do -if ! [ -f $ASSETS_DIR/$i.png ]; then - echo Rendering $ASSETS_DIR/$i.png + echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null - $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi + $INKSCAPE --export-id=$i \ + --export-id-only \ + --export-type=png \ + -o $ASSETS_DIR/$i.png $SRC_FILE >/dev/null + $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png done exit 0