From f3ca8abb366cb00179f9525edd3518a1aa6f4096 Mon Sep 17 00:00:00 2001 From: Itiel Date: Fri, 3 Apr 2020 19:17:33 +0000 Subject: [PATCH] Bug 1627036 - Convert all relevant uses of left/right to logical properties in toolkit/themes/osx r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D69444 --HG-- extra : moz-landing-system : lando --- toolkit/themes/osx/global/checkbox.css | 4 +-- .../osx/global/dirListing/dirListing.css | 6 ++-- toolkit/themes/osx/global/global.css | 16 ++++----- .../themes/osx/global/in-content/common.css | 11 ++----- toolkit/themes/osx/global/menu.css | 33 +++++++++---------- toolkit/themes/osx/global/netError.css | 28 ++-------------- toolkit/themes/osx/global/popup.css | 23 +++++-------- toolkit/themes/osx/global/radio.css | 7 ++-- toolkit/themes/osx/global/toolbar.css | 8 ++--- toolkit/themes/osx/global/wizard.css | 2 +- .../mozapps/downloads/unknownContentType.css | 9 ++--- 11 files changed, 47 insertions(+), 100 deletions(-) diff --git a/toolkit/themes/osx/global/checkbox.css b/toolkit/themes/osx/global/checkbox.css index 9d7a7b0f1368..2076be68e3bd 100644 --- a/toolkit/themes/osx/global/checkbox.css +++ b/toolkit/themes/osx/global/checkbox.css @@ -11,7 +11,7 @@ checkbox { } .checkbox-icon { - margin-right: 2px; + margin-inline-end: 2px; } .checkbox-label { @@ -35,5 +35,3 @@ checkbox[disabled="true"] { width: 1.3em; height: 1.3em; } - - diff --git a/toolkit/themes/osx/global/dirListing/dirListing.css b/toolkit/themes/osx/global/dirListing/dirListing.css index 1a5eee9cd012..e4c74dcf217b 100644 --- a/toolkit/themes/osx/global/dirListing/dirListing.css +++ b/toolkit/themes/osx/global/dirListing/dirListing.css @@ -6,8 +6,7 @@ background-color: -moz-dialog; color: -moz-dialogtext; font: message-box; - padding-left: 2em; - padding-right: 2em; + padding-inline: 2em; } body { @@ -85,8 +84,7 @@ td:not(:first-child) { } .up::before { - margin-inline-end: 4px; - margin-inline-start: -20px; + margin-inline: -20px 4px; vertical-align: middle; content: url(chrome://global/skin/dirListing/up.png); } diff --git a/toolkit/themes/osx/global/global.css b/toolkit/themes/osx/global/global.css index 3c4e248f6565..76469cd4c48d 100644 --- a/toolkit/themes/osx/global/global.css +++ b/toolkit/themes/osx/global/global.css @@ -32,7 +32,7 @@ font: message-box; } -/* ::::: alert icons :::::*/ +/* ::::: Alert icons :::::*/ .message-icon, .alert-icon, @@ -79,7 +79,7 @@ xul|iframe { } } -/* ::::: miscellaneous formatting ::::: */ +/* ::::: Miscellaneous formatting ::::: */ :root:-moz-lwtheme { -moz-appearance: none; @@ -110,23 +110,19 @@ xul|separator.thin[orient="vertical"] { xul|separator.groove:not([orient="vertical"]) { border-top: 1px solid #A3A3A3; height: 0; - margin-top: 0.4em; - margin-bottom: 0.4em; + margin-block: 0.4em; } xul|separator.groove[orient="vertical"] { border-left: 1px solid #A3A3A3; width: 0; - margin-left: 0.4em; - margin-right: 0.4em; + margin-inline: 0.4em; } xul|description, xul|label { cursor: default; - margin-top: 1px; - margin-bottom: 2px; - margin-inline-start: 6px; - margin-inline-end: 5px; + margin-block: 1px 2px; + margin-inline: 6px 5px; } xul|description { diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css index 6b761ae7e756..77eb51d5b00e 100644 --- a/toolkit/themes/osx/global/in-content/common.css +++ b/toolkit/themes/osx/global/in-content/common.css @@ -6,8 +6,7 @@ %include ../../../shared/in-content/common.inc.css xul|tabs { - padding-right: 0; - padding-left: 0; + padding-inline: 0; position: static; } @@ -40,10 +39,7 @@ xul|*.help-button > xul|*.button-box > xul|*.button-icon { margin-inline-start: 0; } -xul|*.checkbox-icon { - margin-right: 0; -} - +xul|*.checkbox-icon, xul|*.radio-icon { margin-inline-end: 0; } @@ -69,8 +65,7 @@ xul|radio[focused="true"] > .radio-check { xul|search-textbox { -moz-appearance: none; - padding-inline-start: 8px; - padding-inline-end: 8px; + padding-inline: 8px; } xul|search-textbox::part(search-sign) { diff --git a/toolkit/themes/osx/global/menu.css b/toolkit/themes/osx/global/menu.css index 2812b43c97ac..72be3628fc7e 100644 --- a/toolkit/themes/osx/global/menu.css +++ b/toolkit/themes/osx/global/menu.css @@ -28,7 +28,7 @@ menucaption { font-weight: bold; } -/* ..... internal content .... */ +/* Internal content */ .menu-text, .menu-iconic-text, @@ -39,8 +39,7 @@ menucaption { .menu-iconic-icon { height: 16px; - margin-top: -2px; - margin-bottom: -2px; + margin-block: -2px; margin-inline-end: 5px; /* Empty icons shouldn't take up room, so we need to compensate * the 5px margin-end with a negative margin-start. @@ -53,8 +52,7 @@ menucaption { .menu-iconic, menuitem[image] { /* 2px higher than those without icons */ - padding-top: 1px; - padding-bottom: 3px; + padding-block: 1px 3px; } .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon, @@ -64,12 +62,11 @@ menuitem[image] > .menu-iconic-left > .menu-iconic-icon { width: 16px; } -/* ..... menu arrow box ..... */ +/* menu arrow box */ .menu-right, .menu-accel-container { - margin-inline-start: 21px; - margin-inline-end: -9px; + margin-inline: 21px -9px; -moz-box-pack: end; } @@ -78,11 +75,12 @@ menuitem[image] > .menu-iconic-left > .menu-iconic-icon { -moz-appearance: menuarrow; } -/* ::::: menu/menuitems in menubar ::::: */ +/* menu/menuitems in menubar */ menubar > menu { -moz-appearance: none; - padding: 2px 5px 2px 7px; + padding-block: 2px; + padding-inline: 7px 5px; margin: 1px 0; } @@ -97,7 +95,7 @@ menubar > menu[_moz-menuactive="true"][open="true"] { color: -moz-mac-menutextselect; } -/* ..... internal content .... */ +/* Internal content */ .menubar-left { margin: 0 2px; @@ -107,7 +105,7 @@ menubar > menu[_moz-menuactive="true"][open="true"] { margin: 0 1px !important; } -/* ::::: menu/menuitems in popups ::::: */ +/* menu/menuitems in popups */ menupopup { font: -moz-pull-down-menu; @@ -128,11 +126,10 @@ menuitem[_moz-menuactive="true"] { menuitem[customoptionstyling="true"] { -moz-appearance: none; - padding-top: 0; - padding-bottom: 0; + padding-block: 0; } -/* ::::: menu/menuitems in menulist popups ::::: */ +/* menu/menuitems in menulist popups */ menulist > menupopup { font: inherit; @@ -145,7 +142,7 @@ menulist > menupopup > menu { color: -moz-FieldText; } -/* ::::: checked menuitems ::::: */ +/* checked menuitems */ :not(menulist) > menupopup > menuitem[checked="true"], :not(menulist) > menupopup > menuitem[selected="true"] { @@ -160,7 +157,7 @@ menulist > menupopup > menuitem[selected="true"]::before { margin-inline-start: -15px; } -/* ::::: menuseparator ::::: */ +/* menuseparator */ menuseparator { -moz-appearance: menuseparator; @@ -168,7 +165,7 @@ menuseparator { padding: 1px 0; } -/* ::::: scroll buttons :::::*/ +/* Scroll buttons */ .menupopup-arrowscrollbox:not(:-moz-lwtheme)::part(scrollbutton-up), .menupopup-arrowscrollbox:not(:-moz-lwtheme)::part(scrollbutton-down) { diff --git a/toolkit/themes/osx/global/netError.css b/toolkit/themes/osx/global/netError.css index 5f4482ccec51..b1e394686b79 100644 --- a/toolkit/themes/osx/global/netError.css +++ b/toolkit/themes/osx/global/netError.css @@ -34,7 +34,8 @@ ul, ol { padding: 0; } -ul > li, ol > li { +ul > li, +ol > li { margin-bottom: .5em; } @@ -63,14 +64,11 @@ ul { background-position: right 0; } +#errorLongContent, #errorTitle { margin-inline-start: 80px; } -#errorLongContent { - margin-inline-start: 80px; -} - #errorShortDesc > p { overflow: auto; border-bottom: 1px solid ThreeDLightShadow; @@ -84,31 +82,11 @@ ul { font-size: 110%; } -#errorLongDesc > p { -} - #errorTryAgain { margin-top: 2em; margin-inline-start: 80px; } -#brand { - position: absolute; - right: 0; - bottom: -1.5em; - margin-inline-end: 10px; - opacity: .4; -} - -#brand:dir(rtl) { - right: auto; - left: 0; -} - -#brand > p { - margin: 0; -} - #errorContainer { display: none; } diff --git a/toolkit/themes/osx/global/popup.css b/toolkit/themes/osx/global/popup.css index a29203ab3a18..4c857087c7e8 100644 --- a/toolkit/themes/osx/global/popup.css +++ b/toolkit/themes/osx/global/popup.css @@ -32,14 +32,12 @@ panel[type="arrow"] { panel[type="arrow"][side="top"], panel[type="arrow"][side="bottom"] { - margin-left: -25px; - margin-right: -25px; + margin-inline: -25px; } panel[type="arrow"][side="left"], panel[type="arrow"][side="right"] { - margin-top: -25px; - margin-bottom: -25px; + margin-block: -25px; } .panel-arrowcontent { @@ -72,38 +70,34 @@ panel[type="arrow"].panel-no-padding::part(arrowcontent) { :-moz-any(panel, menupopup)[side="top"]::part(arrow) { list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); - margin-left: 16px; - margin-right: 16px; + margin-inline: 16px; margin-bottom: -1px; } :-moz-any(panel, menupopup)[side="bottom"]::part(arrow) { list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); -moz-transform: scaleY(-1); - margin-left: 16px; - margin-right: 16px; + margin-inline: 16px; margin-top: -1px; } :-moz-any(panel, menupopup)[side="left"]::part(arrow) { list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); - margin-top: 16px; - margin-bottom: 16px; + margin-block: 16px; margin-right: -1px; } :-moz-any(panel, menupopup)[side="right"]::part(arrow) { list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); transform: scaleX(-1); - margin-top: 16px; - margin-bottom: 16px; + margin-block: 16px; margin-left: -1px; } /* rules for popups associated with menulists */ menulist > menupopup { - min-width: 0px; + min-width: 0; padding: 4px 0; } @@ -114,6 +108,5 @@ menulist > menupopup:not([position]) { menupopup[customoptionstyling="true"] { -moz-appearance: none; - padding-top: 0; - padding-bottom: 0; + padding-block: 0; } diff --git a/toolkit/themes/osx/global/radio.css b/toolkit/themes/osx/global/radio.css index 1b0cb15ff619..0045b5974cb0 100644 --- a/toolkit/themes/osx/global/radio.css +++ b/toolkit/themes/osx/global/radio.css @@ -4,8 +4,9 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +.radio-label, radiogroup { - margin: 1px 0px 1px 0px; + margin: 1px 0; } radio { @@ -19,10 +20,6 @@ radio { margin-inline-end: 2px; } -.radio-label { - margin: 1px 0; -} - radio[disabled="true"] { color: GrayText; } diff --git a/toolkit/themes/osx/global/toolbar.css b/toolkit/themes/osx/global/toolbar.css index 9fa08b7a6e80..5768ab270e54 100644 --- a/toolkit/themes/osx/global/toolbar.css +++ b/toolkit/themes/osx/global/toolbar.css @@ -33,13 +33,11 @@ toolbarspacer { min-width: 24px !important; } -/* ..... drag and drop feedback ..... */ +/* Drag and drop feedback */ toolbarpaletteitem[place="toolbar"] { - margin-left: -2px; - margin-right: -2px; - border-left: 2px solid transparent; - border-right: 2px solid transparent; + margin-inline: -2px; + border-inline: 2px solid transparent; } toolbarpaletteitem[dragover="left"] { diff --git a/toolkit/themes/osx/global/wizard.css b/toolkit/themes/osx/global/wizard.css index 70960b47f033..b4e16122347c 100644 --- a/toolkit/themes/osx/global/wizard.css +++ b/toolkit/themes/osx/global/wizard.css @@ -23,7 +23,7 @@ } .wizard-header-label { - margin-left: 23px; + margin-inline-start: 23px; font-weight: bold; } diff --git a/toolkit/themes/osx/mozapps/downloads/unknownContentType.css b/toolkit/themes/osx/mozapps/downloads/unknownContentType.css index 6719b0d594c9..767d5934dfbf 100644 --- a/toolkit/themes/osx/mozapps/downloads/unknownContentType.css +++ b/toolkit/themes/osx/mozapps/downloads/unknownContentType.css @@ -11,7 +11,7 @@ description { } #contentTypeImage { - margin-right: 3px; + margin-inline-end: 3px; width: 16px; } @@ -21,10 +21,7 @@ description { color: inherit; } -#container > .small-indent { - margin-left: 0; -} - +#container > .small-indent, .small-indent label { - margin-left: 0; + margin-inline-start: 0; }