From 20c6c0a5597038bd1aab950eaaa75bb6a9436593 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 20 Apr 2016 14:21:48 +0200 Subject: [PATCH 1/4] update nemo styling --- common/gtk-3.0/3.20/gtk-dark.css | 82 ++++++++++++++++--- common/gtk-3.0/3.20/gtk-darker.css | 81 +++++++++++++++--- common/gtk-3.0/3.20/gtk-solid-dark.css | 82 ++++++++++++++++--- common/gtk-3.0/3.20/gtk-solid-darker.css | 81 +++++++++++++++--- common/gtk-3.0/3.20/gtk-solid.css | 81 +++++++++++++++--- common/gtk-3.0/3.20/gtk.css | 81 +++++++++++++++--- common/gtk-3.0/3.20/sass/_applications.scss | 74 ++++++++--------- .../3.20/sass/_transparent_widgets.scss | 55 +++++-------- 8 files changed, 464 insertions(+), 153 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index a016332..3d88230 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -672,20 +672,20 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu .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, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { +.linked:not(.vertical) > button:checked, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child { +.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -3035,7 +3035,7 @@ textview text selection, flowbox flowboxchild:selected, entry selection:focus, e modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, -modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3049,7 +3049,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, - modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3062,7 +3062,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, - modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover { color: #a9caf1; } @@ -3135,6 +3135,50 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can animation: needs_attention_keyframes 3s ease-in-out; animation-iteration-count: 3; } +.nemo-window .nemo-places-sidebar.frame { + border-width: 0; } + +.nemo-window notebook { + background-color: #404552; } + +.nemo-window .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + color: #D3DAE3; + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); + box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2, inset 0 1px #5294E2, inset 0 -1px #5294E2; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button { + color: rgba(207, 218, 231, 0.8); + outline-color: rgba(207, 218, 231, 0.1); + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:not(:last-child):not(:only-child) { + margin: 0 0 1px 0; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover { + background-color: rgba(134, 144, 165, 0.37); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: transparent; + background-color: #5294E2; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled { + color: rgba(207, 218, 231, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button { + border-left-style: none; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #404552; } @@ -3848,6 +3892,18 @@ filechooser.maximized placessidebar.sidebar, .nautilus-window.maximized placessidebar.sidebar { background-color: #353945; } +.nemo-window .sidebar { + color: #BAC3CF; + background-color: rgba(53, 57, 69, 0.95); } + .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { + background-color: transparent; + color: #BAC3CF; } + .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { + background-color: #5294E2; + color: #ffffff; } + .nemo-window .sidebar separator { + background-color: transparent; } + filechooser actionbar { color: #BAC3CF; background-color: rgba(53, 57, 69, 0.95); @@ -3914,25 +3970,25 @@ filechooser actionbar entry { background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { +.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider { +.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { background-color: rgba(231, 234, 238, 0.7); } filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover { + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { background-color: #f6f7f9; } filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active { + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { background-color: #5294E2; } filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled { + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { background-color: transparent; } filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough { +.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { background-color: rgba(0, 0, 0, 0.2); border: none; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 71c6979..a056c8f 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -671,20 +671,20 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu .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, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { +.linked:not(.vertical) > button:checked, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child { +.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -3034,7 +3034,7 @@ textview text selection, flowbox flowboxchild:selected, entry selection:focus, e modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, -modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3048,7 +3048,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, - modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3061,7 +3061,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, - modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover { color: #a9caf1; } @@ -3134,6 +3134,49 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can animation: needs_attention_keyframes 3s ease-in-out; animation-iteration-count: 3; } +.nemo-window .nemo-places-sidebar.frame { + border-width: 0; } + +.nemo-window notebook { + background-color: #ffffff; } + +.nemo-window .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + color: #5c616c; + border-color: #5294E2; + background-color: #ffffff; + background-image: linear-gradient(to bottom, #ffffff); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button { + color: rgba(207, 218, 231, 0.8); + outline-color: rgba(207, 218, 231, 0.1); + border-color: rgba(21, 23, 28, 0.37); + background-color: rgba(95, 105, 127, 0.37); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:not(:last-child):not(:only-child) { + margin: 0 0 1px 0; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover { + background-color: rgba(134, 144, 165, 0.37); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: transparent; + background-color: #5294E2; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled { + color: rgba(207, 218, 231, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button { + border-left-style: none; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } @@ -3847,6 +3890,18 @@ filechooser.maximized placessidebar.sidebar, .nautilus-window.maximized placessidebar.sidebar { background-color: #353945; } +.nemo-window .sidebar { + color: #BAC3CF; + background-color: rgba(53, 57, 69, 0.95); } + .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { + background-color: transparent; + color: #BAC3CF; } + .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { + background-color: #5294E2; + color: #ffffff; } + .nemo-window .sidebar separator { + background-color: transparent; } + filechooser actionbar { color: #BAC3CF; background-color: rgba(53, 57, 69, 0.95); @@ -3913,25 +3968,25 @@ filechooser actionbar entry { background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { +.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider { +.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { background-color: rgba(231, 234, 238, 0.7); } filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover { + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { background-color: #f6f7f9; } filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active { + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { background-color: #5294E2; } filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled { + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { background-color: transparent; } filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough { +.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { background-color: rgba(0, 0, 0, 0.2); border: none; } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index b00ca95..f1631a3 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -672,20 +672,20 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu .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, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { +.linked:not(.vertical) > button:checked, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child { +.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -3035,7 +3035,7 @@ textview text selection, flowbox flowboxchild:selected, entry selection:focus, e modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, -modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3049,7 +3049,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, - modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3062,7 +3062,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, - modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover { color: #a9caf1; } @@ -3135,6 +3135,50 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can animation: needs_attention_keyframes 3s ease-in-out; animation-iteration-count: 3; } +.nemo-window .nemo-places-sidebar.frame { + border-width: 0; } + +.nemo-window notebook { + background-color: #404552; } + +.nemo-window .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + color: #D3DAE3; + border-color: #2b2e39; + background-color: #404552; + background-image: linear-gradient(to bottom, #404552); + box-shadow: inset 1px 0 #5294E2, inset -1px 0 #5294E2, inset 0 1px #5294E2, inset 0 -1px #5294E2; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button { + color: rgba(207, 218, 231, 0.8); + outline-color: rgba(207, 218, 231, 0.1); + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:not(:last-child):not(:only-child) { + margin: 0 0 1px 0; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover { + background-color: rgba(134, 144, 165, 0.4); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: transparent; + background-color: #5294E2; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled { + color: rgba(207, 218, 231, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button { + border-left-style: none; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #404552; } @@ -3848,6 +3892,18 @@ filechooser.maximized placessidebar.sidebar, .nautilus-window.maximized placessidebar.sidebar { background-color: #353945; } +.nemo-window .sidebar { + color: #BAC3CF; + background-color: #353945; } + .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { + background-color: transparent; + color: #BAC3CF; } + .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { + background-color: #5294E2; + color: #ffffff; } + .nemo-window .sidebar separator { + background-color: transparent; } + filechooser actionbar { color: #BAC3CF; background-color: #353945; @@ -3914,25 +3970,25 @@ filechooser actionbar entry { background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { +.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider { +.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { background-color: rgba(231, 234, 238, 0.7); } filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover { + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { background-color: #f6f7f9; } filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active { + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { background-color: #5294E2; } filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled { + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { background-color: transparent; } filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough { +.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { background-color: rgba(0, 0, 0, 0.2); border: none; } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index dd1ef92..59e204f 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -671,20 +671,20 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu .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, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { +.linked:not(.vertical) > button:checked, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child { +.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -3034,7 +3034,7 @@ textview text selection, flowbox flowboxchild:selected, entry selection:focus, e modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, -modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3048,7 +3048,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, - modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3061,7 +3061,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, - modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover { color: #a9caf1; } @@ -3134,6 +3134,49 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can animation: needs_attention_keyframes 3s ease-in-out; animation-iteration-count: 3; } +.nemo-window .nemo-places-sidebar.frame { + border-width: 0; } + +.nemo-window notebook { + background-color: #ffffff; } + +.nemo-window .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + color: #5c616c; + border-color: #5294E2; + background-color: #ffffff; + background-image: linear-gradient(to bottom, #ffffff); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button { + color: rgba(207, 218, 231, 0.8); + outline-color: rgba(207, 218, 231, 0.1); + border-color: rgba(21, 23, 28, 0.4); + background-color: rgba(95, 105, 127, 0.4); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:not(:last-child):not(:only-child) { + margin: 0 0 1px 0; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover { + background-color: rgba(134, 144, 165, 0.4); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: transparent; + background-color: #5294E2; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled { + color: rgba(207, 218, 231, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button { + border-left-style: none; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover { + box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { + box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } @@ -3847,6 +3890,18 @@ filechooser.maximized placessidebar.sidebar, .nautilus-window.maximized placessidebar.sidebar { background-color: #353945; } +.nemo-window .sidebar { + color: #BAC3CF; + background-color: #353945; } + .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { + background-color: transparent; + color: #BAC3CF; } + .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { + background-color: #5294E2; + color: #ffffff; } + .nemo-window .sidebar separator { + background-color: transparent; } + filechooser actionbar { color: #BAC3CF; background-color: #353945; @@ -3913,25 +3968,25 @@ filechooser actionbar entry { background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { +.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider { +.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { background-color: rgba(231, 234, 238, 0.7); } filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover { + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { background-color: #f6f7f9; } filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active { + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { background-color: #5294E2; } filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled { + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { background-color: transparent; } filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough { +.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { background-color: rgba(0, 0, 0, 0.2); border: none; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index cd1b845..178cf46 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -671,20 +671,20 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu .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, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { +.linked:not(.vertical) > button:checked, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child { +.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -3038,7 +3038,7 @@ textview text selection, flowbox flowboxchild:selected, entry selection:focus, e modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, -modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3052,7 +3052,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, - modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3065,7 +3065,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, - modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover { color: #a9caf1; } @@ -3138,6 +3138,49 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can animation: needs_attention_keyframes 3s ease-in-out; animation-iteration-count: 3; } +.nemo-window .nemo-places-sidebar.frame { + border-width: 0; } + +.nemo-window notebook { + background-color: #ffffff; } + +.nemo-window .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + color: #5c616c; + border-color: #5294E2; + background-color: #ffffff; + background-image: linear-gradient(to bottom, #ffffff); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button { + color: rgba(82, 93, 118, 0.8); + outline-color: rgba(82, 93, 118, 0.1); + border-color: rgba(82, 93, 118, 0.1); + background-color: rgba(251, 251, 252, 0.9); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:not(:last-child):not(:only-child) { + margin: 0 0 1px 0; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover { + background-color: rgba(255, 255, 255, 0.9); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-color: #5294E2; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled { + color: rgba(82, 93, 118, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button { + border-left-style: none; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } @@ -3851,6 +3894,18 @@ filechooser.maximized placessidebar.sidebar, .nautilus-window.maximized placessidebar.sidebar { background-color: #353945; } +.nemo-window .sidebar { + color: #BAC3CF; + background-color: #353945; } + .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { + background-color: transparent; + color: #BAC3CF; } + .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { + background-color: #5294E2; + color: #ffffff; } + .nemo-window .sidebar separator { + background-color: transparent; } + filechooser actionbar { color: #BAC3CF; background-color: #353945; @@ -3917,25 +3972,25 @@ filechooser actionbar entry { background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); } filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { +.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider { +.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { background-color: rgba(231, 234, 238, 0.7); } filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover { + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { background-color: #f6f7f9; } filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active { + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { background-color: #5294E2; } filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled { + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { background-color: transparent; } filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough { +.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { background-color: rgba(0, 0, 0, 0.2); border: none; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index b2c9656..c85f2d9 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -671,20 +671,20 @@ toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > bu .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, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { +.linked:not(.vertical) > button:checked, spinbutton:not(.vertical) button, spinbutton:not(.vertical) entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled, .linked:not(.vertical) > combobox > box > button.combo:dir(ltr) { border-radius: 0; border-right-style: none; } -.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child { +.linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, spinbutton:not(.vertical) button:first-child, spinbutton:not(.vertical) entry:first-child, .linked:not(.vertical) > combobox:first-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:first-child { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child { +.linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, spinbutton:not(.vertical) button:last-child, spinbutton:not(.vertical) entry:last-child, .linked:not(.vertical) > combobox:last-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:last-child { border-top-right-radius: 3px; border-bottom-right-radius: 3px; border-right-style: solid; } -.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child { +.linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, spinbutton:not(.vertical) button:only-child, spinbutton:not(.vertical) entry:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:only-child { border-radius: 3px; border-style: solid; } @@ -3038,7 +3038,7 @@ textview text selection, flowbox flowboxchild:selected, entry selection:focus, e modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, -modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3052,7 +3052,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, - modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, filechooser placessidebar.sidebar row.sidebar-row.has-open-popup:selected, filechooser placessidebar.sidebar row.sidebar-row:selected, filechooser placessidebar.sidebar row.sidebar-row:selected:hover, filechooser placessidebar.sidebar row.sidebar-row:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:selected:hover, @@ -3065,7 +3065,7 @@ modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected: modelbutton.flat:disabled:active, modelbutton.flat:active arrow:disabled, modelbutton.flat:disabled:selected, - modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nemo-window .nemo-window-pane widget.entry:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:selected, filechooser placessidebar.sidebar row.sidebar-row:disabled:active:hover, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:selected, .nautilus-window placessidebar.sidebar row.sidebar-row:disabled:active:hover { color: #a9caf1; } @@ -3138,6 +3138,49 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can animation: needs_attention_keyframes 3s ease-in-out; animation-iteration-count: 3; } +.nemo-window .nemo-places-sidebar.frame { + border-width: 0; } + +.nemo-window notebook { + background-color: #ffffff; } + +.nemo-window .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + color: #5c616c; + border-color: #5294E2; + background-color: #ffffff; + background-image: linear-gradient(to bottom, #ffffff); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button { + color: rgba(82, 93, 118, 0.8); + outline-color: rgba(82, 93, 118, 0.1); + border-color: rgba(82, 93, 118, 0.1); + background-color: rgba(251, 251, 252, 0.9); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:not(:last-child):not(:only-child) { + margin: 0 0 1px 0; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover { + background-color: rgba(255, 255, 255, 0.9); } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-color: #5294E2; } + .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:disabled { + color: rgba(82, 93, 118, 0.4); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button { + border-left-style: none; } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover { + box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); } + +.nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover { + box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); } + .open-document-selector-treeview.view, iconview.open-document-selector-treeview { padding: 3px 6px 3px 6px; border-color: #ffffff; } @@ -3851,6 +3894,18 @@ filechooser.maximized placessidebar.sidebar, .nautilus-window.maximized placessidebar.sidebar { background-color: #353945; } +.nemo-window .sidebar { + color: #BAC3CF; + background-color: rgba(53, 57, 69, 0.95); } + .nemo-window .sidebar .view, .nemo-window .sidebar iconview, .nemo-window .sidebar row { + background-color: transparent; + color: #BAC3CF; } + .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { + background-color: #5294E2; + color: #ffffff; } + .nemo-window .sidebar separator { + background-color: transparent; } + filechooser actionbar { color: #BAC3CF; background-color: rgba(53, 57, 69, 0.95); @@ -3917,25 +3972,25 @@ filechooser actionbar entry { background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); } filechooser placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, -.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { +.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, .nemo-window .sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { background-color: #e7eaee; border: 1px solid rgba(0, 0, 0, 0.3); } filechooser placessidebar.sidebar scrollbar slider, -.nautilus-window placessidebar.sidebar scrollbar slider { +.nautilus-window placessidebar.sidebar scrollbar slider, .nemo-window .sidebar scrollbar slider { background-color: rgba(231, 234, 238, 0.7); } filechooser placessidebar.sidebar scrollbar slider:hover, - .nautilus-window placessidebar.sidebar scrollbar slider:hover { + .nautilus-window placessidebar.sidebar scrollbar slider:hover, .nemo-window .sidebar scrollbar slider:hover { background-color: #f6f7f9; } filechooser placessidebar.sidebar scrollbar slider:hover:active, - .nautilus-window placessidebar.sidebar scrollbar slider:hover:active { + .nautilus-window placessidebar.sidebar scrollbar slider:hover:active, .nemo-window .sidebar scrollbar slider:hover:active { background-color: #5294E2; } filechooser placessidebar.sidebar scrollbar slider:disabled, - .nautilus-window placessidebar.sidebar scrollbar slider:disabled { + .nautilus-window placessidebar.sidebar scrollbar slider:disabled, .nemo-window .sidebar scrollbar slider:disabled { background-color: transparent; } filechooser placessidebar.sidebar scrollbar trough, -.nautilus-window placessidebar.sidebar scrollbar trough { +.nautilus-window placessidebar.sidebar scrollbar trough, .nemo-window .sidebar scrollbar trough { background-color: rgba(0, 0, 0, 0.2); border: none; } diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss index 50d8dc4..543d4a6 100644 --- a/common/gtk-3.0/3.20/sass/_applications.scss +++ b/common/gtk-3.0/3.20/sass/_applications.scss @@ -139,47 +139,39 @@ $disk_space_free: darken($bg_color, 3%); // .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -//NemoWindow { -// -// EelEditableLabel { transition: none; } // Workaround for invisible text in rename entry -// -// .sidebar .frame { border-width: 0; } -// -// separator.horizontal { color: $borders_color; } -// -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.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); } -// } -// -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button, -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover, -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active, -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked, -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled { -// @extend %linked; -// @extend %linked_button; -// } -// -// .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { -// -// $_linked_separator_color: $header_button_border; -// -// > button:hover:not(:checked):not(:active):not(:only-child) { -// -// &:hover { -// box-shadow: inset 1px 0 $_linked_separator_color, -// inset -1px 0 $_linked_separator_color; -// } -// &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; } -// &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; } -// } -// } -//} +.nemo-window { + + .nemo-places-sidebar.frame { border-width: 0; } + notebook { background-color: $base_color; } + + // Rename entry + .nemo-window-pane widget.entry { + border: 1px solid; + border-radius: 3px; + + @include entry(focus); + + &:selected { &:focus, & { @extend %selected_items; }} + } + + // Pathbar + .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) { + + > button { + &:not(:last-child):not(:only-child) { margin: 0 0 1px 0; } + + @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; } + } + + @include pathbar_linking_rules($sep_color:$header_button_border); + } +} // // Gedit diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index e6833fc..6f36439 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -1,6 +1,6 @@ -//NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar +//.nemo-window GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar -//NemoWindow, +//.nemo-window, .nautilus-window { paned > separator { background-image: linear-gradient(to top, $dark_sidebar_border); @@ -76,39 +76,26 @@ filechooser, } -//NemoWindow, -//MarlinViewWindow { -// -// &.csd.background, -// .source-list, .source-list.view, .source-list.view:hover { background-color: transparent; } -// -// .sidebar, .source-list.sidebar.view { -// background-color: $dark_sidebar_bg; -// -// .view, row { -// background-color: transparent; -// color: $dark_sidebar_fg; -// -// &.cell:selected { -// background-color: $selected_bg_color; -// color: $selected_fg_color; -// } -// } -// -// &.frame { -// color: $dark_sidebar_fg; -// } -// -// separator { color: transparent; } -// -// scrollbar { @extend %dark_sidebar_scrollbar } -// } -// &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } -// -//} +.nemo-window { + .sidebar { + color: $dark_sidebar_fg; + background-color: $dark_sidebar_bg; -//NemoWindow.background > GtkGrid > paned > separator, -//MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border } + .view, row { + background-color: transparent; + color: $dark_sidebar_fg; + + &.cell:selected { + background-color: $selected_bg_color; + color: $selected_fg_color; + } + } + + separator { background-color: transparent; } + + scrollbar { @extend %dark_sidebar_scrollbar } + } +} filechooser { From 36155980a5e61a667949c914f1010ec7726176b2 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 20 Apr 2016 14:25:06 +0200 Subject: [PATCH 2/4] nautilus: don't hide pane separator in dark variant (fix #459) --- common/gtk-3.0/3.20/gtk-dark.css | 8 ++++---- common/gtk-3.0/3.20/gtk-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid-dark.css | 8 ++++---- common/gtk-3.0/3.20/gtk-solid-darker.css | 4 ++++ common/gtk-3.0/3.20/gtk-solid.css | 4 ++++ common/gtk-3.0/3.20/gtk.css | 4 ++++ common/gtk-3.0/3.20/sass/_transparent_widgets.scss | 13 ++++++++++--- 7 files changed, 34 insertions(+), 11 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 3d88230..f27e5d2 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -3809,10 +3809,6 @@ GtkListBox .h4 { .nautilus-window paned > separator { background-image: linear-gradient(to top, rgba(42, 45, 55, 0.95)); } - .nautilus-window paned > separator:dir(ltr) { - margin-left: -1px; } - .nautilus-window paned > separator:dir(rtl) { - margin-right: -1px; } filechooser paned > separator { background-image: linear-gradient(to top, rgba(42, 45, 55, 0.95)); } @@ -3901,6 +3897,10 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } + .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { + color: rgba(123, 129, 141, 0.975); } + .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { + color: #BAC3CF; } .nemo-window .sidebar separator { background-color: transparent; } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index a056c8f..bc61f3b 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -3899,6 +3899,10 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } + .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { + color: rgba(123, 129, 141, 0.975); } + .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { + color: #BAC3CF; } .nemo-window .sidebar separator { background-color: transparent; } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index f1631a3..f1a4f92 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -3809,10 +3809,6 @@ GtkListBox .h4 { .nautilus-window paned > separator { background-image: linear-gradient(to top, #2a2d37); } - .nautilus-window paned > separator:dir(ltr) { - margin-left: -1px; } - .nautilus-window paned > separator:dir(rtl) { - margin-right: -1px; } filechooser paned > separator { background-image: linear-gradient(to top, #2a2d37); } @@ -3901,6 +3897,10 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } + .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { + color: #787e8a; } + .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { + color: #BAC3CF; } .nemo-window .sidebar separator { background-color: transparent; } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 59e204f..1b0081a 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -3899,6 +3899,10 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } + .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { + color: #787e8a; } + .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { + color: #BAC3CF; } .nemo-window .sidebar separator { background-color: transparent; } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 178cf46..0fc5610 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -3903,6 +3903,10 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } + .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { + color: #787e8a; } + .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { + color: #BAC3CF; } .nemo-window .sidebar separator { background-color: transparent; } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index c85f2d9..691808e 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -3903,6 +3903,10 @@ filechooser.maximized placessidebar.sidebar, .nemo-window .sidebar .view.cell:selected, .nemo-window .sidebar iconview.cell:selected, .nemo-window .sidebar row.cell:selected { background-color: #5294E2; color: #ffffff; } + .nemo-window .sidebar .view.expander, .nemo-window .sidebar iconview.expander, .nemo-window .sidebar row.expander { + color: rgba(123, 129, 141, 0.975); } + .nemo-window .sidebar .view.expander:hover, .nemo-window .sidebar iconview.expander:hover, .nemo-window .sidebar row.expander:hover { + color: #BAC3CF; } .nemo-window .sidebar separator { background-color: transparent; } diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss index 6f36439..27611ce 100644 --- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss @@ -5,8 +5,10 @@ paned > separator { background-image: linear-gradient(to top, $dark_sidebar_border); - &:dir(ltr) { margin-left: -1px; } - &:dir(rtl) { margin-right: -1px; } + @if $variant=='light' { + &:dir(ltr) { margin-left: -1px; } + &:dir(rtl) { margin-right: -1px; } + } } } @@ -75,7 +77,6 @@ filechooser, &.maximized placessidebar.sidebar { background-color: opacify($dark_sidebar_bg, 1); } } - .nemo-window { .sidebar { color: $dark_sidebar_fg; @@ -89,6 +90,12 @@ filechooser, background-color: $selected_bg_color; color: $selected_fg_color; } + + &.expander { + color: mix($dark_sidebar_fg, $dark_sidebar_bg, 50%); + + &:hover { color: $dark_sidebar_fg; } + } } separator { background-color: transparent; } From 935b23cc0723233861ba9c79a3aa4efb44997b3d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Wed, 20 Apr 2016 14:41:06 +0200 Subject: [PATCH 3/4] add a temporary workaround to make firefox scrollbars visible with gtk 3.20 --- common/gtk-3.0/3.20/gtk-dark.css | 85 +++++++++++++++++------- common/gtk-3.0/3.20/gtk-darker.css | 85 +++++++++++++++++------- common/gtk-3.0/3.20/gtk-solid-dark.css | 85 +++++++++++++++++------- common/gtk-3.0/3.20/gtk-solid-darker.css | 85 +++++++++++++++++------- common/gtk-3.0/3.20/gtk-solid.css | 85 +++++++++++++++++------- common/gtk-3.0/3.20/gtk.css | 85 +++++++++++++++++------- common/gtk-3.0/3.20/sass/_common.scss | 12 ++-- 7 files changed, 374 insertions(+), 148 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index f27e5d2..ddd8cbf 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1762,85 +1762,122 @@ notebook { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } -scrollbar button { +scrollbar button, +.scrollbar button { border: none; } -scrollbar.vertical button.down { +scrollbar.vertical button.down, +.scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -scrollbar.vertical button.up { +scrollbar.vertical button.up, +.scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -scrollbar.horizontal button.down { +scrollbar.horizontal button.down, +.scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } -scrollbar.horizontal button.up { +scrollbar.horizontal button.up, +.scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } -scrollbar.overlay-indicator:not(.dragging):not(.hovering) { +scrollbar.overlay-indicator:not(.dragging):not(.hovering), +.scrollbar.overlay-indicator:not(.dragging):not(.hovering) { opacity: 0.4; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; background-color: #a5abb5; border: 1px solid rgba(0, 0, 0, 0.3); background-clip: padding-box; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { border-style: none; background-color: transparent; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { min-width: 4px; margin-top: 2px; margin-bottom: 2px; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { min-height: 4px; margin-left: 2px; margin-right: 2px; } -scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { +scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering, +.scrollbar.overlay-indicator.dragging, +.scrollbar.overlay-indicator.hovering { opacity: 0.99; } -scrollbar trough { +scrollbar trough, +.scrollbar trough { background-color: #3e434f; border: 1px none #2b2e39; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { background-color: #767b87; } - scrollbar slider:hover { + scrollbar slider:hover, + scrollbar .slider:hover, + .scrollbar slider:hover, + .scrollbar .slider:hover { background-color: #676b78; } - scrollbar slider:hover:active { + scrollbar slider:hover:active, + scrollbar .slider:hover:active, + .scrollbar slider:hover:active, + .scrollbar .slider:hover:active { background-color: #5294E2; } - scrollbar slider:disabled { + scrollbar slider:disabled, + scrollbar .slider:disabled, + .scrollbar slider:disabled, + .scrollbar .slider:disabled { background-color: transparent; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { border-radius: 100px; margin: 3px; } -scrollbar.vertical.fine-tune slider { +scrollbar.vertical.fine-tune slider, +.scrollbar.vertical.fine-tune slider { min-width: 4px; margin: 4px; } -scrollbar.vertical slider { +scrollbar.vertical slider, +.scrollbar.vertical slider { min-height: 42px; min-width: 6px; margin: 3px; } -scrollbar.vertical trough:dir(ltr) { +scrollbar.vertical trough:dir(ltr), +.scrollbar.vertical trough:dir(ltr) { border-left-style: solid; } -scrollbar.vertical trough:dir(rtl) { +scrollbar.vertical trough:dir(rtl), +.scrollbar.vertical trough:dir(rtl) { border-right-style: solid; } -scrollbar.horizontal.fine-tune slider { +scrollbar.horizontal.fine-tune slider, +.scrollbar.horizontal.fine-tune slider { min-height: 4px; margin: 4px; } -scrollbar.horizontal slider { +scrollbar.horizontal slider, +scrollbar.horizontal .slider, +.scrollbar.horizontal slider, +.scrollbar.horizontal .slider { min-height: 6px; min-width: 42px; margin-top: 3px; } -scrollbar.horizontal trough { +scrollbar.horizontal trough, +.scrollbar.horizontal trough { border-top-style: solid; } switch { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index bc61f3b..fb0032c 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1761,85 +1761,122 @@ notebook { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } -scrollbar button { +scrollbar button, +.scrollbar button { border: none; } -scrollbar.vertical button.down { +scrollbar.vertical button.down, +.scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -scrollbar.vertical button.up { +scrollbar.vertical button.up, +.scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -scrollbar.horizontal button.down { +scrollbar.horizontal button.down, +.scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } -scrollbar.horizontal button.up { +scrollbar.horizontal button.up, +.scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } -scrollbar.overlay-indicator:not(.dragging):not(.hovering) { +scrollbar.overlay-indicator:not(.dragging):not(.hovering), +.scrollbar.overlay-indicator:not(.dragging):not(.hovering) { opacity: 0.4; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; background-color: #8a8e96; border: 1px solid rgba(255, 255, 255, 0.6); background-clip: padding-box; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { border-style: none; background-color: transparent; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { min-width: 4px; margin-top: 2px; margin-bottom: 2px; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { min-height: 4px; margin-left: 2px; margin-right: 2px; } -scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { +scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering, +.scrollbar.overlay-indicator.dragging, +.scrollbar.overlay-indicator.hovering { opacity: 0.99; } -scrollbar trough { +scrollbar trough, +.scrollbar trough { background-color: #fcfcfc; border: 1px none #dcdfe3; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { background-color: #b8babf; } - scrollbar slider:hover { + scrollbar slider:hover, + scrollbar .slider:hover, + .scrollbar slider:hover, + .scrollbar .slider:hover { background-color: #c7c9cd; } - scrollbar slider:hover:active { + scrollbar slider:hover:active, + scrollbar .slider:hover:active, + .scrollbar slider:hover:active, + .scrollbar .slider:hover:active { background-color: #5294E2; } - scrollbar slider:disabled { + scrollbar slider:disabled, + scrollbar .slider:disabled, + .scrollbar slider:disabled, + .scrollbar .slider:disabled { background-color: transparent; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { border-radius: 100px; margin: 3px; } -scrollbar.vertical.fine-tune slider { +scrollbar.vertical.fine-tune slider, +.scrollbar.vertical.fine-tune slider { min-width: 4px; margin: 4px; } -scrollbar.vertical slider { +scrollbar.vertical slider, +.scrollbar.vertical slider { min-height: 42px; min-width: 6px; margin: 3px; } -scrollbar.vertical trough:dir(ltr) { +scrollbar.vertical trough:dir(ltr), +.scrollbar.vertical trough:dir(ltr) { border-left-style: solid; } -scrollbar.vertical trough:dir(rtl) { +scrollbar.vertical trough:dir(rtl), +.scrollbar.vertical trough:dir(rtl) { border-right-style: solid; } -scrollbar.horizontal.fine-tune slider { +scrollbar.horizontal.fine-tune slider, +.scrollbar.horizontal.fine-tune slider { min-height: 4px; margin: 4px; } -scrollbar.horizontal slider { +scrollbar.horizontal slider, +scrollbar.horizontal .slider, +.scrollbar.horizontal slider, +.scrollbar.horizontal .slider { min-height: 6px; min-width: 42px; margin-top: 3px; } -scrollbar.horizontal trough { +scrollbar.horizontal trough, +.scrollbar.horizontal trough { border-top-style: solid; } switch { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index f1a4f92..dfe01e3 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1762,85 +1762,122 @@ notebook { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } -scrollbar button { +scrollbar button, +.scrollbar button { border: none; } -scrollbar.vertical button.down { +scrollbar.vertical button.down, +.scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -scrollbar.vertical button.up { +scrollbar.vertical button.up, +.scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -scrollbar.horizontal button.down { +scrollbar.horizontal button.down, +.scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } -scrollbar.horizontal button.up { +scrollbar.horizontal button.up, +.scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } -scrollbar.overlay-indicator:not(.dragging):not(.hovering) { +scrollbar.overlay-indicator:not(.dragging):not(.hovering), +.scrollbar.overlay-indicator:not(.dragging):not(.hovering) { opacity: 0.4; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; background-color: #a5abb5; border: 1px solid rgba(0, 0, 0, 0.3); background-clip: padding-box; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { border-style: none; background-color: transparent; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { min-width: 4px; margin-top: 2px; margin-bottom: 2px; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { min-height: 4px; margin-left: 2px; margin-right: 2px; } -scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { +scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering, +.scrollbar.overlay-indicator.dragging, +.scrollbar.overlay-indicator.hovering { opacity: 0.99; } -scrollbar trough { +scrollbar trough, +.scrollbar trough { background-color: #3e434f; border: 1px none #2b2e39; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { background-color: #767b87; } - scrollbar slider:hover { + scrollbar slider:hover, + scrollbar .slider:hover, + .scrollbar slider:hover, + .scrollbar .slider:hover { background-color: #676b78; } - scrollbar slider:hover:active { + scrollbar slider:hover:active, + scrollbar .slider:hover:active, + .scrollbar slider:hover:active, + .scrollbar .slider:hover:active { background-color: #5294E2; } - scrollbar slider:disabled { + scrollbar slider:disabled, + scrollbar .slider:disabled, + .scrollbar slider:disabled, + .scrollbar .slider:disabled { background-color: transparent; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { border-radius: 100px; margin: 3px; } -scrollbar.vertical.fine-tune slider { +scrollbar.vertical.fine-tune slider, +.scrollbar.vertical.fine-tune slider { min-width: 4px; margin: 4px; } -scrollbar.vertical slider { +scrollbar.vertical slider, +.scrollbar.vertical slider { min-height: 42px; min-width: 6px; margin: 3px; } -scrollbar.vertical trough:dir(ltr) { +scrollbar.vertical trough:dir(ltr), +.scrollbar.vertical trough:dir(ltr) { border-left-style: solid; } -scrollbar.vertical trough:dir(rtl) { +scrollbar.vertical trough:dir(rtl), +.scrollbar.vertical trough:dir(rtl) { border-right-style: solid; } -scrollbar.horizontal.fine-tune slider { +scrollbar.horizontal.fine-tune slider, +.scrollbar.horizontal.fine-tune slider { min-height: 4px; margin: 4px; } -scrollbar.horizontal slider { +scrollbar.horizontal slider, +scrollbar.horizontal .slider, +.scrollbar.horizontal slider, +.scrollbar.horizontal .slider { min-height: 6px; min-width: 42px; margin-top: 3px; } -scrollbar.horizontal trough { +scrollbar.horizontal trough, +.scrollbar.horizontal trough { border-top-style: solid; } switch { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 1b0081a..ea9ae5b 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1761,85 +1761,122 @@ notebook { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } -scrollbar button { +scrollbar button, +.scrollbar button { border: none; } -scrollbar.vertical button.down { +scrollbar.vertical button.down, +.scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -scrollbar.vertical button.up { +scrollbar.vertical button.up, +.scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -scrollbar.horizontal button.down { +scrollbar.horizontal button.down, +.scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } -scrollbar.horizontal button.up { +scrollbar.horizontal button.up, +.scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } -scrollbar.overlay-indicator:not(.dragging):not(.hovering) { +scrollbar.overlay-indicator:not(.dragging):not(.hovering), +.scrollbar.overlay-indicator:not(.dragging):not(.hovering) { opacity: 0.4; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; background-color: #8a8e96; border: 1px solid rgba(255, 255, 255, 0.6); background-clip: padding-box; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { border-style: none; background-color: transparent; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { min-width: 4px; margin-top: 2px; margin-bottom: 2px; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { min-height: 4px; margin-left: 2px; margin-right: 2px; } -scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { +scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering, +.scrollbar.overlay-indicator.dragging, +.scrollbar.overlay-indicator.hovering { opacity: 0.99; } -scrollbar trough { +scrollbar trough, +.scrollbar trough { background-color: #fcfcfc; border: 1px none #dcdfe3; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { background-color: #b8babf; } - scrollbar slider:hover { + scrollbar slider:hover, + scrollbar .slider:hover, + .scrollbar slider:hover, + .scrollbar .slider:hover { background-color: #c7c9cd; } - scrollbar slider:hover:active { + scrollbar slider:hover:active, + scrollbar .slider:hover:active, + .scrollbar slider:hover:active, + .scrollbar .slider:hover:active { background-color: #5294E2; } - scrollbar slider:disabled { + scrollbar slider:disabled, + scrollbar .slider:disabled, + .scrollbar slider:disabled, + .scrollbar .slider:disabled { background-color: transparent; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { border-radius: 100px; margin: 3px; } -scrollbar.vertical.fine-tune slider { +scrollbar.vertical.fine-tune slider, +.scrollbar.vertical.fine-tune slider { min-width: 4px; margin: 4px; } -scrollbar.vertical slider { +scrollbar.vertical slider, +.scrollbar.vertical slider { min-height: 42px; min-width: 6px; margin: 3px; } -scrollbar.vertical trough:dir(ltr) { +scrollbar.vertical trough:dir(ltr), +.scrollbar.vertical trough:dir(ltr) { border-left-style: solid; } -scrollbar.vertical trough:dir(rtl) { +scrollbar.vertical trough:dir(rtl), +.scrollbar.vertical trough:dir(rtl) { border-right-style: solid; } -scrollbar.horizontal.fine-tune slider { +scrollbar.horizontal.fine-tune slider, +.scrollbar.horizontal.fine-tune slider { min-height: 4px; margin: 4px; } -scrollbar.horizontal slider { +scrollbar.horizontal slider, +scrollbar.horizontal .slider, +.scrollbar.horizontal slider, +.scrollbar.horizontal .slider { min-height: 6px; min-width: 42px; margin-top: 3px; } -scrollbar.horizontal trough { +scrollbar.horizontal trough, +.scrollbar.horizontal trough { border-top-style: solid; } switch { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 0fc5610..4a5e82a 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1765,85 +1765,122 @@ notebook { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } -scrollbar button { +scrollbar button, +.scrollbar button { border: none; } -scrollbar.vertical button.down { +scrollbar.vertical button.down, +.scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -scrollbar.vertical button.up { +scrollbar.vertical button.up, +.scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -scrollbar.horizontal button.down { +scrollbar.horizontal button.down, +.scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } -scrollbar.horizontal button.up { +scrollbar.horizontal button.up, +.scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } -scrollbar.overlay-indicator:not(.dragging):not(.hovering) { +scrollbar.overlay-indicator:not(.dragging):not(.hovering), +.scrollbar.overlay-indicator:not(.dragging):not(.hovering) { opacity: 0.4; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; background-color: #8a8e96; border: 1px solid rgba(255, 255, 255, 0.6); background-clip: padding-box; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { border-style: none; background-color: transparent; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { min-width: 4px; margin-top: 2px; margin-bottom: 2px; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { min-height: 4px; margin-left: 2px; margin-right: 2px; } -scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { +scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering, +.scrollbar.overlay-indicator.dragging, +.scrollbar.overlay-indicator.hovering { opacity: 0.99; } -scrollbar trough { +scrollbar trough, +.scrollbar trough { background-color: #fcfcfc; border: 1px none #dcdfe3; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { background-color: #b8babf; } - scrollbar slider:hover { + scrollbar slider:hover, + scrollbar .slider:hover, + .scrollbar slider:hover, + .scrollbar .slider:hover { background-color: #c7c9cd; } - scrollbar slider:hover:active { + scrollbar slider:hover:active, + scrollbar .slider:hover:active, + .scrollbar slider:hover:active, + .scrollbar .slider:hover:active { background-color: #5294E2; } - scrollbar slider:disabled { + scrollbar slider:disabled, + scrollbar .slider:disabled, + .scrollbar slider:disabled, + .scrollbar .slider:disabled { background-color: transparent; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { border-radius: 100px; margin: 3px; } -scrollbar.vertical.fine-tune slider { +scrollbar.vertical.fine-tune slider, +.scrollbar.vertical.fine-tune slider { min-width: 4px; margin: 4px; } -scrollbar.vertical slider { +scrollbar.vertical slider, +.scrollbar.vertical slider { min-height: 42px; min-width: 6px; margin: 3px; } -scrollbar.vertical trough:dir(ltr) { +scrollbar.vertical trough:dir(ltr), +.scrollbar.vertical trough:dir(ltr) { border-left-style: solid; } -scrollbar.vertical trough:dir(rtl) { +scrollbar.vertical trough:dir(rtl), +.scrollbar.vertical trough:dir(rtl) { border-right-style: solid; } -scrollbar.horizontal.fine-tune slider { +scrollbar.horizontal.fine-tune slider, +.scrollbar.horizontal.fine-tune slider { min-height: 4px; margin: 4px; } -scrollbar.horizontal slider { +scrollbar.horizontal slider, +scrollbar.horizontal .slider, +.scrollbar.horizontal slider, +.scrollbar.horizontal .slider { min-height: 6px; min-width: 42px; margin-top: 3px; } -scrollbar.horizontal trough { +scrollbar.horizontal trough, +.scrollbar.horizontal trough { border-top-style: solid; } switch { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 691808e..04b38a1 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1765,85 +1765,122 @@ notebook { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; } -scrollbar button { +scrollbar button, +.scrollbar button { border: none; } -scrollbar.vertical button.down { +scrollbar.vertical button.down, +.scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -scrollbar.vertical button.up { +scrollbar.vertical button.up, +.scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -scrollbar.horizontal button.down { +scrollbar.horizontal button.down, +.scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); } -scrollbar.horizontal button.up { +scrollbar.horizontal button.up, +.scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); } -scrollbar.overlay-indicator:not(.dragging):not(.hovering) { +scrollbar.overlay-indicator:not(.dragging):not(.hovering), +.scrollbar.overlay-indicator:not(.dragging):not(.hovering) { opacity: 0.4; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider { margin: 0; background-color: #8a8e96; border: 1px solid rgba(255, 255, 255, 0.6); background-clip: padding-box; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { + scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough { border-style: none; background-color: transparent; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider { min-width: 4px; margin-top: 2px; margin-bottom: 2px; } - scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { + scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider, + .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider { min-height: 4px; margin-left: 2px; margin-right: 2px; } -scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { +scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering, +.scrollbar.overlay-indicator.dragging, +.scrollbar.overlay-indicator.hovering { opacity: 0.99; } -scrollbar trough { +scrollbar trough, +.scrollbar trough { background-color: #fcfcfc; border: 1px none #dcdfe3; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { background-color: #b8babf; } - scrollbar slider:hover { + scrollbar slider:hover, + scrollbar .slider:hover, + .scrollbar slider:hover, + .scrollbar .slider:hover { background-color: #c7c9cd; } - scrollbar slider:hover:active { + scrollbar slider:hover:active, + scrollbar .slider:hover:active, + .scrollbar slider:hover:active, + .scrollbar .slider:hover:active { background-color: #5294E2; } - scrollbar slider:disabled { + scrollbar slider:disabled, + scrollbar .slider:disabled, + .scrollbar slider:disabled, + .scrollbar .slider:disabled { background-color: transparent; } -scrollbar slider { +scrollbar slider, +scrollbar .slider, +.scrollbar slider, +.scrollbar .slider { border-radius: 100px; margin: 3px; } -scrollbar.vertical.fine-tune slider { +scrollbar.vertical.fine-tune slider, +.scrollbar.vertical.fine-tune slider { min-width: 4px; margin: 4px; } -scrollbar.vertical slider { +scrollbar.vertical slider, +.scrollbar.vertical slider { min-height: 42px; min-width: 6px; margin: 3px; } -scrollbar.vertical trough:dir(ltr) { +scrollbar.vertical trough:dir(ltr), +.scrollbar.vertical trough:dir(ltr) { border-left-style: solid; } -scrollbar.vertical trough:dir(rtl) { +scrollbar.vertical trough:dir(rtl), +.scrollbar.vertical trough:dir(rtl) { border-right-style: solid; } -scrollbar.horizontal.fine-tune slider { +scrollbar.horizontal.fine-tune slider, +.scrollbar.horizontal.fine-tune slider { min-height: 4px; margin: 4px; } -scrollbar.horizontal slider { +scrollbar.horizontal slider, +scrollbar.horizontal .slider, +.scrollbar.horizontal slider, +.scrollbar.horizontal .slider { min-height: 6px; min-width: 42px; margin-top: 3px; } -scrollbar.horizontal trough { +scrollbar.horizontal trough, +.scrollbar.horizontal trough { border-top-style: solid; } switch { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index b163e62..09c42fa 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1859,7 +1859,8 @@ notebook { // $_scrollbar_bg_color: darken($base_color, 1%); -scrollbar { +scrollbar, +.scrollbar { @at-root * { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; @@ -1920,7 +1921,8 @@ scrollbar { } // slider coloring - slider { + slider, + .slider { background-color: mix($fg_color, $bg_color, 40%); &:hover { background-color: mix($fg_color, $bg_color, 30%); } @@ -1933,7 +1935,8 @@ scrollbar { } // sizing - slider { + slider, + .slider { border-radius: 100px; margin: $_slider_margin; } @@ -1964,7 +1967,8 @@ scrollbar { margin: $_slider_fine_tune_margin; } - slider { + slider, + .slider { min-height: 6px; min-width: 42px; margin-top: $_slider_margin; From 90f1c140669cea6ce43a3112ffa3af92fe1f3531 Mon Sep 17 00:00:00 2001 From: Antonio Romero Date: Wed, 20 Apr 2016 10:34:46 -0500 Subject: [PATCH 4/4] Workaround for check and radio in FF GTK 3.20 (#473) --- common/gtk-3.0/3.20/gtk-dark.css | 12 ++++++++++++ common/gtk-3.0/3.20/gtk-darker.css | 12 ++++++++++++ common/gtk-3.0/3.20/gtk-solid-dark.css | 12 ++++++++++++ common/gtk-3.0/3.20/gtk-solid-darker.css | 12 ++++++++++++ common/gtk-3.0/3.20/gtk-solid.css | 12 ++++++++++++ common/gtk-3.0/3.20/gtk.css | 12 ++++++++++++ common/gtk-3.0/3.20/sass/_common.scss | 1 + 7 files changed, 73 insertions(+) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index ddd8cbf..bd35880 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1940,6 +1940,7 @@ headerbar switch:checked:disabled, .primary-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")); } +.check, check, treeview.check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1953,6 +1954,7 @@ row:selected check, infobar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected.png"), url("assets/checkbox-unchecked-selected@2.png")); } +.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")); } @@ -1966,6 +1968,7 @@ row:selected check:disabled, infobar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected.png"), url("assets/checkbox-unchecked-insensitive-selected@2.png")); } +.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")); } @@ -1979,6 +1982,7 @@ row:selected check:indeterminate, infobar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected.png"), url("assets/checkbox-mixed-selected@2.png")); } +.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")); } @@ -1992,6 +1996,7 @@ row:selected check:indeterminate:disabled, infobar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-selected.png"), url("assets/checkbox-mixed-insensitive-selected@2.png")); } +.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")); } @@ -2005,6 +2010,7 @@ row:selected check:checked, infobar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected.png"), url("assets/checkbox-checked-selected@2.png")); } +.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")); } @@ -2018,6 +2024,7 @@ row:selected check:checked:disabled, infobar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected.png"), url("assets/checkbox-checked-insensitive-selected@2.png")); } +.radio, radio, treeview.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } @@ -2031,6 +2038,7 @@ row:selected radio, infobar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected.png"), url("assets/radio-unchecked-selected@2.png")); } +.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")); } @@ -2044,6 +2052,7 @@ row:selected radio:disabled, infobar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected.png"), url("assets/radio-unchecked-insensitive-selected@2.png")); } +.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")); } @@ -2057,6 +2066,7 @@ row:selected radio:indeterminate, infobar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected.png"), url("assets/radio-mixed-selected@2.png")); } +.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")); } @@ -2070,6 +2080,7 @@ row:selected radio:indeterminate:disabled, infobar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-selected.png"), url("assets/radio-mixed-insensitive-selected@2.png")); } +.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")); } @@ -2083,6 +2094,7 @@ row:selected radio:checked, infobar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected.png"), url("assets/radio-checked-selected@2.png")); } +.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")); } diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index fb0032c..6fa3651 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1939,6 +1939,7 @@ headerbar switch:checked:disabled, .primary-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")); } +.check, check, treeview.check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1952,6 +1953,7 @@ row:selected check, infobar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected.png"), url("assets/checkbox-unchecked-selected@2.png")); } +.check:disabled, check:disabled, treeview.check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); } @@ -1965,6 +1967,7 @@ row:selected check:disabled, infobar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected.png"), url("assets/checkbox-unchecked-insensitive-selected@2.png")); } +.check:indeterminate, check:indeterminate, treeview.check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); } @@ -1978,6 +1981,7 @@ row:selected check:indeterminate, infobar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected.png"), url("assets/checkbox-mixed-selected@2.png")); } +.check:indeterminate:disabled, check:indeterminate:disabled, treeview.check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); } @@ -1991,6 +1995,7 @@ row:selected check:indeterminate:disabled, infobar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-selected.png"), url("assets/checkbox-mixed-insensitive-selected@2.png")); } +.check:checked, check:checked, treeview.check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); } @@ -2004,6 +2009,7 @@ row:selected check:checked, infobar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected.png"), url("assets/checkbox-checked-selected@2.png")); } +.check:checked:disabled, check:checked:disabled, treeview.check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); } @@ -2017,6 +2023,7 @@ row:selected check:checked:disabled, infobar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected.png"), url("assets/checkbox-checked-insensitive-selected@2.png")); } +.radio, radio, treeview.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); } @@ -2030,6 +2037,7 @@ row:selected radio, infobar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected.png"), url("assets/radio-unchecked-selected@2.png")); } +.radio:disabled, radio:disabled, treeview.radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); } @@ -2043,6 +2051,7 @@ row:selected radio:disabled, infobar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected.png"), url("assets/radio-unchecked-insensitive-selected@2.png")); } +.radio:indeterminate, radio:indeterminate, treeview.radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); } @@ -2056,6 +2065,7 @@ row:selected radio:indeterminate, infobar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected.png"), url("assets/radio-mixed-selected@2.png")); } +.radio:indeterminate:disabled, radio:indeterminate:disabled, treeview.radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); } @@ -2069,6 +2079,7 @@ row:selected radio:indeterminate:disabled, infobar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-selected.png"), url("assets/radio-mixed-insensitive-selected@2.png")); } +.radio:checked, radio:checked, treeview.radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); } @@ -2082,6 +2093,7 @@ row:selected radio:checked, infobar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected.png"), url("assets/radio-checked-selected@2.png")); } +.radio:checked:disabled, radio:checked:disabled, treeview.radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index dfe01e3..54eedfa 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1940,6 +1940,7 @@ headerbar switch:checked:disabled, .primary-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")); } +.check, check, treeview.check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } @@ -1953,6 +1954,7 @@ row:selected check, infobar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected.png"), url("assets/checkbox-unchecked-selected@2.png")); } +.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")); } @@ -1966,6 +1968,7 @@ row:selected check:disabled, infobar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected.png"), url("assets/checkbox-unchecked-insensitive-selected@2.png")); } +.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")); } @@ -1979,6 +1982,7 @@ row:selected check:indeterminate, infobar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected.png"), url("assets/checkbox-mixed-selected@2.png")); } +.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")); } @@ -1992,6 +1996,7 @@ row:selected check:indeterminate:disabled, infobar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-selected.png"), url("assets/checkbox-mixed-insensitive-selected@2.png")); } +.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")); } @@ -2005,6 +2010,7 @@ row:selected check:checked, infobar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected.png"), url("assets/checkbox-checked-selected@2.png")); } +.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")); } @@ -2018,6 +2024,7 @@ row:selected check:checked:disabled, infobar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected.png"), url("assets/checkbox-checked-insensitive-selected@2.png")); } +.radio, radio, treeview.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } @@ -2031,6 +2038,7 @@ row:selected radio, infobar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected.png"), url("assets/radio-unchecked-selected@2.png")); } +.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")); } @@ -2044,6 +2052,7 @@ row:selected radio:disabled, infobar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected.png"), url("assets/radio-unchecked-insensitive-selected@2.png")); } +.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")); } @@ -2057,6 +2066,7 @@ row:selected radio:indeterminate, infobar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected.png"), url("assets/radio-mixed-selected@2.png")); } +.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")); } @@ -2070,6 +2080,7 @@ row:selected radio:indeterminate:disabled, infobar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-selected.png"), url("assets/radio-mixed-insensitive-selected@2.png")); } +.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")); } @@ -2083,6 +2094,7 @@ row:selected radio:checked, infobar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected.png"), url("assets/radio-checked-selected@2.png")); } +.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")); } diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index ea9ae5b..c61e4a9 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1939,6 +1939,7 @@ headerbar switch:checked:disabled, .primary-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")); } +.check, check, treeview.check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1952,6 +1953,7 @@ row:selected check, infobar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected.png"), url("assets/checkbox-unchecked-selected@2.png")); } +.check:disabled, check:disabled, treeview.check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); } @@ -1965,6 +1967,7 @@ row:selected check:disabled, infobar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected.png"), url("assets/checkbox-unchecked-insensitive-selected@2.png")); } +.check:indeterminate, check:indeterminate, treeview.check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); } @@ -1978,6 +1981,7 @@ row:selected check:indeterminate, infobar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected.png"), url("assets/checkbox-mixed-selected@2.png")); } +.check:indeterminate:disabled, check:indeterminate:disabled, treeview.check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); } @@ -1991,6 +1995,7 @@ row:selected check:indeterminate:disabled, infobar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-selected.png"), url("assets/checkbox-mixed-insensitive-selected@2.png")); } +.check:checked, check:checked, treeview.check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); } @@ -2004,6 +2009,7 @@ row:selected check:checked, infobar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected.png"), url("assets/checkbox-checked-selected@2.png")); } +.check:checked:disabled, check:checked:disabled, treeview.check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); } @@ -2017,6 +2023,7 @@ row:selected check:checked:disabled, infobar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected.png"), url("assets/checkbox-checked-insensitive-selected@2.png")); } +.radio, radio, treeview.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); } @@ -2030,6 +2037,7 @@ row:selected radio, infobar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected.png"), url("assets/radio-unchecked-selected@2.png")); } +.radio:disabled, radio:disabled, treeview.radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); } @@ -2043,6 +2051,7 @@ row:selected radio:disabled, infobar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected.png"), url("assets/radio-unchecked-insensitive-selected@2.png")); } +.radio:indeterminate, radio:indeterminate, treeview.radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); } @@ -2056,6 +2065,7 @@ row:selected radio:indeterminate, infobar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected.png"), url("assets/radio-mixed-selected@2.png")); } +.radio:indeterminate:disabled, radio:indeterminate:disabled, treeview.radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); } @@ -2069,6 +2079,7 @@ row:selected radio:indeterminate:disabled, infobar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-selected.png"), url("assets/radio-mixed-insensitive-selected@2.png")); } +.radio:checked, radio:checked, treeview.radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); } @@ -2082,6 +2093,7 @@ row:selected radio:checked, infobar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected.png"), url("assets/radio-checked-selected@2.png")); } +.radio:checked:disabled, radio:checked:disabled, treeview.radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 4a5e82a..7488d3e 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1943,6 +1943,7 @@ headerbar switch:checked:disabled, .primary-toolbar switch:checked:disabled { 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.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1956,6 +1957,7 @@ row:selected check, infobar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected.png"), url("assets/checkbox-unchecked-selected@2.png")); } +.check:disabled, check:disabled, treeview.check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); } @@ -1969,6 +1971,7 @@ row:selected check:disabled, infobar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected.png"), url("assets/checkbox-unchecked-insensitive-selected@2.png")); } +.check:indeterminate, check:indeterminate, treeview.check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); } @@ -1982,6 +1985,7 @@ row:selected check:indeterminate, infobar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected.png"), url("assets/checkbox-mixed-selected@2.png")); } +.check:indeterminate:disabled, check:indeterminate:disabled, treeview.check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); } @@ -1995,6 +1999,7 @@ row:selected check:indeterminate:disabled, infobar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-selected.png"), url("assets/checkbox-mixed-insensitive-selected@2.png")); } +.check:checked, check:checked, treeview.check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); } @@ -2008,6 +2013,7 @@ row:selected check:checked, infobar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected.png"), url("assets/checkbox-checked-selected@2.png")); } +.check:checked:disabled, check:checked:disabled, treeview.check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); } @@ -2021,6 +2027,7 @@ row:selected check:checked:disabled, infobar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected.png"), url("assets/checkbox-checked-insensitive-selected@2.png")); } +.radio, radio, treeview.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); } @@ -2034,6 +2041,7 @@ row:selected radio, infobar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected.png"), url("assets/radio-unchecked-selected@2.png")); } +.radio:disabled, radio:disabled, treeview.radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); } @@ -2047,6 +2055,7 @@ row:selected radio:disabled, infobar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected.png"), url("assets/radio-unchecked-insensitive-selected@2.png")); } +.radio:indeterminate, radio:indeterminate, treeview.radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); } @@ -2060,6 +2069,7 @@ row:selected radio:indeterminate, infobar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected.png"), url("assets/radio-mixed-selected@2.png")); } +.radio:indeterminate:disabled, radio:indeterminate:disabled, treeview.radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); } @@ -2073,6 +2083,7 @@ row:selected radio:indeterminate:disabled, infobar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-selected.png"), url("assets/radio-mixed-insensitive-selected@2.png")); } +.radio:checked, radio:checked, treeview.radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); } @@ -2086,6 +2097,7 @@ row:selected radio:checked, infobar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected.png"), url("assets/radio-checked-selected@2.png")); } +.radio:checked:disabled, radio:checked:disabled, treeview.radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); } diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 04b38a1..fd3b37b 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1943,6 +1943,7 @@ headerbar switch:checked:disabled, .primary-toolbar switch:checked:disabled { 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.png"), url("assets/checkbox-unchecked@2.png")); } @@ -1956,6 +1957,7 @@ row:selected check, infobar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected.png"), url("assets/checkbox-unchecked-selected@2.png")); } +.check:disabled, check:disabled, treeview.check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png")); } @@ -1969,6 +1971,7 @@ row:selected check:disabled, infobar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected.png"), url("assets/checkbox-unchecked-insensitive-selected@2.png")); } +.check:indeterminate, check:indeterminate, treeview.check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png")); } @@ -1982,6 +1985,7 @@ row:selected check:indeterminate, infobar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected.png"), url("assets/checkbox-mixed-selected@2.png")); } +.check:indeterminate:disabled, check:indeterminate:disabled, treeview.check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png")); } @@ -1995,6 +1999,7 @@ row:selected check:indeterminate:disabled, infobar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-selected.png"), url("assets/checkbox-mixed-insensitive-selected@2.png")); } +.check:checked, check:checked, treeview.check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png")); } @@ -2008,6 +2013,7 @@ row:selected check:checked, infobar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected.png"), url("assets/checkbox-checked-selected@2.png")); } +.check:checked:disabled, check:checked:disabled, treeview.check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png")); } @@ -2021,6 +2027,7 @@ row:selected check:checked:disabled, infobar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected.png"), url("assets/checkbox-checked-insensitive-selected@2.png")); } +.radio, radio, treeview.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); } @@ -2034,6 +2041,7 @@ row:selected radio, infobar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected.png"), url("assets/radio-unchecked-selected@2.png")); } +.radio:disabled, radio:disabled, treeview.radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png")); } @@ -2047,6 +2055,7 @@ row:selected radio:disabled, infobar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected.png"), url("assets/radio-unchecked-insensitive-selected@2.png")); } +.radio:indeterminate, radio:indeterminate, treeview.radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png")); } @@ -2060,6 +2069,7 @@ row:selected radio:indeterminate, infobar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected.png"), url("assets/radio-mixed-selected@2.png")); } +.radio:indeterminate:disabled, radio:indeterminate:disabled, treeview.radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png")); } @@ -2073,6 +2083,7 @@ row:selected radio:indeterminate:disabled, infobar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-selected.png"), url("assets/radio-mixed-insensitive-selected@2.png")); } +.radio:checked, radio:checked, treeview.radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png")); } @@ -2086,6 +2097,7 @@ row:selected radio:checked, infobar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected.png"), url("assets/radio-checked-selected@2.png")); } +.radio:checked:disabled, radio:checked:disabled, treeview.radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png")); } diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 09c42fa..2fddf4e 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -2039,6 +2039,7 @@ switch { (':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"),