diff options
author | Horst3180 | 2016-05-29 19:22:18 +0200 |
---|---|---|
committer | Horst3180 | 2016-05-29 19:22:18 +0200 |
commit | ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96 (patch) | |
tree | 94b480739c9811fa2c72e2cf3bf57fa8293b3748 /common/gtk-3.0 | |
parent | 753130a3ba5386d485d519b4a93aea4d184c4850 (diff) | |
download | solarc-theme-ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96.tar.gz solarc-theme-ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96.tar.xz solarc-theme-ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96.zip |
use accent color for menu highlight (fix #135)
Diffstat (limited to 'common/gtk-3.0')
28 files changed, 555 insertions, 133 deletions
diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index b2a429f..37c127c 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -1307,10 +1307,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1614,6 +1612,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1626,6 +1625,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1638,6 +1638,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1650,6 +1651,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1662,6 +1664,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1674,6 +1677,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1686,6 +1690,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1698,6 +1703,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1710,6 +1716,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1722,6 +1729,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1734,6 +1742,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1746,6 +1755,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1801,18 +1811,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); @@ -1833,15 +1847,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.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 25337f3..e3d4b6d 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -1310,10 +1310,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1804,18 +1814,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); @@ -1836,15 +1850,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.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index f6f7b26..3db7cb6 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -1307,10 +1307,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1614,6 +1612,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1626,6 +1625,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1638,6 +1638,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1650,6 +1651,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1662,6 +1664,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1674,6 +1677,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1686,6 +1690,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1698,6 +1703,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1710,6 +1716,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1722,6 +1729,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1734,6 +1742,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1746,6 +1755,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1801,18 +1811,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); @@ -1833,15 +1847,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.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index a40da22..4221587 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -1310,10 +1310,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1804,18 +1814,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); @@ -1836,15 +1850,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.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 70956a9..4e1ec80 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -1310,10 +1310,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1804,18 +1814,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); @@ -1836,15 +1850,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.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index 5bf75ca..a95735a 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -1310,10 +1310,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1617,6 +1615,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1629,6 +1628,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1641,6 +1641,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1653,6 +1654,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1665,6 +1667,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1677,6 +1680,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1689,6 +1693,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1701,6 +1706,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1713,6 +1719,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1725,6 +1732,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1737,6 +1745,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1749,6 +1758,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1804,18 +1814,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); @@ -1836,15 +1850,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.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index f314530..40da473 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1558,10 +1558,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; @@ -1928,6 +1926,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} { @@ -2007,6 +2006,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); @@ -2055,6 +2055,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)); diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css index a023c99..e73cfe1 100644 --- a/common/gtk-3.0/3.16/gtk-dark.css +++ b/common/gtk-3.0/3.16/gtk-dark.css @@ -1321,10 +1321,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1659,6 +1657,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1671,6 +1670,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1683,6 +1683,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1695,6 +1696,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1707,6 +1709,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1719,6 +1722,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1731,6 +1735,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1743,6 +1748,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1755,6 +1761,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1767,6 +1774,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1779,6 +1787,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1791,6 +1800,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1846,18 +1856,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); @@ -1878,15 +1892,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.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css index a2974e3..e3eb905 100644 --- a/common/gtk-3.0/3.16/gtk-darker.css +++ b/common/gtk-3.0/3.16/gtk-darker.css @@ -1324,10 +1324,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1849,18 +1859,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); @@ -1881,15 +1895,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.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css index b5d6997..70dc688 100644 --- a/common/gtk-3.0/3.16/gtk-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-solid-dark.css @@ -1321,10 +1321,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1659,6 +1657,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1671,6 +1670,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1683,6 +1683,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1695,6 +1696,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1707,6 +1709,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1719,6 +1722,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1731,6 +1735,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1743,6 +1748,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1755,6 +1761,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1767,6 +1774,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1779,6 +1787,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1791,6 +1800,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1846,18 +1856,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); @@ -1878,15 +1892,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.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css index 623c69f..485c697 100644 --- a/common/gtk-3.0/3.16/gtk-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-solid-darker.css @@ -1324,10 +1324,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1849,18 +1859,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); @@ -1881,15 +1895,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.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css index dfc1d5b..f4dfbe9 100644 --- a/common/gtk-3.0/3.16/gtk-solid.css +++ b/common/gtk-3.0/3.16/gtk-solid.css @@ -1324,10 +1324,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1849,18 +1859,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); @@ -1881,15 +1895,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.16/gtk.css b/common/gtk-3.0/3.16/gtk.css index e77c406..7a96f3a 100644 --- a/common/gtk-3.0/3.16/gtk.css +++ b/common/gtk-3.0/3.16/gtk.css @@ -1324,10 +1324,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, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { @@ -1662,6 +1660,7 @@ GtkFileChooserDialog .action-bar.frame .check, 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 { @@ -1674,6 +1673,7 @@ GtkFileChooserDialog .action-bar.frame .check:insensitive, 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 { @@ -1686,6 +1686,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent, 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 { @@ -1698,6 +1699,7 @@ GtkFileChooserDialog .action-bar.frame .check:inconsistent:insensitive, 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 { @@ -1710,6 +1712,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked, 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 { @@ -1722,6 +1725,7 @@ GtkFileChooserDialog .action-bar.frame .check:checked:insensitive, 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 { @@ -1734,6 +1738,7 @@ GtkFileChooserDialog .action-bar.frame .radio, 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 { @@ -1746,6 +1751,7 @@ GtkFileChooserDialog .action-bar.frame .radio:insensitive, 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 { @@ -1758,6 +1764,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent, 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 { @@ -1770,6 +1777,7 @@ GtkFileChooserDialog .action-bar.frame .radio:inconsistent:insensitive, 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 { @@ -1782,6 +1790,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked, 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 { @@ -1794,6 +1803,7 @@ GtkFileChooserDialog .action-bar.frame .radio:checked:insensitive, 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 { @@ -1849,18 +1859,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); @@ -1881,15 +1895,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.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index f2d8e1c..85e00f3 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1572,10 +1572,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; @@ -2010,6 +2008,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} { @@ -2089,6 +2088,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); @@ -2137,6 +2137,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)); 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)); diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 771475d..c37914f 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1536,15 +1536,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .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:disabled, .menu menuitem:disabled { color: rgba(211, 218, 227, 0.45); } @@ -1907,6 +1903,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1921,6 +1918,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1935,6 +1933,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1949,6 +1948,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1963,6 +1963,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1977,6 +1978,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1991,6 +1993,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2005,6 +2008,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2019,6 +2023,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2033,6 +2038,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2047,6 +2053,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2061,6 +2068,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2131,15 +2139,19 @@ scale { background-color: rgba(69, 74, 89, 0.95); } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2168,19 +2180,23 @@ scale { scale slider:disabled { background-color: #3c414e; border-color: rgba(38, 41, 51, 0.8); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 7ccb467..14db475 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1535,15 +1535,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .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:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1906,6 +1902,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1920,6 +1917,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1934,6 +1932,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1948,6 +1947,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1962,6 +1962,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1976,6 +1977,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1990,6 +1992,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2004,6 +2007,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2018,6 +2022,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2032,6 +2037,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2046,6 +2052,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2060,6 +2067,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2130,15 +2138,19 @@ scale { background-color: rgba(69, 74, 89, 0.95); } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2167,19 +2179,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; 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 cbe313e..8dac95e 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1536,15 +1536,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .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:disabled, .menu menuitem:disabled { color: rgba(211, 218, 227, 0.45); } @@ -1907,6 +1903,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1921,6 +1918,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1935,6 +1933,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1949,6 +1948,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1963,6 +1963,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1977,6 +1978,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1991,6 +1993,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2005,6 +2008,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2019,6 +2023,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2033,6 +2038,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2047,6 +2053,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2061,6 +2068,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2131,15 +2139,19 @@ scale { background-color: #454a59; } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2168,19 +2180,23 @@ scale { scale slider:disabled { background-color: #3c414e; border-color: rgba(38, 41, 51, 0.8); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; 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 02dc153..d184701 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1535,15 +1535,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .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:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1906,6 +1902,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1920,6 +1917,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1934,6 +1932,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1948,6 +1947,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1962,6 +1962,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1976,6 +1977,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1990,6 +1992,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2004,6 +2007,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2018,6 +2022,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2032,6 +2037,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2046,6 +2052,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2060,6 +2067,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2130,15 +2138,19 @@ scale { background-color: #454a59; } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2167,19 +2179,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 949a367..fe5a598 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1539,15 +1539,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .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:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1910,6 +1906,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1924,6 +1921,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1938,6 +1936,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1952,6 +1951,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1966,6 +1966,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1980,6 +1981,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1994,6 +1996,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2008,6 +2011,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2022,6 +2026,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2036,6 +2041,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2050,6 +2056,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2064,6 +2071,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2134,15 +2142,19 @@ scale { background-color: #454a59; } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2171,19 +2183,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 40e3f0b..1ebb175 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1539,15 +1539,11 @@ menu, .menu menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; } + padding: 5px; } menu menuitem:hover, .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:disabled, .menu menuitem:disabled { color: rgba(92, 97, 108, 0.55); } @@ -1910,6 +1906,7 @@ treeview.check { .osd check, filechooser actionbar check { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); } +menuitem check:hover, .view check:selected, iconview check:selected, treeview.check:selected, row:selected check, @@ -1924,6 +1921,7 @@ treeview.check:disabled { .osd check:disabled, filechooser actionbar check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); } +menuitem check:disabled:hover, .view check:disabled:selected, iconview check:disabled:selected, treeview.check:disabled:selected, row:selected check:disabled, @@ -1938,6 +1936,7 @@ treeview.check:indeterminate { .osd check:indeterminate, filechooser actionbar check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); } +menuitem check:indeterminate:hover, .view check:indeterminate:selected, iconview check:indeterminate:selected, treeview.check:indeterminate:selected, row:selected check:indeterminate, @@ -1952,6 +1951,7 @@ treeview.check:indeterminate:disabled { .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); } +menuitem check:indeterminate:disabled:hover, .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected, treeview.check:indeterminate:disabled:selected, row:selected check:indeterminate:disabled, @@ -1966,6 +1966,7 @@ treeview.check:checked { .osd check:checked, filechooser actionbar check:checked { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); } +menuitem check:checked:hover, .view check:checked:selected, iconview check:checked:selected, treeview.check:checked:selected, row:selected check:checked, @@ -1980,6 +1981,7 @@ treeview.check:checked:disabled { .osd check:checked:disabled, filechooser actionbar check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); } +menuitem check:checked:disabled:hover, .view check:checked:disabled:selected, iconview check:checked:disabled:selected, treeview.check:checked:disabled:selected, row:selected check:checked:disabled, @@ -1994,6 +1996,7 @@ treeview.radio { .osd radio, filechooser actionbar radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } +menuitem radio:hover, .view radio:selected, iconview radio:selected, treeview.radio:selected, row:selected radio, @@ -2008,6 +2011,7 @@ treeview.radio:disabled { .osd radio:disabled, filechooser actionbar radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); } +menuitem radio:disabled:hover, .view radio:disabled:selected, iconview radio:disabled:selected, treeview.radio:disabled:selected, row:selected radio:disabled, @@ -2022,6 +2026,7 @@ treeview.radio:indeterminate { .osd radio:indeterminate, filechooser actionbar radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); } +menuitem radio:indeterminate:hover, .view radio:indeterminate:selected, iconview radio:indeterminate:selected, treeview.radio:indeterminate:selected, row:selected radio:indeterminate, @@ -2036,6 +2041,7 @@ treeview.radio:indeterminate:disabled { .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); } +menuitem radio:indeterminate:disabled:hover, .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected, treeview.radio:indeterminate:disabled:selected, row:selected radio:indeterminate:disabled, @@ -2050,6 +2056,7 @@ treeview.radio:checked { .osd radio:checked, filechooser actionbar radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); } +menuitem radio:checked:hover, .view radio:checked:selected, iconview radio:checked:selected, treeview.radio:checked:selected, row:selected radio:checked, @@ -2064,6 +2071,7 @@ treeview.radio:checked:disabled { .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); } +menuitem radio:checked:disabled:hover, .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected, treeview.radio:checked:disabled:selected, row:selected radio:checked:disabled, @@ -2134,15 +2142,19 @@ scale { background-color: rgba(69, 74, 89, 0.95); } .osd scale trough highlight { background-color: #5294E2; } + menuitem:hover scale trough, row:selected scale trough, infobar scale trough { background-color: rgba(0, 0, 0, 0.2); } + menuitem:hover scale trough highlight, row:selected scale trough highlight, infobar scale trough highlight { background-color: #ffffff; } + menuitem:hover scale trough highlight:disabled, row:selected scale trough highlight:disabled, infobar scale trough highlight:disabled { background-color: #b1cff2; } + menuitem:hover scale trough:disabled, row:selected scale trough:disabled, infobar scale trough:disabled { background-color: rgba(0, 0, 0, 0.1); } @@ -2171,19 +2183,23 @@ scale { scale slider:disabled { background-color: #fbfbfb; border-color: rgba(123, 142, 186, 0.3); } + menuitem:hover scale slider, row:selected scale slider, infobar scale slider { background-clip: border-box; background-color: #ffffff; border-color: #ffffff; } + menuitem:hover scale slider:hover, row:selected scale slider:hover, infobar scale slider:hover { background-color: #e5effb; border-color: #e5effb; } + menuitem:hover scale slider:active, row:selected scale slider:active, infobar scale slider:active { background-color: #a9caf1; border-color: #a9caf1; } + menuitem:hover scale slider:disabled, row:selected scale slider:disabled, infobar scale slider:disabled { background-color: #b1cff2; diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 279c598..ed35b4c 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1599,14 +1599,10 @@ menu, menuitem { min-height: 16px; min-width: 40px; - padding: 4px; - border: solid transparent; - border-width: 1px 0 1px 0; + 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; } &:disabled { color: $insensitive_fg_color; @@ -2015,6 +2011,7 @@ switch { // the borders of checks and radios are // too similar in luminosity to the selected background color, hence // we need special casing. + menuitem #{$w}#{$s}:hover, .view #{$w}#{$s}:selected, treeview.#{$w}#{$s}:selected, row:selected #{$w}#{$s}, @@ -2125,6 +2122,7 @@ scale { } // Troughs in selected list-rows and infobars + menuitem:hover &, row:selected &, infobar & { background-color: transparentize(black, 0.8); @@ -2180,6 +2178,7 @@ scale { } // Selected list-row and infobar sliders + menuitem:hover &, row:selected &, infobar & { background-clip: border-box; |