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

Adwaita: fix menu scroll arrows positioning

Browse Source 
adresses the style part of
https://bugzilla.gnome.org/show_bug.cgi?id=764118
This commit is contained in:
Lapo Calamandrei 2016-03-24 11:25:52 +01:00
parent dc2e5fdf9c
commit aa821429b1
3 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1844,7 +1844,7 @@ menu,
background-color: transparent;
}
//submenu indicators
// submenu indicators
arrow {
min-height: 16px;
min-width: 16px;
@ -1861,26 +1861,32 @@ menu,
}
}
arrow { // overlow buttons
@extend %undecorated_button;
// overflow arrows
> arrow {
@include button(undecorated);
border-style: none;
border-radius: 0;
min-height: 16px;
min-width: 16px;
padding: 4px;
background-color: $menu_color;
border-radius: 0;
&.top {
-gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
margin-top: -6px;
border-bottom: 1px solid mix($fg_color, $base_color, 10%);
-gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
}
&.bottom {
-gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
margin-bottom: -6px;
border-top: 1px solid mix($fg_color, $base_color, 10%);
-gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
}
&:hover { background-color: mix($fg_color, $base_color, 10%); }
&:backdrop { background-color: $backdrop_menu_color; }
&:disabled {
color: transparent;
background-color: transparent;

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

@ -1284,8 +1284,7 @@ popover.background radiobutton:backdrop:hover,
button:visited, button:link:hover, button:link:active, button:link:checked,
button:visited:hover,
button:visited:active,
button:visited:checked, menu arrow,
.menu arrow, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
button:visited:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
background-color: transparent;
background-image: none;
border-color: transparent;
@ -2158,25 +2157,37 @@ menu,
.menu menuitem arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
margin-right: 10px; }
menu arrow,
.menu arrow {
border-style: none;
border-radius: 0;
menu > arrow,
.menu > arrow {
border-color: transparent;
background-color: transparent;
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
-gtk-icon-shadow: none;
min-height: 16px;
min-width: 16px; }
menu arrow.top,
.menu arrow.top {
-gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
border-bottom: 1px solid #3d3d3d; }
menu arrow.bottom,
.menu arrow.bottom {
-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
border-top: 1px solid #3d3d3d; }
menu arrow:hover,
.menu arrow:hover {
min-width: 16px;
padding: 4px;
background-color: #2c2d2d;
border-radius: 0; }
menu > arrow.top,
.menu > arrow.top {
margin-top: -6px;
border-bottom: 1px solid #3d3d3d;
-gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
menu > arrow.bottom,
.menu > arrow.bottom {
margin-bottom: -6px;
border-top: 1px solid #3d3d3d;
-gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
menu > arrow:hover,
.menu > arrow:hover {
background-color: #3d3d3d; }
menu arrow:disabled,
.menu arrow:disabled {
menu > arrow:backdrop,
.menu > arrow:backdrop {
background-color: #2f3030; }
menu > arrow:disabled,
.menu > arrow:disabled {
color: transparent;
background-color: transparent;
border-color: transparent; }

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

@ -1287,8 +1287,7 @@ popover.background radiobutton:backdrop:hover,
button:visited, button:link:hover, button:link:active, button:link:checked,
button:visited:hover,
button:visited:active,
button:visited:checked, menu arrow,
.menu arrow, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
button:visited:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
background-color: transparent;
background-image: none;
border-color: transparent;
@ -2171,25 +2170,37 @@ menu,
.menu menuitem arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
margin-right: 10px; }
menu arrow,
.menu arrow {
border-style: none;
border-radius: 0;
menu > arrow,
.menu > arrow {
border-color: transparent;
background-color: transparent;
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
-gtk-icon-shadow: none;
min-height: 16px;
min-width: 16px; }
menu arrow.top,
.menu arrow.top {
-gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
border-bottom: 1px solid #eaebeb; }
menu arrow.bottom,
.menu arrow.bottom {
-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
border-top: 1px solid #eaebeb; }
menu arrow:hover,
.menu arrow:hover {
min-width: 16px;
padding: 4px;
background-color: #ffffff;
border-radius: 0; }
menu > arrow.top,
.menu > arrow.top {
margin-top: -6px;
border-bottom: 1px solid #eaebeb;
-gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
menu > arrow.bottom,
.menu > arrow.bottom {
margin-bottom: -6px;
border-top: 1px solid #eaebeb;
-gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
menu > arrow:hover,
.menu > arrow:hover {
background-color: #eaebeb; }
menu arrow:disabled,
.menu arrow:disabled {
menu > arrow:backdrop,
.menu > arrow:backdrop {
background-color: #fcfcfc; }
menu > arrow:disabled,
.menu > arrow:disabled {
color: transparent;
background-color: transparent;
border-color: transparent; }