From ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 29 May 2016 19:22:18 +0200 Subject: use accent color for menu highlight (fix #135) --- common/gtk-3.0/3.18/gtk-dark.css | 26 ++++++++++++++++++++++---- common/gtk-3.0/3.18/gtk-darker.css | 26 ++++++++++++++++++++++---- common/gtk-3.0/3.18/gtk-solid-dark.css | 26 ++++++++++++++++++++++---- common/gtk-3.0/3.18/gtk-solid-darker.css | 26 ++++++++++++++++++++++---- common/gtk-3.0/3.18/gtk-solid.css | 26 ++++++++++++++++++++++---- common/gtk-3.0/3.18/gtk.css | 26 ++++++++++++++++++++++---- common/gtk-3.0/3.18/sass/_common.scss | 9 +++++---- 7 files changed, 137 insertions(+), 28 deletions(-) (limited to 'common/gtk-3.0/3.18') diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index af71ab4..f995938 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -1390,10 +1390,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator { @@ -1729,6 +1727,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1741,6 +1740,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1753,6 +1753,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1765,6 +1766,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1777,6 +1779,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1789,6 +1792,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1801,6 +1805,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1813,6 +1818,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1825,6 +1831,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1837,6 +1844,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1849,6 +1857,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1861,6 +1870,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1915,18 +1925,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1947,15 +1961,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 110f5b9..9ced93b 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -1393,10 +1393,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1732,6 +1730,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1744,6 +1743,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1756,6 +1756,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1768,6 +1769,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1780,6 +1782,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1792,6 +1795,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1804,6 +1808,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1816,6 +1821,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1828,6 +1834,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1840,6 +1847,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1852,6 +1860,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1864,6 +1873,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1918,18 +1928,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1950,15 +1964,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index a0bb635..433364e 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -1390,10 +1390,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #D3DAE3; - background-color: rgba(255, 255, 255, 0.05); - border: solid rgba(255, 255, 255, 0.07); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } .menu .menuitem.separator { @@ -1729,6 +1727,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1741,6 +1740,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1753,6 +1753,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1765,6 +1766,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1777,6 +1779,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1789,6 +1792,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1801,6 +1805,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1813,6 +1818,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1825,6 +1831,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1837,6 +1844,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1849,6 +1857,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1861,6 +1870,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1915,18 +1925,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1947,15 +1961,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index d4e4842..b03e798 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -1393,10 +1393,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1732,6 +1730,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1744,6 +1743,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1756,6 +1756,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1768,6 +1769,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1780,6 +1782,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1792,6 +1795,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1804,6 +1808,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1816,6 +1821,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1828,6 +1834,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1840,6 +1847,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1852,6 +1860,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1864,6 +1873,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1918,18 +1928,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1950,15 +1964,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 2b54de1..274f3f1 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -1397,10 +1397,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1736,6 +1734,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1748,6 +1747,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1760,6 +1760,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1772,6 +1773,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1784,6 +1786,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1796,6 +1799,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1808,6 +1812,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1820,6 +1825,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1832,6 +1838,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1844,6 +1851,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1856,6 +1864,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1868,6 +1877,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1922,18 +1932,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1954,15 +1968,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index c02bb15..4321388 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -1397,10 +1397,8 @@ column-header .button, column-header .button:hover, column-header .button:active .menu .menuitem { padding: 5px; } .menu .menuitem:hover { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.04); - border: solid rgba(0, 0, 0, 0.08); - border-width: 1px 0 1px 0; } + color: #ffffff; + background-color: #5294E2; } .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } .menu .menuitem.separator { @@ -1736,6 +1734,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +.menu .menuitem.check:hover, GtkTreeView.view.check:selected, .list-row:selected .check, GtkInfoBar .check { @@ -1748,6 +1747,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.check:insensitive:hover, GtkTreeView.view.check:insensitive:selected, .list-row:selected .check:insensitive, GtkInfoBar .check:insensitive { @@ -1760,6 +1760,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +.menu .menuitem.check:inconsistent:hover, GtkTreeView.view.check:inconsistent:selected, .list-row:selected .check:inconsistent, GtkInfoBar .check:inconsistent { @@ -1772,6 +1773,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +.menu .menuitem.check:inconsistent:insensitive:hover, GtkTreeView.view.check:inconsistent:insensitive:selected, .list-row:selected .check:inconsistent:insensitive, GtkInfoBar .check:inconsistent:insensitive { @@ -1784,6 +1786,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +.menu .menuitem.check:checked:hover, GtkTreeView.view.check:checked:selected, .list-row:selected .check:checked, GtkInfoBar .check:checked { @@ -1796,6 +1799,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .check:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +.menu .menuitem.check:checked:insensitive:hover, GtkTreeView.view.check:checked:insensitive:selected, .list-row:selected .check:checked:insensitive, GtkInfoBar .check:checked:insensitive { @@ -1808,6 +1812,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +.menu .menuitem.radio:hover, GtkTreeView.view.radio:selected, .list-row:selected .radio, GtkInfoBar .radio { @@ -1820,6 +1825,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +.menu .menuitem.radio:insensitive:hover, GtkTreeView.view.radio:insensitive:selected, .list-row:selected .radio:insensitive, GtkInfoBar .radio:insensitive { @@ -1832,6 +1838,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +.menu .menuitem.radio:inconsistent:hover, GtkTreeView.view.radio:inconsistent:selected, .list-row:selected .radio:inconsistent, GtkInfoBar .radio:inconsistent { @@ -1844,6 +1851,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:inconsistent:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +.menu .menuitem.radio:inconsistent:insensitive:hover, GtkTreeView.view.radio:inconsistent:insensitive:selected, .list-row:selected .radio:inconsistent:insensitive, GtkInfoBar .radio:inconsistent:insensitive { @@ -1856,6 +1864,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +.menu .menuitem.radio:checked:hover, GtkTreeView.view.radio:checked:selected, .list-row:selected .radio:checked, GtkInfoBar .radio:checked { @@ -1868,6 +1877,7 @@ GtkFileChooserDialog GtkFileChooserWidget > GtkActionBar > GtkRevealer > .action GtkFileChooserDialog .dialog-vbox > .frame .radio:checked:insensitive { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +.menu .menuitem.radio:checked:insensitive:hover, GtkTreeView.view.radio:checked:insensitive:selected, .list-row:selected .radio:checked:insensitive, GtkInfoBar .radio:checked:insensitive { @@ -1922,18 +1932,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.slider:active { background-image: linear-gradient(to bottom, #2679db); border-color: #2679db; } + .menuitem:hover .scale.slider, .list-row:selected .scale.slider, GtkInfoBar .scale.slider { background-image: linear-gradient(to bottom, #ffffff); border-color: #ffffff; } + .menuitem:hover .scale.slider:hover, .list-row:selected .scale.slider:hover, GtkInfoBar .scale.slider:hover { background-image: linear-gradient(to bottom, #e5effb); border-color: #e5effb; } + .menuitem:hover .scale.slider:active, .list-row:selected .scale.slider:active, GtkInfoBar .scale.slider:active { background-image: linear-gradient(to bottom, #a9caf1); border-color: #a9caf1; } + .menuitem:hover .scale.slider:insensitive, .list-row:selected .scale.slider:insensitive, GtkInfoBar .scale.slider:insensitive { background-image: linear-gradient(to bottom, #b1cff2); @@ -1954,15 +1968,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .osd .scale.trough.highlight { background-image: none; background-image: linear-gradient(to bottom, #5294E2); } + .menuitem:hover .scale.trough, .list-row:selected .scale.trough, GtkInfoBar .scale.trough { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); } + .menuitem:hover .scale.trough.highlight, .list-row:selected .scale.trough.highlight, GtkInfoBar .scale.trough.highlight { background-image: linear-gradient(to bottom, #ffffff); } + .menuitem:hover .scale.trough.highlight:insensitive, .list-row:selected .scale.trough.highlight:insensitive, GtkInfoBar .scale.trough.highlight:insensitive { background-image: linear-gradient(to bottom, #b1cff2); } + .menuitem:hover .scale.trough:insensitive, .list-row:selected .scale.trough:insensitive, GtkInfoBar .scale.trough:insensitive { background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index dd39d6b..028aa41 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1517,10 +1517,8 @@ column-header.button.dnd { // for treeview-like derive widgets .menuitem { padding: 5px; &:hover { - color: $fg_color; - background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95)); - border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93)); - border-width: 1px 0 1px 0; + color: $selected_fg_color; + background-color: $selected_bg_color; } &:insensitive { color: $insensitive_fg_color; @@ -1956,6 +1954,7 @@ GtkSwitch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + .menu .menuitem.#{$w}#{$s}:hover, GtkTreeView.view.#{$w}#{$s}:selected, .list-row:selected .#{$w}#{$s}, GtkInfoBar .#{$w}#{$s} { @@ -2036,6 +2035,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } //selected list-row and infobar sliders + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, $selected_fg_color); @@ -2084,6 +2084,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { &:insensitive { } } // troughs in selected list-rows and infobars + .menuitem:hover &, .list-row:selected &, GtkInfoBar & { background-image: linear-gradient(to bottom, transparentize(black, 0.8)); -- cgit v1.2.3