diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 75ed9365..220cb829 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -1890,7 +1890,6 @@ menubar, menubar:backdrop, .menubar:backdrop { - background-color: #2C2C2C; color: rgba(255, 255, 255, 0.7); } @@ -1898,6 +1897,10 @@ menubar:backdrop, transition: all 75ms cubic-bezier(0, 0, 0.2, 1); } +.csd menubar:backdrop, .csd .menubar:backdrop { + background-color: #2C2C2C; +} + menubar > menuitem, .menubar > menuitem { transition: all 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1914,6 +1917,11 @@ menubar > menuitem:hover, color: #FFFFFF; } +menubar > menuitem:backdrop, +.menubar > menuitem:backdrop { + color: rgba(255, 255, 255, 0.5); +} + menubar > menuitem:disabled, .menubar > menuitem:disabled { color: rgba(255, 255, 255, 0.3); @@ -7796,6 +7804,10 @@ menubar.-vala-panel-background > menuitem:disabled { } .nemo-window .primary-toolbar button.text-button:disabled { + color: rgba(255, 255, 255, 0.3); +} + +.nemo-window .primary-toolbar button.text-button:backdrop { color: rgba(255, 255, 255, 0.5); } diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index f8640fdd..a8c53e02 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -1890,7 +1890,6 @@ menubar, menubar:backdrop, .menubar:backdrop { - background-color: #FAFAFA; color: rgba(0, 0, 0, 0.6); } @@ -1898,6 +1897,10 @@ menubar:backdrop, transition: all 75ms cubic-bezier(0, 0, 0.2, 1); } +.csd menubar:backdrop, .csd .menubar:backdrop { + background-color: #FAFAFA; +} + menubar > menuitem, .menubar > menuitem { transition: all 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1914,6 +1917,11 @@ menubar > menuitem:hover, color: rgba(0, 0, 0, 0.87); } +menubar > menuitem:backdrop, +.menubar > menuitem:backdrop { + color: rgba(0, 0, 0, 0.38); +} + menubar > menuitem:disabled, .menubar > menuitem:disabled { color: rgba(0, 0, 0, 0.26); @@ -7787,6 +7795,10 @@ menubar.-vala-panel-background > menuitem:disabled { } .nemo-window .primary-toolbar button.text-button:disabled { + color: rgba(0, 0, 0, 0.26); +} + +.nemo-window .primary-toolbar button.text-button:backdrop { color: rgba(0, 0, 0, 0.38); } diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css index c5d9376e..d187e640 100644 --- a/src/main/gtk-3.0/gtk.css +++ b/src/main/gtk-3.0/gtk.css @@ -1899,7 +1899,6 @@ menubar, menubar:backdrop, .menubar:backdrop { - background-color: #2C2C2C; color: rgba(255, 255, 255, 0.7); } @@ -1907,6 +1906,10 @@ menubar:backdrop, transition: all 75ms cubic-bezier(0, 0, 0.2, 1); } +.csd menubar:backdrop, .csd .menubar:backdrop { + background-color: #2C2C2C; +} + menubar > menuitem, .menubar > menuitem { transition: all 75ms cubic-bezier(0, 0, 0.2, 1); @@ -1923,6 +1926,11 @@ menubar > menuitem:hover, color: #FFFFFF; } +menubar > menuitem:backdrop, +.menubar > menuitem:backdrop { + color: rgba(255, 255, 255, 0.5); +} + menubar > menuitem:disabled, .menubar > menuitem:disabled { color: rgba(255, 255, 255, 0.3); @@ -7796,6 +7804,10 @@ menubar.-vala-panel-background > menuitem:disabled { } .nemo-window .primary-toolbar button.text-button:disabled { + color: rgba(255, 255, 255, 0.3); +} + +.nemo-window .primary-toolbar button.text-button:backdrop { color: rgba(255, 255, 255, 0.5); } diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index b26f9785..c4c3a34d 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1638,11 +1638,16 @@ menubar, box-shadow: inset 0 -1px $border; &:backdrop { - background-color: $titlebar-backdrop; color: $titlebar-text-secondary; } - .csd & { transition: $transition; } + .csd & { + transition: $transition; + + &:backdrop { + background-color: $titlebar-backdrop; + } + } > menuitem { transition: $transition; @@ -1657,6 +1662,8 @@ menubar, color: $titlebar-text; } + &:backdrop { color: $titlebar-text-disabled; } + &:disabled { color: $titlebar-text-secondary-disabled; } label:disabled { color: inherit; } // to inherit the above color diff --git a/src/sass/gtk/apps/_nemo.scss b/src/sass/gtk/apps/_nemo.scss index 03f0f8fb..44423e96 100644 --- a/src/sass/gtk/apps/_nemo.scss +++ b/src/sass/gtk/apps/_nemo.scss @@ -36,7 +36,9 @@ &:hover, &:active, &:checked { color: $titlebar-text; } - &:disabled { color: $titlebar-text-disabled; } + &:disabled { color: $titlebar-text-secondary-disabled; } + + &:backdrop { color: $titlebar-text-disabled; } } .path-bar.linked:not(.vertical) > button {