diff options
Diffstat (limited to 'common/gtk-3.0')
21 files changed, 395 insertions, 269 deletions
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 7d99f70..cba9510 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -724,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1468,45 +1468,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2457,6 +2460,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index c531d15..0f669e0 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1471,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2460,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 655cd13..01c40c4 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -724,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1468,45 +1468,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2457,6 +2460,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 7e222d7..a720b5f 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1471,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2460,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index dfe6878..cb5c4df 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1471,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2460,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index a378b08..fa315ab 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1471,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2460,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px 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 482d3c7..05abc85 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -1587,7 +1587,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1633,6 +1633,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2687,6 +2689,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } &.csd { &.popup, &.menu { border-radius: 2px; diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index d083279..f38632e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -724,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1474,45 +1474,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2535,12 +2538,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 4de7a2e..30da6e9 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1477,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2538,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 4adad11..4934854 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -724,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1474,45 +1474,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2535,12 +2538,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index d2e4ac6..530f297 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1477,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2538,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index f47276b..2599d8e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1477,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2538,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 83b64a9..82d98f3 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -723,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1477,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .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, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2538,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 92856f5..ec66a1a 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -1601,7 +1601,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1647,6 +1647,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2807,6 +2809,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2815,7 +2821,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 0381e1d..1bf53d7 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -801,7 +801,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1608,45 +1608,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2715,12 +2718,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css index d3a2965..78f2c82 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1611,45 +1611,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2718,12 +2721,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css index f0ba3d5..e168abc 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css @@ -801,7 +801,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1608,45 +1608,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2715,12 +2718,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css index e46b2c0..c9ff5cf 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1611,45 +1611,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2718,12 +2721,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css index 69ae9d5..969ed9c 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1615,45 +1615,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2722,12 +2725,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index ea02115..64c3472 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1615,45 +1615,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .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; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2722,12 +2725,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 5c216f6..efd4824 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1698,7 +1698,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1744,6 +1744,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2969,6 +2971,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2977,7 +2983,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); |