fixed menu bugs

This commit is contained in:
vinceliuice 2018-02-01 15:35:07 +08:00
parent b5fdedbf65
commit 2f711c225b
3 changed files with 24 additions and 23 deletions

View File

@ -77,8 +77,6 @@ popover.background label.separator {
label selection { label selection {
color: #ffffff; color: #ffffff;
background-color: #0062FF; } background-color: #0062FF; }
label:disabled {
color: rgba(222, 222, 222, 0.45); }
.dim-label, label.separator, popover label.separator, .dim-label, label.separator, popover label.separator,
popover.background label.separator, headerbar .subtitle, popover.background label.separator, headerbar .subtitle,
@ -1337,10 +1335,11 @@ headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggeste
background-image: none; background-image: none;
box-shadow: none; } box-shadow: none; }
headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled { headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
background-color: rgba(119, 119, 119, 0.55); border-color: rgba(255, 255, 255, 0.12);
background-color: rgba(72, 72, 72, 0.55);
box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); } box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
headerbar button.suggested-action.flat:disabled label, .nemo-window .primary-toolbar button.suggested-action.flat:disabled label, headerbar button.suggested-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled label, headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled label, .nemo-window .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled { headerbar button.suggested-action.flat:disabled label, .nemo-window .primary-toolbar button.suggested-action.flat:disabled label, headerbar button.suggested-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled label, headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled label, .nemo-window .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
color: rgba(225, 219, 219, 0.35); } color: rgba(222, 222, 222, 0.45); }
headerbar button.suggested-action:backdrop, .nemo-window .primary-toolbar button.suggested-action:backdrop, headerbar button.suggested-action:backdrop, .nemo-window .primary-toolbar button.suggested-action:backdrop,
headerbar button.suggested-action:backdrop, headerbar button.suggested-action:backdrop,
.nemo-window .primary-toolbar button.suggested-action:backdrop { .nemo-window .primary-toolbar button.suggested-action:backdrop {
@ -1371,10 +1370,11 @@ headerbar button.destructive-action, .nemo-window .primary-toolbar button.destru
background-image: none; background-image: none;
box-shadow: none; } box-shadow: none; }
headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled { headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
background-color: rgba(119, 119, 119, 0.55); border-color: rgba(255, 255, 255, 0.12);
background-color: rgba(72, 72, 72, 0.55);
box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); } box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
headerbar button.destructive-action.flat:disabled label, .nemo-window .primary-toolbar button.destructive-action.flat:disabled label, headerbar button.destructive-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled label, headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled label, .nemo-window .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled { headerbar button.destructive-action.flat:disabled label, .nemo-window .primary-toolbar button.destructive-action.flat:disabled label, headerbar button.destructive-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled label, headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled label, .nemo-window .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
color: rgba(225, 219, 219, 0.35); } color: rgba(222, 222, 222, 0.45); }
headerbar button.destructive-action:backdrop, .nemo-window .primary-toolbar button.destructive-action:backdrop, headerbar button.destructive-action:backdrop, .nemo-window .primary-toolbar button.destructive-action:backdrop,
headerbar button.destructive-action:backdrop, headerbar button.destructive-action:backdrop,
.nemo-window .primary-toolbar button.destructive-action:backdrop { .nemo-window .primary-toolbar button.destructive-action:backdrop {
@ -1627,9 +1627,6 @@ menubar,
.menubar > menuitem:disabled { .menubar > menuitem:disabled {
color: rgba(225, 219, 219, 0.2); color: rgba(225, 219, 219, 0.2);
border-color: transparent; } border-color: transparent; }
menubar > menuitem label:disabled,
.menubar > menuitem label:disabled {
color: rgba(225, 219, 219, 0.2); }
menu, menu,
.menu { .menu {
@ -2233,6 +2230,10 @@ infobar radio:checked:disabled {
checkbutton.text-button, radiobutton.text-button { checkbutton.text-button, radiobutton.text-button {
padding: 2px 0; padding: 2px 0;
outline-offset: 0; } outline-offset: 0; }
checkbutton.text-button:hover, radiobutton.text-button:hover {
color: #b8b8b8; }
checkbutton.text-button:disabled, radiobutton.text-button:disabled {
color: rgba(222, 222, 222, 0.45); }
checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child { checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child {
margin-left: 4px; } margin-left: 4px; }
checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child { checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child {

View File

@ -77,8 +77,6 @@ popover.background label.separator {
label selection { label selection {
color: #ffffff; color: #ffffff;
background-color: #0e6bff; } background-color: #0e6bff; }
label:disabled {
color: rgba(36, 36, 36, 0.55); }
.dim-label, label.separator, popover label.separator, .dim-label, label.separator, popover label.separator,
popover.background label.separator, headerbar .subtitle, popover.background label.separator, headerbar .subtitle,
@ -1337,10 +1335,11 @@ headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggeste
background-image: none; background-image: none;
box-shadow: none; } box-shadow: none; }
headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled { headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
background-color: white; border-color: rgba(0, 0, 0, 0.11);
background-color: rgba(255, 255, 255, 0.55);
box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); } box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
headerbar button.suggested-action.flat:disabled label, .nemo-window .primary-toolbar button.suggested-action.flat:disabled label, headerbar button.suggested-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled label, headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled label, .nemo-window .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled { headerbar button.suggested-action.flat:disabled label, .nemo-window .primary-toolbar button.suggested-action.flat:disabled label, headerbar button.suggested-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled label, headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled label, .nemo-window .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
color: rgba(40, 32, 32, 0.35); } color: rgba(36, 36, 36, 0.55); }
headerbar button.suggested-action:backdrop, .nemo-window .primary-toolbar button.suggested-action:backdrop, headerbar button.suggested-action:backdrop, .nemo-window .primary-toolbar button.suggested-action:backdrop,
headerbar button.suggested-action:backdrop, headerbar button.suggested-action:backdrop,
.nemo-window .primary-toolbar button.suggested-action:backdrop { .nemo-window .primary-toolbar button.suggested-action:backdrop {
@ -1371,10 +1370,11 @@ headerbar button.destructive-action, .nemo-window .primary-toolbar button.destru
background-image: none; background-image: none;
box-shadow: none; } box-shadow: none; }
headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled { headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
background-color: white; border-color: rgba(0, 0, 0, 0.11);
background-color: rgba(255, 255, 255, 0.55);
box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); } box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
headerbar button.destructive-action.flat:disabled label, .nemo-window .primary-toolbar button.destructive-action.flat:disabled label, headerbar button.destructive-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled label, headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled label, .nemo-window .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled { headerbar button.destructive-action.flat:disabled label, .nemo-window .primary-toolbar button.destructive-action.flat:disabled label, headerbar button.destructive-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled label, headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled label, .nemo-window .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
color: rgba(40, 32, 32, 0.35); } color: rgba(36, 36, 36, 0.55); }
headerbar button.destructive-action:backdrop, .nemo-window .primary-toolbar button.destructive-action:backdrop, headerbar button.destructive-action:backdrop, .nemo-window .primary-toolbar button.destructive-action:backdrop,
headerbar button.destructive-action:backdrop, headerbar button.destructive-action:backdrop,
.nemo-window .primary-toolbar button.destructive-action:backdrop { .nemo-window .primary-toolbar button.destructive-action:backdrop {
@ -1625,9 +1625,6 @@ menubar,
.menubar > menuitem:disabled { .menubar > menuitem:disabled {
color: rgba(40, 32, 32, 0.2); color: rgba(40, 32, 32, 0.2);
border-color: transparent; } border-color: transparent; }
menubar > menuitem label:disabled,
.menubar > menuitem label:disabled {
color: rgba(40, 32, 32, 0.2); }
menu, menu,
.menu { .menu {
@ -2231,6 +2228,10 @@ infobar radio:checked:disabled {
checkbutton.text-button, radiobutton.text-button { checkbutton.text-button, radiobutton.text-button {
padding: 2px 0; padding: 2px 0;
outline-offset: 0; } outline-offset: 0; }
checkbutton.text-button:hover, radiobutton.text-button:hover {
color: black; }
checkbutton.text-button:disabled, radiobutton.text-button:disabled {
color: rgba(36, 36, 36, 0.55); }
checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child { checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child {
margin-left: 4px; } margin-left: 4px; }
checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child { checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child {

View File

@ -126,7 +126,7 @@ label {
} }
&:disabled { &:disabled {
color: $insensitive_fg_color; // color: $insensitive_fg_color;
selection { @extend %selected_items:disabled; } selection { @extend %selected_items:disabled; }
} }
} }
@ -1431,7 +1431,7 @@ headerbar {
box-shadow: none; box-shadow: none;
} }
&.flat:disabled, &.flat:disabled,
&:disabled { @include button(header-insensitive); } &:disabled { @include button(insensitive); }
} }
button.#{$b_type}:backdrop, button.#{$b_type}:backdrop,
button.#{$b_type}:backdrop { button.#{$b_type}:backdrop {
@ -1763,9 +1763,6 @@ menubar,
color: transparentize($header_fg, 0.6); color: transparentize($header_fg, 0.6);
border-color: transparent; border-color: transparent;
} }
label { &:disabled { color: transparentize($header_fg, 0.6); } }
} }
} }
@ -2305,6 +2302,8 @@ checkbutton, radiobutton {
&.text-button { &.text-button {
padding: 2px 0; padding: 2px 0;
outline-offset: 0; outline-offset: 0;
&:hover { color: darken($fg_color, 15%); }
&:disabled { color: $insensitive_fg_color; }
} }
label:not(:only-child) { label:not(:only-child) {