From: Matthias Clasen Date: Fri, 24 Jan 2020 02:00:40 +0000 (-0500) Subject: Adwaita: Drop menuitem support X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~189^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=00be314feb402faa4b3f73d96f9a5dced6ffaf6f;p=gtk4.git Adwaita: Drop menuitem support menuitems don't exist anymore. --- diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index e23daa1e0a..199d3ac7a2 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -956,7 +956,7 @@ toolbar.inline-toolbar toolbutton { border-bottom-right-radius: 0; } -%linked_vertical{ +%linked_vertical { &:not(:first-child) { @extend %linked_not_top; } &:not(:last-child) { @extend %linked_not_bottom; } @@ -973,8 +973,7 @@ toolbar.inline-toolbar toolbutton { } /* menu buttons */ -modelbutton.flat, -.menuitem.button.flat { +modelbutton.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; @@ -2023,28 +2022,6 @@ menubar, &:backdrop { background-color: $backdrop_bg_color; } - > menuitem { - min-height: 16px; - padding: 4px 8px; - - // remove padding and rounding from menubar submenus - menu { - .csd &, & { - border-radius: 0; - padding: 0; - } - } - - &:hover { //Seems like it :hover even with keyboard focus - box-shadow: inset 0 -3px $selected_bg_color; - color: $link_color; - } - - &:disabled { - color: $insensitive_fg_color; - box-shadow: none; - } - } // remove padding and rounding from menubar submenu decoration .csd.popup decoration {border-radius:0;} } @@ -2067,49 +2044,6 @@ menu, &:backdrop { background-color: $backdrop_menu_color; } - menuitem { - min-height: 16px; - min-width: 40px; - padding: 4px 6px; - text-shadow: none; - - &:hover { - color: $selected_fg_color; - background-color: $selected_bg_color; - } - - &:disabled { - color: $insensitive_fg_color; - &:backdrop { color: $backdrop_insensitive_color; } - } - - &:backdrop, - &:backdrop:hover { - color: $backdrop_fg_color; - background-color: transparent; - } - - // submenu indicators - arrow { - min-height: 16px; - min-width: 16px; - - &:dir(ltr) { - -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); - margin-left: 10px; - } - - &:dir(rtl) { - -gtk-icon-source:-gtk-icontheme('pan-end-symbolic-rtl'); - margin-right: 10px; - } - } - - // avoids labels color being overridden, see - // https://bugzilla.gnome.org/show_bug.cgi?id=767058 - label { &:dir(rtl), &:dir(ltr) { color: inherit; }} - } - // overflow arrows > arrow { @include button(undecorated); @@ -2148,19 +2082,6 @@ menu, } } -menuitem { - accelerator { color: gtkalpha(currentColor,0.55); } - - check, - radio { - min-height: 16px; - min-width: 16px; - - &:dir(ltr) { margin-right: 7px; } - &:dir(rtl) { margin-left: 7px; } - } -} - /*************** * Popovers * ***************/ @@ -2779,24 +2700,6 @@ radio { &:backdrop { @include button(osd-backdrop); } &:disabled { @include button(osd-insensitive); } } - - @at-root %menu_check_radio, - menu menuitem & { - margin: 0; // this is a workaround for a menu check/radio size allocation issue - - &, &:checked, &:indeterminate { - &, &:hover, &:disabled { //FIXME use button reset mixin - min-height: 14px; - min-width: 14px; - background-image: none; - background-color: transparent; - box-shadow: none; - -gtk-icon-shadow: none; - color: inherit; - border-color: currentColor; - } - } - } } %check, diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index d89fae6c19..3edefee488 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -394,16 +394,16 @@ toolbar.inline-toolbar toolbutton:dir(ltr):not(:last-child) > button.flat, toolb .linked.vertical > spinbutton:not(:last-child):not(.vertical), spinbutton.vertical.linked > text:not(:last-child), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child), .linked.vertical > combobox:not(:last-child) > box > button.combo { border-bottom-style: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } -modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, popover.menu box.circular-buttons button.circular.image-button.model, list > row button.image-button:not(.flat), button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, calendar.button, .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; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } +modelbutton.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, popover.menu box.circular-buttons button.circular.image-button.model, list > row button.image-button:not(.flat), button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, calendar.button, .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; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 5px; outline-offset: -2px; } +modelbutton.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 5px; outline-offset: -2px; } -modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: #424242; } +modelbutton.flat:hover { background-color: #424242; } -modelbutton.flat:disabled, .menuitem.button.flat:disabled { color: #919190; } +modelbutton.flat:disabled { color: #919190; } -modelbutton.flat:disabled:backdrop, .menuitem.button.flat:disabled:backdrop { color: #5b5b5b; } +modelbutton.flat:disabled:backdrop { color: #5b5b5b; } modelbutton.flat arrow { background: none; min-width: 16px; min-height: 16px; } @@ -745,14 +745,6 @@ menubar, .menubar { padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { background-color: #353535; } -menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; } - -.csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; } - -menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #15539e; color: #3584e4; } - -menubar > menuitem:disabled, .menubar > menuitem:disabled { color: #919190; box-shadow: none; } - menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0; } .background.popup { background-color: transparent; } @@ -763,24 +755,6 @@ menu, .menu { padding: 4px 0px; background-color: #2f2f2f; border: 1px solid #1b menu:backdrop, .menu:backdrop { background-color: #313131; } -menu menuitem, .menu menuitem { min-height: 16px; min-width: 40px; padding: 4px 6px; text-shadow: none; } - -menu menuitem:hover, .menu menuitem:hover { color: #ffffff; background-color: #15539e; } - -menu menuitem:disabled, .menu menuitem:disabled { color: #919190; } - -menu menuitem:disabled:backdrop, .menu menuitem:disabled:backdrop { color: #5b5b5b; } - -menu menuitem:backdrop, menu menuitem:backdrop:hover, .menu menuitem:backdrop, .menu menuitem:backdrop:hover { color: #919190; background-color: transparent; } - -menu menuitem arrow, .menu menuitem arrow { min-height: 16px; min-width: 16px; } - -menu menuitem arrow:dir(ltr), .menu menuitem arrow:dir(ltr) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); margin-left: 10px; } - -menu menuitem arrow:dir(rtl), .menu menuitem arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); margin-right: 10px; } - -menu menuitem label:dir(rtl), menu menuitem label:dir(ltr), .menu menuitem label:dir(rtl), .menu menuitem label:dir(ltr) { color: inherit; } - 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; padding: 4px; background-color: #2f2f2f; border-radius: 0; } menu > arrow.top, .menu > arrow.top { margin-top: -6px; border-bottom: 1px solid #404040; border-top-right-radius: 5px; border-top-left-radius: 5px; -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } @@ -793,14 +767,6 @@ menu > arrow:backdrop, .menu > arrow:backdrop { background-color: #313131; } menu > arrow:disabled, .menu > arrow:disabled { color: transparent; background-color: transparent; border-color: transparent; } -menuitem accelerator { color: alpha(currentColor,0.55); } - -menuitem check, menuitem radio { min-height: 16px; min-width: 16px; } - -menuitem check:dir(ltr), menuitem radio:dir(ltr) { margin-right: 7px; } - -menuitem check:dir(rtl), menuitem radio:dir(rtl) { margin-left: 7px; } - /*************** Popovers * */ popover.background { background-color: transparent; font: initial; } @@ -1096,10 +1062,6 @@ check:backdrop, radio:backdrop { transition: 200ms ease-out; } .osd check:disabled, .osd radio:disabled { color: #8a8a89; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(58, 58, 57, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -popover.menu check, popover.menu radio, menu menuitem check, menu menuitem radio { margin: 0; } - -popover.menu check, popover.menu radio, popover.menu check:hover, popover.menu radio:hover, popover.menu check:disabled, popover.menu radio:disabled, popover.menu check:checked, popover.menu radio:checked, popover.menu check:checked:hover, popover.menu radio:checked:hover, popover.menu check:checked:disabled, popover.menu radio:checked:disabled, popover.menu check:indeterminate, popover.menu radio:indeterminate, popover.menu check:indeterminate:hover, popover.menu radio:indeterminate:hover, popover.menu check:indeterminate:disabled, popover.menu radio:indeterminate:disabled, menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate, menu menuitem radio:indeterminate:hover, menu menuitem radio:indeterminate:disabled { min-height: 14px; min-width: 14px; background-image: none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; border-color: currentColor; } - check { border-radius: 3px; -gtk-icon-size: 14px; } check:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); } @@ -1867,15 +1829,15 @@ button.titlebutton:backdrop { -gtk-icon-shadow: none; } .selection-mode headerbar button.titlebutton:backdrop, .selection-mode .titlebar button.titlebutton:backdrop, headerbar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.titlebutton:backdrop { -gtk-icon-shadow: none; } -.view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { background-color: #15539e; } +.view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { background-color: #15539e; } -label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { color: #ffffff; } +label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { color: #ffffff; } -label:disabled > selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, textview > text:disabled:selected:focus, textview > text:disabled:selected, textview > text > selection:disabled, flowbox > flowboxchild:disabled:selected, spinbutton:not(.vertical) > selection:disabled, spinbutton.vertical > text > selection:disabled, entry > selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, popover.menu box.inline-buttons button.image-button.model:disabled:selected, popover.menu modelbutton:disabled:selected { color: #8aa9ce; } +label:disabled > selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, textview > text:disabled:selected:focus, textview > text:disabled:selected, textview > text > selection:disabled, flowbox > flowboxchild:disabled:selected, spinbutton:not(.vertical) > selection:disabled, spinbutton.vertical > text > selection:disabled, entry > selection:disabled, modelbutton.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, popover.menu box.inline-buttons button.image-button.model:disabled:selected, popover.menu modelbutton:disabled:selected { color: #8aa9ce; } -label:backdrop > selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, textview > text:backdrop:selected:focus, textview > text:backdrop:selected, textview > text > selection:backdrop, flowbox > flowboxchild:backdrop:selected, spinbutton:not(.vertical) > selection:backdrop, spinbutton.vertical > text > selection:backdrop, entry > selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:selected, popover.menu modelbutton:backdrop:selected { color: #d6d6d6; } +label:backdrop > selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, textview > text:backdrop:selected:focus, textview > text:backdrop:selected, textview > text > selection:backdrop, flowbox > flowboxchild:backdrop:selected, spinbutton:not(.vertical) > selection:backdrop, spinbutton.vertical > text > selection:backdrop, entry > selection:backdrop, modelbutton.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:selected, popover.menu modelbutton:backdrop:selected { color: #d6d6d6; } -label:backdrop > selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, textview > text:backdrop:disabled:selected, textview > text > selection:backdrop:disabled, flowbox > flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) > selection:backdrop:disabled, spinbutton.vertical > text > selection:backdrop:disabled, entry > selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:disabled:selected, popover.menu modelbutton:backdrop:disabled:selected { color: #4f7aaf; } +label:backdrop > selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, textview > text:backdrop:disabled:selected, textview > text > selection:backdrop:disabled, flowbox > flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) > selection:backdrop:disabled, spinbutton.vertical > text > selection:backdrop:disabled, entry > selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:disabled:selected, popover.menu modelbutton:backdrop:disabled:selected { color: #4f7aaf; } .monospace { font-family: monospace; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 16c5291d33..483f4b5bb2 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -396,16 +396,16 @@ toolbar.inline-toolbar toolbutton:dir(ltr):not(:last-child) > button.flat, toolb .linked.vertical > spinbutton:not(:last-child):not(.vertical), spinbutton.vertical.linked > text:not(:last-child), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child), .linked.vertical > combobox:not(:last-child) > box > button.combo { border-bottom-style: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } -modelbutton.flat, .menuitem.button.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, popover.menu box.circular-buttons button.circular.image-button.model, list > row button.image-button:not(.flat), button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, calendar.button, .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; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } +modelbutton.flat, modelbutton.flat:backdrop, modelbutton.flat:backdrop:hover, popover.menu box.circular-buttons button.circular.image-button.model, list > row button.image-button:not(.flat), button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, calendar.button, .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; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; } /* menu buttons */ -modelbutton.flat, .menuitem.button.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 5px; outline-offset: -2px; } +modelbutton.flat { min-height: 26px; padding-left: 5px; padding-right: 5px; border-radius: 5px; outline-offset: -2px; } -modelbutton.flat:hover, .menuitem.button.flat:hover { background-color: white; } +modelbutton.flat:hover { background-color: white; } -modelbutton.flat:disabled, .menuitem.button.flat:disabled { color: #929595; } +modelbutton.flat:disabled { color: #929595; } -modelbutton.flat:disabled:backdrop, .menuitem.button.flat:disabled:backdrop { color: #d4cfca; } +modelbutton.flat:disabled:backdrop { color: #d4cfca; } modelbutton.flat arrow { background: none; min-width: 16px; min-height: 16px; } @@ -753,14 +753,6 @@ menubar, .menubar { padding: 0px; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); } menubar:backdrop, .menubar:backdrop { background-color: #f6f5f4; } -menubar > menuitem, .menubar > menuitem { min-height: 16px; padding: 4px 8px; } - -.csd menubar > menuitem menu, menubar > menuitem menu, .csd .menubar > menuitem menu, .menubar > menuitem menu { border-radius: 0; padding: 0; } - -menubar > menuitem:hover, .menubar > menuitem:hover { box-shadow: inset 0 -3px #3584e4; color: #1b6acb; } - -menubar > menuitem:disabled, .menubar > menuitem:disabled { color: #929595; box-shadow: none; } - menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0; } .background.popup { background-color: transparent; } @@ -771,24 +763,6 @@ menu, .menu { padding: 4px 0px; background-color: #ffffff; border: 1px solid #cd menu:backdrop, .menu:backdrop { background-color: #fcfcfc; } -menu menuitem, .menu menuitem { min-height: 16px; min-width: 40px; padding: 4px 6px; text-shadow: none; } - -menu menuitem:hover, .menu menuitem:hover { color: #ffffff; background-color: #3584e4; } - -menu menuitem:disabled, .menu menuitem:disabled { color: #929595; } - -menu menuitem:disabled:backdrop, .menu menuitem:disabled:backdrop { color: #d4cfca; } - -menu menuitem:backdrop, menu menuitem:backdrop:hover, .menu menuitem:backdrop, .menu menuitem:backdrop:hover { color: #929595; background-color: transparent; } - -menu menuitem arrow, .menu menuitem arrow { min-height: 16px; min-width: 16px; } - -menu menuitem arrow:dir(ltr), .menu menuitem arrow:dir(ltr) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); margin-left: 10px; } - -menu menuitem arrow:dir(rtl), .menu menuitem arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); margin-right: 10px; } - -menu menuitem label:dir(rtl), menu menuitem label:dir(ltr), .menu menuitem label:dir(rtl), .menu menuitem label:dir(ltr) { color: inherit; } - 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; padding: 4px; background-color: #ffffff; border-radius: 0; } menu > arrow.top, .menu > arrow.top { margin-top: -6px; border-bottom: 1px solid #eaebeb; border-top-right-radius: 5px; border-top-left-radius: 5px; -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } @@ -801,14 +775,6 @@ menu > arrow:backdrop, .menu > arrow:backdrop { background-color: #fcfcfc; } menu > arrow:disabled, .menu > arrow:disabled { color: transparent; background-color: transparent; border-color: transparent; } -menuitem accelerator { color: alpha(currentColor,0.55); } - -menuitem check, menuitem radio { min-height: 16px; min-width: 16px; } - -menuitem check:dir(ltr), menuitem radio:dir(ltr) { margin-right: 7px; } - -menuitem check:dir(rtl), menuitem radio:dir(rtl) { margin-left: 7px; } - /*************** Popovers * */ popover.background { background-color: transparent; font: initial; } @@ -1112,10 +1078,6 @@ row:selected check, row:selected radio { border-color: #185fb4; } .osd check:disabled, .osd radio:disabled { color: #919190; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(71, 71, 71, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; } -popover.menu check, popover.menu radio, menu menuitem check, menu menuitem radio { margin: 0; } - -popover.menu check, popover.menu radio, popover.menu check:hover, popover.menu radio:hover, popover.menu check:disabled, popover.menu radio:disabled, popover.menu check:checked, popover.menu radio:checked, popover.menu check:checked:hover, popover.menu radio:checked:hover, popover.menu check:checked:disabled, popover.menu radio:checked:disabled, popover.menu check:indeterminate, popover.menu radio:indeterminate, popover.menu check:indeterminate:hover, popover.menu radio:indeterminate:hover, popover.menu check:indeterminate:disabled, popover.menu radio:indeterminate:disabled, menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem radio, menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate, menu menuitem radio:indeterminate:hover, menu menuitem radio:indeterminate:disabled { min-height: 14px; min-width: 14px; background-image: none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; border-color: currentColor; } - check { border-radius: 3px; -gtk-icon-size: 14px; } check:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); } @@ -1883,15 +1845,15 @@ button.titlebutton:backdrop { -gtk-icon-shadow: none; } .selection-mode headerbar button.titlebutton:backdrop, .selection-mode .titlebar button.titlebutton:backdrop, headerbar.selection-mode button.titlebutton:backdrop, .titlebar.selection-mode button.titlebutton:backdrop { -gtk-icon-shadow: none; } -.view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { background-color: #3584e4; } +.view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { background-color: #3584e4; } -label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { color: #ffffff; } +label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, textview > text:selected, textview > text > selection:focus, textview > text > selection, flowbox > flowboxchild:selected, spinbutton:not(.vertical) > selection, spinbutton.vertical > text > selection, entry > selection, modelbutton.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, popover.menu box.inline-buttons button.image-button.model:selected, popover.menu modelbutton:selected { color: #ffffff; } -label:disabled > selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, textview > text:disabled:selected:focus, textview > text:disabled:selected, textview > text > selection:disabled, flowbox > flowboxchild:disabled:selected, spinbutton:not(.vertical) > selection:disabled, spinbutton.vertical > text > selection:disabled, entry > selection:disabled, modelbutton.flat:disabled:selected, .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, popover.menu box.inline-buttons button.image-button.model:disabled:selected, popover.menu modelbutton:disabled:selected { color: #9ac2f2; } +label:disabled > selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, textview > text:disabled:selected:focus, textview > text:disabled:selected, textview > text > selection:disabled, flowbox > flowboxchild:disabled:selected, spinbutton:not(.vertical) > selection:disabled, spinbutton.vertical > text > selection:disabled, entry > selection:disabled, modelbutton.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, popover.menu box.inline-buttons button.image-button.model:disabled:selected, popover.menu modelbutton:disabled:selected { color: #9ac2f2; } -label:backdrop > selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, textview > text:backdrop:selected:focus, textview > text:backdrop:selected, textview > text > selection:backdrop, flowbox > flowboxchild:backdrop:selected, spinbutton:not(.vertical) > selection:backdrop, spinbutton.vertical > text > selection:backdrop, entry > selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:selected, popover.menu modelbutton:backdrop:selected { color: #fcfcfc; } +label:backdrop > selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, textview > text:backdrop:selected:focus, textview > text:backdrop:selected, textview > text > selection:backdrop, flowbox > flowboxchild:backdrop:selected, spinbutton:not(.vertical) > selection:backdrop, spinbutton.vertical > text > selection:backdrop, entry > selection:backdrop, modelbutton.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:selected, popover.menu modelbutton:backdrop:selected { color: #fcfcfc; } -label:backdrop > selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, textview > text:backdrop:disabled:selected, textview > text > selection:backdrop:disabled, flowbox > flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) > selection:backdrop:disabled, spinbutton.vertical > text > selection:backdrop:disabled, entry > selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:disabled:selected, popover.menu modelbutton:backdrop:disabled:selected { color: #71a8eb; } +label:backdrop > selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, textview > text:backdrop:disabled:selected, textview > text > selection:backdrop:disabled, flowbox > flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) > selection:backdrop:disabled, spinbutton.vertical > text > selection:backdrop:disabled, entry > selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, popover.menu box.inline-buttons button.image-button.model:backdrop:disabled:selected, popover.menu modelbutton:backdrop:disabled:selected { color: #71a8eb; } .monospace { font-family: monospace; }