diff options
| author | Mate <[email protected]> | 2021-06-18 11:33:43 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-08-02 23:56:01 +0200 |
| commit | ea5fb9b39421bd0c2f9bc93cd249d27e94f175df (patch) | |
| tree | 5f80b781018e17822b4ca415f2351113028fbfd3 /desktop-themes | |
| parent | 6d96253eb1f48df0ef81e058e355fbf20fb629f8 (diff) | |
| download | mate-themes-ea5fb9b39421bd0c2f9bc93cd249d27e94f175df.tar.bz2 mate-themes-ea5fb9b39421bd0c2f9bc93cd249d27e94f175df.tar.xz | |
fix osd colors
Diffstat (limited to 'desktop-themes')
| -rw-r--r-- | desktop-themes/YaruGreen/gtk-3.0/_colors.scss | 6 | ||||
| -rw-r--r-- | desktop-themes/YaruGreen/gtk-3.0/_common.scss | 2 | ||||
| -rw-r--r-- | desktop-themes/YaruGreen/gtk-3.0/gtk.css | 70 | ||||
| -rw-r--r-- | desktop-themes/YaruOk/gtk-3.0/_apps.scss | 1 | ||||
| -rw-r--r-- | desktop-themes/YaruOk/gtk-3.0/_colors.scss | 6 | ||||
| -rw-r--r-- | desktop-themes/YaruOk/gtk-3.0/gtk.css | 70 |
6 files changed, 79 insertions, 76 deletions
diff --git a/desktop-themes/YaruGreen/gtk-3.0/_colors.scss b/desktop-themes/YaruGreen/gtk-3.0/_colors.scss index 7a7543d4..08934392 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/_colors.scss +++ b/desktop-themes/YaruGreen/gtk-3.0/_colors.scss @@ -65,9 +65,9 @@ $destructive_color: if($variant == 'light', $red, darken($red, 10%)); $osd_fg_color: #eeeeec; $osd_text_color: white; -$osd_bg_color: transparentize(darken($core_color_b, 50%), 0.15); -$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5); -$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%); +$osd_bg_color: transparentize(#252621, 0.2); +$osd_insensitive_bg_color: $osd_bg_color; +$osd_insensitive_fg_color: $osd_fg_color; $osd_borders_color: transparentize(black, 0.3); $sidebar_bg_color: mix($bg_color, $base_color, 50%); diff --git a/desktop-themes/YaruGreen/gtk-3.0/_common.scss b/desktop-themes/YaruGreen/gtk-3.0/_common.scss index 0022f9fd..ade64d1c 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/_common.scss +++ b/desktop-themes/YaruGreen/gtk-3.0/_common.scss @@ -3432,11 +3432,13 @@ scale { } &.horizontal slider { + min-width: 20px; } &.vertical slider { min-height: 20px; + } slider { diff --git a/desktop-themes/YaruGreen/gtk-3.0/gtk.css b/desktop-themes/YaruGreen/gtk-3.0/gtk.css index 5cd26441..579289a3 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/gtk.css +++ b/desktop-themes/YaruGreen/gtk-3.0/gtk.css @@ -85,7 +85,7 @@ assistant .sidebar label { padding: 6px 12px; } assistant .sidebar label.highlight { background-color: #bebdbc; } -.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { color: #eeeeec; border: none; background-color: rgba(114, 109, 103, 0.85); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } +.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { color: #eeeeec; border: none; background-color: rgba(37, 38, 33, 0.8); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -164,7 +164,7 @@ spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.verti .osd spinbutton:backdrop:not(.vertical), .osd entry:backdrop { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -.osd spinbutton:disabled:not(.vertical), .osd entry:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(127, 121, 116, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd spinbutton:disabled:not(.vertical), .osd entry:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(37, 38, 33, 0.8); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } spinbutton:not(.vertical) progress, entry progress { margin: 2px -6px; background-color: transparent; background-image: none; border-radius: 0; border-width: 0 0 2px; border-color: #4893f2; border-style: solid; box-shadow: none; } @@ -264,33 +264,33 @@ row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(di row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop { color: #fcfcfc; } -button.osd { min-width: 26px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } +button.osd { min-width: 26px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } button.osd.image-button { min-width: 34px; } -button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(145, 139, 133, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } +button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } button.osd:active, button.osd:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } -button.osd:disabled:backdrop, button.osd:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } +button.osd:disabled:backdrop, button.osd:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } -button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(114, 109, 103, 0.85)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } +button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } -.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button, .app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button, .app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -popover.background.touch-selection button:hover, popover.background.magnifier button:hover, .app-notification button:hover, .osd button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(145, 139, 133, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +popover.background.touch-selection button:hover, popover.background.magnifier button:hover, .app-notification button:hover, .osd button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:active, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .app-notification button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .app-notification button:backdrop, .osd button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(114, 109, 103, 0.85)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .app-notification button:backdrop, .osd button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } popover.background.touch-selection button.flat, popover.background.magnifier button.flat, .app-notification button.flat, .osd button.flat { 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; box-shadow: none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } -popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .app-notification button.flat:hover, .osd button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(145, 139, 133, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .app-notification button.flat:hover, .osd button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-image: none; border-color: transparent; box-shadow: none; } +popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-image: none; border-color: transparent; box-shadow: none; } popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop, .app-notification button.flat:backdrop, .osd button.flat:backdrop { 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; } @@ -324,7 +324,7 @@ button.suggested-action:disabled:active, button.suggested-action:disabled:checke .osd button.suggested-action:active:backdrop, .osd button.suggested-action:active, .osd button.suggested-action:checked:backdrop, .osd button.suggested-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(#93af66); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd button.suggested-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(147, 175, 102, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } @@ -356,7 +356,7 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch .osd button.destructive-action:active:backdrop, .osd button.destructive-action:active, .osd button.destructive-action:checked:backdrop, .osd button.destructive-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(#c7162b); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd button.destructive-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(199, 22, 43, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } @@ -523,7 +523,7 @@ spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 4px 0 0 4 .osd spinbutton:not(.vertical) button:backdrop { 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; color: #eeeeec; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } -.osd spinbutton:not(.vertical) button:disabled { 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; color: #b0ada9; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } +.osd spinbutton:not(.vertical) button:disabled { 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; color: #eeeeec; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 4px 4px 0; } @@ -543,15 +543,15 @@ spinbutton.vertical button.up { border-radius: 4px 4px 0 0; border-style: solid spinbutton.vertical button.down { border-radius: 0 0 4px 4px; border-style: none solid solid solid; } -.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(145, 139, 133, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } .osd spinbutton.vertical button:first-child:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd spinbutton.vertical button:first-child:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd spinbutton.vertical button:first-child:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -.osd spinbutton.vertical button:first-child:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(114, 109, 103, 0.85)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd spinbutton.vertical button:first-child:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } treeview spinbutton:not(.vertical) { min-height: 0; border-style: none; border-radius: 0; } @@ -569,7 +569,7 @@ toolbar { background-image: linear-gradient(to bottom, #f6f5f5 2px, #efeeed 50%, .osd toolbar { background-color: transparent; } -toolbar.osd { padding: 13px; border: none; border-radius: 5px; background-color: rgba(114, 109, 103, 0.85); } +toolbar.osd { padding: 13px; border: none; border-radius: 5px; background-color: rgba(37, 38, 33, 0.8); } toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom { border-radius: 0; } @@ -1186,15 +1186,15 @@ check:indeterminate:backdrop:disabled, radio:indeterminate:backdrop:disabled { b check:backdrop, radio:backdrop { transition: 200ms ease-out; } -.osd check, .osd radio { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd check, .osd radio { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -.osd check:hover, .osd radio:hover { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd check:hover, .osd radio:hover { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } .osd check:active, .osd radio:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd check:backdrop, .osd radio:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(114, 109, 103, 0.85)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd check:backdrop, .osd radio:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -.osd check:disabled, .osd radio:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd check:disabled, .osd radio:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } menu menuitem check, menu menuitem radio { margin: 0; } @@ -1237,7 +1237,7 @@ row:selected scale trough:disabled, scale row:selected trough:disabled, row:sele .osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); } -.osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(127, 121, 116, 0.5); } +.osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(37, 38, 33, 0.8); } scale highlight, progressbar progress { border: 1px solid #848c71; border-radius: 3px; background-color: #bfc6b0; } @@ -1295,17 +1295,17 @@ scale slider:backdrop:disabled { color: #c9c6c3; border-color: #a5a29f; backgrou row:selected scale slider:disabled, row:selected scale slider { border-color: #848c71; } -.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border-color: rgba(0, 0, 0, 0.7); background-color: #726d67; } +.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border-color: rgba(0, 0, 0, 0.7); background-color: #252621; } -.osd scale slider:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(145, 139, 133, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-color: #726d67; } +.osd scale slider:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-color: #252621; } -.osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); background-color: #726d67; } +.osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); background-color: #252621; } -.osd scale slider:disabled { color: #b0ada9; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(127, 121, 116, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #726d67; } +.osd scale slider:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #252621; } -.osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(114, 109, 103, 0.85)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #726d67; } +.osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #252621; } -.osd scale slider:backdrop:disabled { background-color: #726d67; } +.osd scale slider:backdrop:disabled { background-color: #252621; } scale marks, scale value { color: alpha(currentColor,0.55); font-feature-settings: "tnum"; } @@ -1603,7 +1603,7 @@ row.activatable:selected.has-open-popup, row.activatable:selected:hover { backgr row.activatable:selected:backdrop { background-color: #bfc6b0; } /********************* App Notifications * */ -.app-notification, .app-notification.frame { padding: 10px; border-radius: 0 0 5px 5px; background-color: rgba(114, 109, 103, 0.85); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px); background-clip: padding-box; } +.app-notification, .app-notification.frame { padding: 10px; border-radius: 0 0 5px 5px; background-color: rgba(37, 38, 33, 0.8); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px); background-clip: padding-box; } .app-notification:backdrop, .app-notification.frame:backdrop { background-image: none; transition: 200ms ease-out; } @@ -2363,13 +2363,13 @@ window.background.mate-terminal > box.vertical > notebook > header.top, window.b window.background.mate-terminal scrollbar, window.background.mate-terminal scrollbar:backdrop, window.background.mate-terminal scrollbar.vertical, window.background.mate-terminal scrollbar.vertical:backdrop { background-color: transparent; } /****************** multimedia OSD * */ -MsdOsdWindow.background.osd { border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); background-color: rgba(114, 109, 103, 0.85); color: #eeeeec; } +MsdOsdWindow.background.osd { border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); background-color: rgba(37, 38, 33, 0.8); color: #eeeeec; } MsdOsdWindow.background.osd .trough { border-radius: 4px; border: none; background: #3e3e37; } MsdOsdWindow.background.osd .progressbar { border-radius: 4px; background-color: #eeeeec; border: none; } -.background.osd { color: #eeeeec; background-image: none; background-color: rgba(114, 109, 103, 0.85); border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); } +.background.osd { color: #eeeeec; background-image: none; background-color: rgba(37, 38, 33, 0.8); border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); } .background.osd :selected { background-color: #bfc6b0; } @@ -2522,7 +2522,7 @@ treeview.view check:selected:focus:disabled, treeview.view check:selected:disabl treeview:hover { background: #bfc6b0; } -.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(138, 131, 125, 0.85)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-image: image(#e9e9e7); } +.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-image: image(#e9e9e7); } .osd scale slider:hover { background-image: image(#d6d6d1); } diff --git a/desktop-themes/YaruOk/gtk-3.0/_apps.scss b/desktop-themes/YaruOk/gtk-3.0/_apps.scss index ce947898..d187ba35 100644 --- a/desktop-themes/YaruOk/gtk-3.0/_apps.scss +++ b/desktop-themes/YaruOk/gtk-3.0/_apps.scss @@ -1124,6 +1124,7 @@ window#Main.background { } +// box > box > box > widget button { padding-left: 0px; padding-right: 0px; min-width: 2px; margin: 0px; } MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); diff --git a/desktop-themes/YaruOk/gtk-3.0/_colors.scss b/desktop-themes/YaruOk/gtk-3.0/_colors.scss index 909863ef..0751e80b 100644 --- a/desktop-themes/YaruOk/gtk-3.0/_colors.scss +++ b/desktop-themes/YaruOk/gtk-3.0/_colors.scss @@ -65,9 +65,9 @@ $destructive_color: if($variant == 'light', $red, darken($red, 10%)); $osd_fg_color: #eeeeec; $osd_text_color: white; -$osd_bg_color: transparentize(lighten($jet, 2%),0.025); -$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5); -$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%); +$osd_bg_color: transparentize(#252621, 0.2); +$osd_insensitive_bg_color: $osd_bg_color; +$osd_insensitive_fg_color: $osd_fg_color; $osd_borders_color: transparentize(black, 0.3); $sidebar_bg_color: mix($bg_color, $base_color, 50%); diff --git a/desktop-themes/YaruOk/gtk-3.0/gtk.css b/desktop-themes/YaruOk/gtk-3.0/gtk.css index 190ce96e..09c3e362 100644 --- a/desktop-themes/YaruOk/gtk-3.0/gtk.css +++ b/desktop-themes/YaruOk/gtk-3.0/gtk.css @@ -85,7 +85,7 @@ assistant .sidebar label { padding: 6px 12px; } assistant .sidebar label.highlight { background-color: #bebdbc; } -.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { color: #eeeeec; border: none; background-color: rgba(29, 29, 29, 0.975); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } +.csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { color: #eeeeec; border: none; background-color: rgba(37, 38, 33, 0.8); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { text-shadow: none; -gtk-icon-shadow: none; } @@ -164,7 +164,7 @@ spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.verti .osd spinbutton:backdrop:not(.vertical), .osd entry:backdrop { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -.osd spinbutton:disabled:not(.vertical), .osd entry:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(50, 50, 50, 0.5); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd spinbutton:disabled:not(.vertical), .osd entry:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(37, 38, 33, 0.8); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } spinbutton:not(.vertical) progress, entry progress { margin: 2px -6px; background-color: transparent; background-image: none; border-radius: 0; border-width: 0 0 2px; border-color: #4893f2; border-style: solid; box-shadow: none; } @@ -264,33 +264,33 @@ row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(di row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop { color: #fcfcfc; } -button.osd { min-width: 26px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } +button.osd { min-width: 26px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } button.osd.image-button { min-width: 34px; } -button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(60, 60, 60, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } +button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } button.osd:active, button.osd:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: none; } -button.osd:disabled:backdrop, button.osd:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } +button.osd:disabled:backdrop, button.osd:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } -button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(29, 29, 29, 0.975)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } +button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; border: none; } -.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button, .app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .app-notification button, .app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -popover.background.touch-selection button:hover, popover.background.magnifier button:hover, .app-notification button:hover, .osd button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(60, 60, 60, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +popover.background.touch-selection button:hover, popover.background.magnifier button:hover, .app-notification button:hover, .osd button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification button:active, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .app-notification button:checked, .osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd button:disabled:backdrop, .osd button:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .app-notification button:backdrop, .osd button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(29, 29, 29, 0.975)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .app-notification button:backdrop, .osd button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } popover.background.touch-selection button.flat, popover.background.magnifier button.flat, .app-notification button.flat, .osd button.flat { 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; box-shadow: none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; } -popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .app-notification button.flat:hover, .osd button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(60, 60, 60, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, .app-notification button.flat:hover, .osd button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-image: none; border-color: transparent; box-shadow: none; } +popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd button.flat:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-image: none; border-color: transparent; box-shadow: none; } popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop, .app-notification button.flat:backdrop, .osd button.flat:backdrop { 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; } @@ -324,7 +324,7 @@ button.suggested-action:disabled:active, button.suggested-action:disabled:checke .osd button.suggested-action:active:backdrop, .osd button.suggested-action:active, .osd button.suggested-action:checked:backdrop, .osd button.suggested-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(#93af66); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd button.suggested-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(147, 175, 102, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } @@ -356,7 +356,7 @@ button.destructive-action:disabled:active, button.destructive-action:disabled:ch .osd button.destructive-action:active:backdrop, .osd button.destructive-action:active, .osd button.destructive-action:checked:backdrop, .osd button.destructive-action:checked { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(#c7162b); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } .osd button.destructive-action:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(199, 22, 43, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } @@ -523,7 +523,7 @@ spinbutton:not(.vertical) button:dir(rtl):first-child { border-radius: 4px 0 0 4 .osd spinbutton:not(.vertical) button:backdrop { 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; color: #eeeeec; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } -.osd spinbutton:not(.vertical) button:disabled { 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; color: #868685; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } +.osd spinbutton:not(.vertical) button:disabled { 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; color: #eeeeec; border-color: rgba(0, 0, 0, 0.5); -gtk-icon-shadow: none; box-shadow: none; } .osd spinbutton:not(.vertical) button:dir(ltr):last-child { border-radius: 0 4px 4px 0; } @@ -543,15 +543,15 @@ spinbutton.vertical button.up { border-radius: 4px 4px 0 0; border-style: solid spinbutton.vertical button.down { border-radius: 0 0 4px 4px; border-style: none solid solid solid; } -.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd spinbutton.vertical button:first-child { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(60, 60, 60, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd spinbutton.vertical button:first-child:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } .osd spinbutton.vertical button:first-child:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd spinbutton.vertical button:first-child:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd spinbutton.vertical button:first-child:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -.osd spinbutton.vertical button:first-child:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(29, 29, 29, 0.975)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd spinbutton.vertical button:first-child:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } treeview spinbutton:not(.vertical) { min-height: 0; border-style: none; border-radius: 0; } @@ -569,7 +569,7 @@ toolbar { background-image: linear-gradient(to bottom, #f6f5f5 2px, #efeeed 50%, .osd toolbar { background-color: transparent; } -toolbar.osd { padding: 13px; border: none; border-radius: 5px; background-color: rgba(29, 29, 29, 0.975); } +toolbar.osd { padding: 13px; border: none; border-radius: 5px; background-color: rgba(37, 38, 33, 0.8); } toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom { border-radius: 0; } @@ -1186,15 +1186,15 @@ check:indeterminate:backdrop:disabled, radio:indeterminate:backdrop:disabled { b check:backdrop, radio:backdrop { transition: 200ms ease-out; } -.osd check, .osd radio { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd check, .osd radio { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } -.osd check:hover, .osd radio:hover { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } +.osd check:hover, .osd radio:hover { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); } .osd check:active, .osd radio:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); } -.osd check:backdrop, .osd radio:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(29, 29, 29, 0.975)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd check:backdrop, .osd radio:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -.osd check:disabled, .osd radio:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } +.osd check:disabled, .osd radio:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } menu menuitem check, menu menuitem radio { margin: 0; } @@ -1237,7 +1237,7 @@ row:selected scale trough:disabled, scale row:selected trough:disabled, row:sele .osd scale trough, scale .osd trough, .osd scale fill, scale .osd fill, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); } -.osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(50, 50, 50, 0.5); } +.osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd progressbar trough:disabled, progressbar .osd trough:disabled { background-color: rgba(37, 38, 33, 0.8); } scale highlight, progressbar progress { border: 1px solid #5a85bb; border-radius: 3px; background-color: #89addb; } @@ -1295,17 +1295,17 @@ scale slider:backdrop:disabled { color: #c9c6c3; border-color: #b1aeab; backgrou row:selected scale slider:disabled, row:selected scale slider { border-color: #5a85bb; } -.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border-color: rgba(0, 0, 0, 0.7); background-color: #1d1d1d; } +.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border-color: rgba(0, 0, 0, 0.7); background-color: #252621; } -.osd scale slider:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(60, 60, 60, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-color: #1d1d1d; } +.osd scale slider:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(69, 71, 61, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-color: #252621; } -.osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); background-color: #1d1d1d; } +.osd scale slider:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); background-color: #252621; } -.osd scale slider:disabled { color: #868685; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(50, 50, 50, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #1d1d1d; } +.osd scale slider:disabled { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #252621; } -.osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(29, 29, 29, 0.975)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #1d1d1d; } +.osd scale slider:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 38, 33, 0.8)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-color: #252621; } -.osd scale slider:backdrop:disabled { background-color: #1d1d1d; } +.osd scale slider:backdrop:disabled { background-color: #252621; } scale marks, scale value { color: alpha(currentColor,0.55); font-feature-settings: "tnum"; } @@ -1603,7 +1603,7 @@ row.activatable:selected.has-open-popup, row.activatable:selected:hover { backgr row.activatable:selected:backdrop { background-color: #89addb; } /********************* App Notifications * */ -.app-notification, .app-notification.frame { padding: 10px; border-radius: 0 0 5px 5px; background-color: rgba(29, 29, 29, 0.975); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px); background-clip: padding-box; } +.app-notification, .app-notification.frame { padding: 10px; border-radius: 0 0 5px 5px; background-color: rgba(37, 38, 33, 0.8); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px); background-clip: padding-box; } .app-notification:backdrop, .app-notification.frame:backdrop { background-image: none; transition: 200ms ease-out; } @@ -2363,13 +2363,13 @@ window.background.mate-terminal > box.vertical > notebook > header.top, window.b window.background.mate-terminal scrollbar, window.background.mate-terminal scrollbar:backdrop, window.background.mate-terminal scrollbar.vertical, window.background.mate-terminal scrollbar.vertical:backdrop { background-color: transparent; } /****************** multimedia OSD * */ -MsdOsdWindow.background.osd { border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); background-color: rgba(29, 29, 29, 0.975); color: #eeeeec; } +MsdOsdWindow.background.osd { border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); background-color: rgba(37, 38, 33, 0.8); color: #eeeeec; } MsdOsdWindow.background.osd .trough { border-radius: 4px; border: none; background: #3e3e37; } MsdOsdWindow.background.osd .progressbar { border-radius: 4px; background-color: #eeeeec; border: none; } -.background.osd { color: #eeeeec; background-image: none; background-color: rgba(29, 29, 29, 0.975); border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); } +.background.osd { color: #eeeeec; background-image: none; background-color: rgba(37, 38, 33, 0.8); border-radius: 7px; border: 1px solid rgba(255, 255, 255, 0.15); } .background.osd :selected { background-color: #89addb; } @@ -2522,7 +2522,7 @@ treeview.view check:selected:focus:disabled, treeview.view check:selected:disabl treeview:hover { background: #89addb; } -.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(52, 52, 52, 0.975)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-image: image(#e9e9e7); } +.osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(61, 63, 54, 0.8)); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); background-image: image(#e9e9e7); } .osd scale slider:hover { background-image: image(#d6d6d1); } |