AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: Update menu styling

Browse Source 
Support the element names introduced in the previous commit.
This commit is contained in:
Matthias Clasen 2015-11-02 20:47:04 -05:00
parent 0b52b29dfc
commit f8c3e48bd2
3 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/theme/Adwaita/_common.scss
View File

@ -1466,6 +1466,7 @@ treeview.view {
} }
} }
menu,
.menu { .menu {
margin: 4px; margin: 4px;
padding: 0px; padding: 0px;
@ -1491,7 +1492,7 @@ treeview.view {
&.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); } &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
&.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); } &.arrow:dir(rtl) {-gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); }
} }
& button { // overlow buttons & arrow { // overlow buttons
@extend %undecorated_button; @extend %undecorated_button;
border-style: none; border-style: none;
border-radius: 0; border-radius: 0;

36
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -1145,9 +1145,8 @@ modelbutton.flat,
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop,
.menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link, .menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link,
.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited, .titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton, .titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, menu arrow,
.menu .titlebar button.titlebutton, .menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
.titlebar .menu button.titlebutton, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
notebook tab .titlebar button.titlebutton, notebook tab .titlebar button.titlebutton,
.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton, .titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
.app-notification .titlebar button.titlebutton, .app-notification .titlebar button.titlebutton,
@ -1989,42 +1988,55 @@ treeview.view header .titlebar button.titlebutton,
color: #949796; color: #949796;
box-shadow: none; } box-shadow: none; }
menu,
.menu { .menu {
margin: 4px; margin: 4px;
padding: 0px; padding: 0px;
background-color: #292929; background-color: #292929;
border: 1px solid #1c1f1f; } border: 1px solid #1c1f1f; }
.csd .menu { .csd menu, .csd
.menu {
border: none; } border: none; }
menu .menuitem,
.menu .menuitem { .menu .menuitem {
text-shadow: none; text-shadow: none;
padding: 4px; } padding: 4px; }
menu .menuitem:hover,
.menu .menuitem:hover { .menu .menuitem:hover {
color: #ffffff; color: #ffffff;
background-color: #215d9c; } background-color: #215d9c; }
menu .menuitem:insensitive,
.menu .menuitem:insensitive { .menu .menuitem:insensitive {
color: #949796; } color: #949796; }
menu .menuitem:insensitive:backdrop,
.menu .menuitem:insensitive:backdrop { .menu .menuitem:insensitive:backdrop {
color: #5d6767; } color: #5d6767; }
.menu .menuitem:backdrop, .menu .menuitem:backdrop:hover { menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
.menu .menuitem:backdrop,
.menu .menuitem:backdrop:hover {
color: #949796; color: #949796;
background-color: #2c2c2c; } background-color: #2c2c2c; }
menu .menuitem.arrow,
.menu .menuitem.arrow { .menu .menuitem.arrow {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
menu .menuitem.arrow:dir(rtl),
.menu .menuitem.arrow:dir(rtl) { .menu .menuitem.arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
.menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton, menu arrow,
.menu .titlebar button.titlebutton, .menu arrow {
.titlebar .menu button.titlebutton {
border-style: none; border-style: none;
border-radius: 0; } border-radius: 0; }
.menu button.top { menu arrow.top,
.menu arrow.top {
border-bottom: 1px solid #3d3d3d; } border-bottom: 1px solid #3d3d3d; }
.menu button.bottom { menu arrow.bottom,
.menu arrow.bottom {
border-top: 1px solid #3d3d3d; } border-top: 1px solid #3d3d3d; }
.menu button:hover { menu arrow:hover,
.menu arrow:hover {
background-color: #3d3d3d; } background-color: #3d3d3d; }
.menu button:insensitive { menu arrow:insensitive,
.menu arrow:insensitive {
color: transparent; color: transparent;
background-color: transparent; background-color: transparent;
border-color: transparent; } border-color: transparent; }

36
gtk/theme/Adwaita/gtk-contained.css
View File

@ -1145,9 +1145,8 @@ modelbutton.flat,
.menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop,
.menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link, .menuitem.button.flat:backdrop:hover, button:link, headerbar button.titlebutton:link,
.titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited, .titlebar button.titlebutton:link, button:visited, headerbar button.titlebutton:visited,
.titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, .menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton, .titlebar button.titlebutton:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, button:link:backdrop, button:visited:backdrop, menu arrow,
.menu .titlebar button.titlebutton, .menu arrow, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
.titlebar .menu button.titlebutton, notebook tab button, notebook tab headerbar button.titlebutton, headerbar notebook tab button.titlebutton,
notebook tab .titlebar button.titlebutton, notebook tab .titlebar button.titlebutton,
.titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton, .titlebar notebook tab button.titlebutton, .app-notification button.flat, .app-notification .sidebar-button.button, .app-notification headerbar button.titlebutton, headerbar .app-notification button.titlebutton,
.app-notification .titlebar button.titlebutton, .app-notification .titlebar button.titlebutton,
@ -1995,42 +1994,55 @@ treeview.view header .titlebar button.titlebutton,
color: #8e9192; color: #8e9192;
box-shadow: none; } box-shadow: none; }
menu,
.menu { .menu {
margin: 4px; margin: 4px;
padding: 0px; padding: 0px;
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #a1a1a1; } border: 1px solid #a1a1a1; }
.csd .menu { .csd menu, .csd
.menu {
border: none; } border: none; }
menu .menuitem,
.menu .menuitem { .menu .menuitem {
text-shadow: none; text-shadow: none;
padding: 4px; } padding: 4px; }
menu .menuitem:hover,
.menu .menuitem:hover { .menu .menuitem:hover {
color: #ffffff; color: #ffffff;
background-color: #4a90d9; } background-color: #4a90d9; }
menu .menuitem:insensitive,
.menu .menuitem:insensitive { .menu .menuitem:insensitive {
color: #8e9192; } color: #8e9192; }
menu .menuitem:insensitive:backdrop,
.menu .menuitem:insensitive:backdrop { .menu .menuitem:insensitive:backdrop {
color: #c7c7c7; } color: #c7c7c7; }
.menu .menuitem:backdrop, .menu .menuitem:backdrop:hover { menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
.menu .menuitem:backdrop,
.menu .menuitem:backdrop:hover {
color: #8e9192; color: #8e9192;
background-color: white; } background-color: white; }
menu .menuitem.arrow,
.menu .menuitem.arrow { .menu .menuitem.arrow {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
menu .menuitem.arrow:dir(rtl),
.menu .menuitem.arrow:dir(rtl) { .menu .menuitem.arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
.menu button, .menu headerbar button.titlebutton, headerbar .menu button.titlebutton, menu arrow,
.menu .titlebar button.titlebutton, .menu arrow {
.titlebar .menu button.titlebutton {
border-style: none; border-style: none;
border-radius: 0; } border-radius: 0; }
.menu button.top { menu arrow.top,
.menu arrow.top {
border-bottom: 1px solid #eaebeb; } border-bottom: 1px solid #eaebeb; }
.menu button.bottom { menu arrow.bottom,
.menu arrow.bottom {
border-top: 1px solid #eaebeb; } border-top: 1px solid #eaebeb; }
.menu button:hover { menu arrow:hover,
.menu arrow:hover {
background-color: #eaebeb; } background-color: #eaebeb; }
.menu button:insensitive { menu arrow:insensitive,
.menu arrow:insensitive {
color: transparent; color: transparent;
background-color: transparent; background-color: transparent;
border-color: transparent; } border-color: transparent; }