diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index c6bb2e3..584ea8b 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -171,6 +171,10 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .popup-slider-menu-item, .popup-menu-item:active + .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box CinnamonGenericContainer { spacing: .2em; @@ -221,11 +225,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .cinnamon-link { color: #a9caf1; @@ -267,9 +274,9 @@ StScrollBar { padding: .4em 1.75em; spacing: 1em; } .popup-menu .popup-menu-item:active { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } @@ -277,6 +284,8 @@ StScrollBar { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } + .popup-menu .popup-menu-item:active .popup-inactive-menu-item { + color: #ffffff; } .popup-menu-icon { icon-size: 16px; } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index a54fd32..6aaee78 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -171,6 +171,10 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .popup-slider-menu-item, .popup-menu-item:active + .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box CinnamonGenericContainer { spacing: .2em; @@ -221,11 +225,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .cinnamon-link { color: #2679db; @@ -267,9 +274,9 @@ StScrollBar { padding: .4em 1.75em; spacing: 1em; } .popup-menu .popup-menu-item:active { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } @@ -277,6 +284,8 @@ StScrollBar { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } + .popup-menu .popup-menu-item:active .popup-inactive-menu-item { + color: #ffffff; } .popup-menu-icon { icon-size: 16px; } diff --git a/common/cinnamon/dark-assets/menu/menu-hover.svg b/common/cinnamon/common-assets/menu/menu-hover.svg similarity index 68% rename from common/cinnamon/dark-assets/menu/menu-hover.svg rename to common/cinnamon/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/cinnamon/dark-assets/menu/menu-hover.svg +++ b/common/cinnamon/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/cinnamon/common-assets/switch/switch-off-selected.svg b/common/cinnamon/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/cinnamon/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/common-assets/switch/switch-on-selected.svg b/common/cinnamon/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/cinnamon/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/cinnamon/light-assets/menu/menu-hover.svg b/common/cinnamon/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/cinnamon/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index b015078..c1788b0 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -159,6 +159,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item:active & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -224,11 +229,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item:active & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -286,9 +294,9 @@ StScrollBar { spacing: 1em; &:active { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { color: transparentize($fg_color, 0.5); @@ -302,6 +310,8 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } + .popup-menu-item:active .popup-inactive-menu-item { color: $selected_fg_color; } + &-icon { icon-size: 16px; } } diff --git a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/common-assets/menu/menu-hover.svg similarity index 68% rename from common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg rename to common/gnome-shell/3.14/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.16/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.14/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.14/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index 0f4fba2..dc8fddf 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -184,19 +184,22 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #2b2e39 !important; - -slider-border-color: transparent !important; - -slider-active-background-color: #5294E2 !important; - -slider-active-border-color: transparent !important; + -slider-background-color: #2b2e39; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -218,11 +221,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -453,7 +459,7 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - color: #D3DAE3 !important; + color: #D3DAE3; background: none !important; box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } @@ -466,18 +472,22 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3 !important; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(211, 218, 227, 0.5) !important; + color: rgba(211, 218, 227, 0.5); background: none; } .popup-menu .popup-inactive-menu-item { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } - .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { - color: #D3DAE3 !important; } + .popup-menu .popup-status-menu-item, + .popup-menu .popup-subtitle-menu-item { + color: #D3DAE3; } + .popup-menu .popup-menu-item:active .popup-status-menu-item, + .popup-menu .popup-menu-item:active .popup-subtitle-menu-item { + color: #ffffff; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -741,7 +751,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid rgba(211, 218, 227, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.2); } #appMenu { spinner-image: url("common-assets/misc/process-working.svg"); @@ -754,7 +764,9 @@ StScrollBar { width: 360px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; - color: #D3DAE3 !important; } + color: #D3DAE3; } + .aggregate-menu .popup-menu-item:active .popup-menu-icon { + color: #ffffff; } .system-menu-action { padding: 13px; diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 7308f41..65dfd22 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -184,19 +184,22 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #cfd6e6 !important; - -slider-border-color: transparent !important; - -slider-active-background-color: #5294E2 !important; - -slider-active-border-color: transparent !important; + -slider-background-color: #cfd6e6; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item:active .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -218,11 +221,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item:active .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item:active .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -453,7 +459,7 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - color: #5c616c !important; + color: #5c616c; background: none !important; box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } @@ -466,18 +472,22 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: .4em 0em .4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c !important; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(92, 97, 108, 0.5) !important; + color: rgba(92, 97, 108, 0.5); background: none; } .popup-menu .popup-inactive-menu-item { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } - .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { - color: #5c616c !important; } + .popup-menu .popup-status-menu-item, + .popup-menu .popup-subtitle-menu-item { + color: #5c616c; } + .popup-menu .popup-menu-item:active .popup-status-menu-item, + .popup-menu .popup-menu-item:active .popup-subtitle-menu-item { + color: #ffffff; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -741,7 +751,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid rgba(92, 97, 108, 0.4); } + border: 1px solid rgba(0, 0, 0, 0.2); } #appMenu { spinner-image: url("common-assets/misc/process-working.svg"); @@ -754,7 +764,9 @@ StScrollBar { width: 360px; } .aggregate-menu .popup-menu-icon { padding: 0 4px; - color: #5c616c !important; } + color: #5c616c; } + .aggregate-menu .popup-menu-item:active .popup-menu-icon { + color: #ffffff; } .system-menu-action { padding: 13px; diff --git a/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.14/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 863159e..b5bdcf2 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -164,19 +164,24 @@ StScrollBar { // .slider { -slider-height: 4px; - -slider-background-color: $button_border !important; //background of the trough - -slider-border-color: transparentize(black, 1) !important; //trough border color - -slider-active-background-color: $selected_bg_color !important; //active trough fill - -slider-active-border-color: transparentize(black, 1) !important; //active trough border + -slider-background-color: $button_border; //background of the trough + -slider-border-color: transparentize(black, 1); //trough border color + -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-border-color: transparentize(black, 1); //active trough border -slider-border-width: 0; -slider-handle-radius: 4px; - -slider-handle-border-color: transparent !important; - -slider-handle-border-width: 0 !important; + -slider-handle-border-color: transparent; + -slider-handle-border-width: 0; height: 18px; border: 0 solid transparent; border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item:active & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -206,11 +211,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item:active & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -553,7 +561,7 @@ StScrollBar { } .popup-submenu-menu-item:open { - color: $fg_color !important; + color: $fg_color; background: none !important; box-shadow: none; border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; @@ -567,13 +575,13 @@ StScrollBar { &:rtl { padding: .4em 0em .4em 3em; } &:active, &.selected { - color: $fg_color !important; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { - color: transparentize($fg_color, 0.5) !important; + color: transparentize($fg_color, 0.5); background: none; } } @@ -583,7 +591,15 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } - .popup-status-menu-item, .popup-subtitle-menu-item { color: $fg_color !important; } + + .popup-status-menu-item, + .popup-subtitle-menu-item { color: $fg_color; } + + .popup-menu-item:active { + .popup-status-menu-item, + .popup-subtitle-menu-item { color: $selected_fg_color; } + } + &.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; @@ -623,7 +639,7 @@ StScrollBar { background-color: transparent; background-gradient-direction: none !important; border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu @@ -939,7 +955,7 @@ StScrollBar { .system-switch-user-submenu-icon { icon-size: 24px; - border: 1px solid transparentize($fg_color,0.6); + border: 1px solid transparentize(black, 0.8); } #appMenu { @@ -954,7 +970,10 @@ StScrollBar { width: 360px; .popup-menu-icon { padding: 0 4px; - color: $fg_color !important; + color: $fg_color; + } + .popup-menu-item:active .popup-menu-icon { + color: $selected_fg_color; } } diff --git a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/common-assets/menu/menu-hover.svg similarity index 68% rename from common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg rename to common/gnome-shell/3.16/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.14/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.16/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.16/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index 5571339..335ba6b 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -156,6 +156,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -177,11 +180,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -423,9 +429,9 @@ StScrollBar { box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index ad41fcc..5c48616 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -156,6 +156,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -177,11 +180,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -423,9 +429,9 @@ StScrollBar { box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } diff --git a/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.16/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 9515e43..6d8af82 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -148,6 +148,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item.selected & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -177,11 +182,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item.selected & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -534,9 +542,9 @@ StScrollBar { } &:active, &.selected { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { diff --git a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg similarity index 68% rename from common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg rename to common/gnome-shell/3.18/common-assets/menu/menu-hover.svg index a023a8e..6ae13ca 100644 --- a/common/gnome-shell/3.18/dark-assets/menu/menu-hover.svg +++ b/common/gnome-shell/3.18/common-assets/menu/menu-hover.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="16.934585" - inkscape:cy="20.910274" + inkscape:cx="16.532799" + inkscape:cy="17.338845" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -69,29 +69,16 @@ id="layer1" transform="translate(-137,-382.36221)"> + transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)" + id="g6908" + style="fill:#5294e2;fill-opacity:1"> + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" /> - - diff --git a/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg b/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg new file mode 100644 index 0000000..c85eeee --- /dev/null +++ b/common/gnome-shell/3.18/common-assets/switch/switch-off-selected.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg b/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg new file mode 100644 index 0000000..7c2572d --- /dev/null +++ b/common/gnome-shell/3.18/common-assets/switch/switch-on-selected.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index b89c1a4..62c88f5 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -130,6 +130,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -151,11 +154,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("dark-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("dark-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("dark-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("dark-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #a9caf1; } @@ -452,9 +458,9 @@ StScrollBar { box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #ffffff; background-color: transparent; - border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(211, 218, 227, 0.5); background: none; } @@ -489,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 912c6f6..bf1cfb4 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -130,6 +130,9 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; } + .popup-menu-item.selected .slider { + -slider-background-color: rgba(0, 0, 0, 0.2); + -slider-active-background-color: #ffffff; } .check-box StBoxLayout { spacing: .8em; } @@ -151,11 +154,14 @@ StScrollBar { .toggle-switch { width: 50px; height: 20px; - background-size: contain; } - .toggle-switch-us, .toggle-switch-intl { - background-image: url("light-assets/switch/switch-off.svg"); } - .toggle-switch-us:checked, .toggle-switch-intl:checked { - background-image: url("light-assets/switch/switch-on.svg"); } + background-size: contain; + background-image: url("light-assets/switch/switch-off.svg"); } + .toggle-switch:checked { + background-image: url("light-assets/switch/switch-on.svg"); } + .popup-menu-item.selected .toggle-switch { + background-image: url("common-assets/switch/switch-off-selected.svg"); } + .popup-menu-item.selected .toggle-switch:checked { + background-image: url("common-assets/switch/switch-on-selected.svg"); } .shell-link { color: #2679db; } @@ -452,9 +458,9 @@ StScrollBar { box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #ffffff; background-color: transparent; - border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { color: rgba(92, 97, 108, 0.5); background: none; } @@ -489,7 +495,7 @@ StScrollBar { .popup-separator-menu-item { height: 2px; - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } diff --git a/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg b/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg deleted file mode 100644 index 938245a..0000000 --- a/common/gnome-shell/3.18/light-assets/menu/menu-hover.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 9c5afa4..1fdf697 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -149,6 +149,11 @@ StScrollBar { border-right-width: 1px; border-left-width: 5px; color: transparent; + + .popup-menu-item.selected & { + -slider-background-color: transparentize(black, 0.8); + -slider-active-background-color: $selected_fg_color; + } } // @@ -178,11 +183,14 @@ StScrollBar { width: 50px; height: 20px; background-size: contain; + background-image: url("#{$asset_path}/switch/switch-off.svg"); - &-us, &-intl { - background-image: url("#{$asset_path}/switch/switch-off.svg"); + &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } - &:checked { background-image: url("#{$asset_path}/switch/switch-on.svg"); } + .popup-menu-item.selected & { + background-image: url("common-assets/switch/switch-off-selected.svg"); + + &:checked { background-image: url("common-assets/switch/switch-on-selected.svg"); } } } @@ -601,9 +609,9 @@ StScrollBar { } &:active, &.selected { - color: $fg_color; + color: $selected_fg_color; background-color: transparent; - border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; + border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { @@ -651,10 +659,10 @@ StScrollBar { .popup-separator-menu-item { //-margin-horizontal: 24px; height: 2px; //not really the whole box - margin: 10px 0px; + margin: 10px 0; background-color: transparent; border: none; - border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; + border-image: url("common-assets/menu/menu-separator.svg") 1 1 1 1; } // Background menu diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index c0b0814..ee913d7 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9999996" - inkscape:cx="254.60434" - inkscape:cy="52.761079" + inkscape:zoom="11.313708" + inkscape:cx="243.54683" + inkscape:cy="369.23846" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -4184,19 +4184,19 @@ + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> - - + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets-dark/menu-arrow-prelight.png b/common/gtk-2.0/assets-dark/menu-arrow-prelight.png index 2e21d88..04bff49 100644 Binary files a/common/gtk-2.0/assets-dark/menu-arrow-prelight.png and b/common/gtk-2.0/assets-dark/menu-arrow-prelight.png differ diff --git a/common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png b/common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png new file mode 100644 index 0000000..e32f07e Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png b/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png new file mode 100644 index 0000000..9066a4c Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png b/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png new file mode 100644 index 0000000..0fab00a Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png b/common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png new file mode 100644 index 0000000..7b08eac Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menuitem.png b/common/gtk-2.0/assets-dark/menuitem.png index 56ad7b0..ce6bd54 100644 Binary files a/common/gtk-2.0/assets-dark/menuitem.png and b/common/gtk-2.0/assets-dark/menuitem.png differ diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index f9adeb6..6d149fc 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="248.42235" - inkscape:cy="35.189651" + inkscape:zoom="7.9999999" + inkscape:cx="263.38272" + inkscape:cy="373.79667" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -4166,19 +4166,19 @@ + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> - - + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index e7fc513..08e3959 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -31,12 +31,16 @@ radio-checked-insensitive radio-unchecked radio-unchecked-insensitive menu-checkbox-checked +menu-checkbox-checked-selected menu-checkbox-checked-insensitive menu-checkbox-unchecked +menu-checkbox-unchecked-selected menu-checkbox-unchecked-insensitive menu-radio-checked +menu-radio-checked-selected menu-radio-checked-insensitive menu-radio-unchecked +menu-radio-unchecked-selected menu-radio-unchecked-insensitive entry-border-bg-solid entry-border-active-bg-solid diff --git a/common/gtk-2.0/assets/menu-arrow-prelight.png b/common/gtk-2.0/assets/menu-arrow-prelight.png index 1e95c5d..04bff49 100644 Binary files a/common/gtk-2.0/assets/menu-arrow-prelight.png and b/common/gtk-2.0/assets/menu-arrow-prelight.png differ diff --git a/common/gtk-2.0/assets/menu-checkbox-checked-selected.png b/common/gtk-2.0/assets/menu-checkbox-checked-selected.png new file mode 100644 index 0000000..e32f07e Binary files /dev/null and b/common/gtk-2.0/assets/menu-checkbox-checked-selected.png differ diff --git a/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png b/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png new file mode 100644 index 0000000..9066a4c Binary files /dev/null and b/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets/menu-radio-checked-selected.png b/common/gtk-2.0/assets/menu-radio-checked-selected.png new file mode 100644 index 0000000..0fab00a Binary files /dev/null and b/common/gtk-2.0/assets/menu-radio-checked-selected.png differ diff --git a/common/gtk-2.0/assets/menu-radio-unchecked-selected.png b/common/gtk-2.0/assets/menu-radio-unchecked-selected.png new file mode 100644 index 0000000..7b08eac Binary files /dev/null and b/common/gtk-2.0/assets/menu-radio-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets/menuitem.png b/common/gtk-2.0/assets/menuitem.png index 6b9faf6..ce6bd54 100644 Binary files a/common/gtk-2.0/assets/menuitem.png and b/common/gtk-2.0/assets/menuitem.png differ diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc index 2a70e92..18da44a 100644 --- a/common/gtk-2.0/main.rc +++ b/common/gtk-2.0/main.rc @@ -708,7 +708,7 @@ style "menu_framed_box" { style "menu_item" { xthickness = 2 - ythickness = 4 + ythickness = 5 # HACK: Gtk doesn't actually read this value # while rendering the menu items, but Libreoffice @@ -720,10 +720,11 @@ style "menu_item" # See https://bugs.freedesktop.org/show_bug.cgi?id=38038 bg[SELECTED] = @selected_fg_color - fg[NORMAL] = @fg_color - fg[SELECTED] = @fg_color + fg[NORMAL] = @fg_color + fg[SELECTED] = @selected_fg_color - text[PRELIGHT] = @fg_color + fg[PRELIGHT] = @selected_fg_color + text[PRELIGHT] = @selected_fg_color engine "pixmap" { @@ -735,6 +736,28 @@ style "menu_item" stretch = TRUE } + # Fix invisible scale trough on selected menuitems + + image { + function = BOX + detail = "trough-lower" + file = "assets/trough-horizontal.png" + border = { 8, 8, 0, 0 } + stretch = TRUE + orientation = HORIZONTAL + } + + image { + function = SLIDER + state = PRELIGHT + file = "assets/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "assets/slider.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + # Check Buttons image { @@ -751,7 +774,7 @@ style "menu_item" recolorable = TRUE state = PRELIGHT shadow = OUT - overlay_file = "assets/menu-checkbox-unchecked.png" + overlay_file = "assets/menu-checkbox-unchecked-selected.png" overlay_stretch = FALSE } @@ -787,7 +810,7 @@ style "menu_item" recolorable = TRUE state = PRELIGHT shadow = IN - overlay_file = "assets/menu-checkbox-checked.png" + overlay_file = "assets/menu-checkbox-checked-selected.png" overlay_stretch = FALSE } @@ -823,7 +846,7 @@ style "menu_item" function = OPTION state = PRELIGHT shadow = OUT - overlay_file = "assets/menu-radio-unchecked.png" + overlay_file = "assets/menu-radio-unchecked-selected.png" overlay_stretch = FALSE } @@ -855,7 +878,7 @@ style "menu_item" function = OPTION state = PRELIGHT shadow = IN - overlay_file = "assets/menu-radio-checked.png" + overlay_file = "assets/menu-radio-checked-selected.png" overlay_stretch = FALSE } diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index b2c2352..5b3df75 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -4,8 +4,8 @@ style "theme-panel" { ythickness = 0 bg[NORMAL] = "#2B2E37" - bg[ACTIVE] = shade(1.45, "#2B2E37") - bg[PRELIGHT] = shade(0.9, @selected_bg_color) + bg[ACTIVE] = @selected_bg_color + bg[PRELIGHT] = "#3f4453" bg[SELECTED] = @selected_bg_color fg[NORMAL] = "#BAC3CF" @@ -93,13 +93,13 @@ style "workspace-switcher" = "theme-panel" { bg[SELECTED] = @selected_bg_color } -style "window-buttons" = "theme-panel" -{ +style "window-buttons" = "theme-panel" { + xthickness = 3 ythickness = 3 - bg[ACTIVE] = shade(0.75, @selected_bg_color) - bg[PRELIGHT] = shade(0.9, @selected_bg_color) + bg[ACTIVE] = @selected_bg_color + bg[PRELIGHT] = shade(1.1,@selected_bg_color) bg[SELECTED] = @selected_bg_color engine "murrine" { @@ -160,6 +160,7 @@ widget "*Xfce*Panel*" style "theme-panel" class "*Xfce*Panel*" style "theme-panel" widget "*WnckPager*" style "workspace-switcher" widget "*TopMenu*" style "theme-panel" +widget "*XfceTasklist*" style "window-buttons" # Fix gtk-entries in the panel widget "*bookmark*GtkEntry" style "panel-entry" # fixes smartbookmark-plugin @@ -173,4 +174,3 @@ widget "*PanelApplet*" style "theme-panel-text" # Override general panel-style with specific plugin-styles widget "*indicator-applet*" style "indicator" widget "*indicator-button*" style "indicator" -widget "*XfceTasklist*" style "window-buttons" 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;