From a930237618bac3ef71769b796e50a142e3b17e23 Mon Sep 17 00:00:00 2001 From: audrasjb Date: Tue, 23 Nov 2021 23:25:02 +0000 Subject: [PATCH] Twenty Twenty-One: Style adjustments for list-based widgets in the widget editor. This change brings style consistency between front-end and widget editor for list-based widgets. Props circlecube, Rahmohn. Fixes #53629. Built from https://develop.svn.wordpress.org/trunk@52237 git-svn-id: http://core.svn.wordpress.org/trunk@51829 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../themes/twentytwentyone/assets/css/ie.css | 90 +++++++++---------- .../assets/sass/06-components/widgets.scss | 72 +++++++-------- .../themes/twentytwentyone/style-rtl.css | 72 +++++++-------- wp-content/themes/twentytwentyone/style.css | 72 +++++++-------- wp-includes/version.php | 2 +- 5 files changed, 154 insertions(+), 154 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css index a3000775ca..2dd396d65c 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -7345,51 +7345,6 @@ h1.page-title { } } -.widget-area ul { - list-style-type: none; - padding: 0; -} - -.widget-area ul li { - line-height: 1.9; -} - -.widget-area ul.sub-menu { - margin-left: 13px; -} - -.widget-area ul.children { - margin-left: 13px; -} - -.widget-area ul .sub-menu-toggle { - display: none; -} - -.widget-area a { - color: #28303d; - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; -} - -.widget-area a:link { - color: #28303d; -} - -.widget-area a:visited { - color: #28303d; -} - -.widget-area a:active { - color: #28303d; -} - -.widget-area a:hover { - color: #28303d; - text-decoration-style: dotted; -} - .widget-area .wp-block-social-links.alignright { margin-top: 30px; justify-content: flex-end; @@ -7459,6 +7414,51 @@ h1.page-title { font-size: 1rem; } +.widget ul { + list-style-type: none; + padding: 0; +} + +.widget ul li { + line-height: 1.9; +} + +.widget ul.sub-menu { + margin-left: 13px; +} + +.widget ul.children { + margin-left: 13px; +} + +.widget ul .sub-menu-toggle { + display: none; +} + +.widget a { + color: #28303d; + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; +} + +.widget a:link { + color: #28303d; +} + +.widget a:visited { + color: #28303d; +} + +.widget a:active { + color: #28303d; +} + +.widget a:hover { + color: #28303d; + text-decoration-style: dotted; +} + .search-form { display: flex; flex-wrap: wrap; diff --git a/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss b/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss index 5fb85df9fd..b896c6bf62 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/06-components/widgets.scss @@ -20,42 +20,6 @@ margin-top: calc(3 * var(--global--spacing-vertical)); } - ul { - list-style-type: none; - padding: 0; - - li { - line-height: var(--widget--line-height-list); - } - - &.sub-menu, - &.children { - margin-left: var(--widget--spacing-menu); - } - - .sub-menu-toggle { - display: none; - } - } - - a { - color: var(--footer--color-link); - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; - - &:link, - &:visited, - &:active { - color: var(--footer--color-link); - } - - &:hover { - color: var(--footer--color-link-hover); - text-decoration-style: dotted; - } - } - .wp-block-social-links { &.alignright { @@ -110,6 +74,42 @@ h6 { font-size: var(--global--font-size-xs); } + + ul { + list-style-type: none; + padding: 0; + + li { + line-height: var(--widget--line-height-list); + } + + &.sub-menu, + &.children { + margin-left: var(--widget--spacing-menu); + } + + .sub-menu-toggle { + display: none; + } + } + + a { + color: var(--footer--color-link); + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; + + &:link, + &:visited, + &:active { + color: var(--footer--color-link); + } + + &:hover { + color: var(--footer--color-link-hover); + text-decoration-style: dotted; + } + } } // Search widget styles diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css index 926ebbc6de..4859c68001 100644 --- a/wp-content/themes/twentytwentyone/style-rtl.css +++ b/wp-content/themes/twentytwentyone/style-rtl.css @@ -5427,42 +5427,6 @@ h1.page-title { } } -.widget-area ul { - list-style-type: none; - padding: 0; -} - -.widget-area ul li { - line-height: var(--widget--line-height-list); -} - -.widget-area ul.sub-menu, -.widget-area ul.children { - margin-right: var(--widget--spacing-menu); -} - -.widget-area ul .sub-menu-toggle { - display: none; -} - -.widget-area a { - color: var(--footer--color-link); - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; -} - -.widget-area a:link, -.widget-area a:visited, -.widget-area a:active { - color: var(--footer--color-link); -} - -.widget-area a:hover { - color: var(--footer--color-link-hover); - text-decoration-style: dotted; -} - .widget-area .wp-block-social-links.alignright { margin-top: var(--global--spacing-vertical); justify-content: flex-end; @@ -5512,6 +5476,42 @@ h1.page-title { font-size: var(--global--font-size-xs); } +.widget ul { + list-style-type: none; + padding: 0; +} + +.widget ul li { + line-height: var(--widget--line-height-list); +} + +.widget ul.sub-menu, +.widget ul.children { + margin-right: var(--widget--spacing-menu); +} + +.widget ul .sub-menu-toggle { + display: none; +} + +.widget a { + color: var(--footer--color-link); + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; +} + +.widget a:link, +.widget a:visited, +.widget a:active { + color: var(--footer--color-link); +} + +.widget a:hover { + color: var(--footer--color-link-hover); + text-decoration-style: dotted; +} + .search-form { display: flex; flex-wrap: wrap; diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css index b9a1e3fd3f..9048e620fa 100644 --- a/wp-content/themes/twentytwentyone/style.css +++ b/wp-content/themes/twentytwentyone/style.css @@ -5463,42 +5463,6 @@ h1.page-title { } } -.widget-area ul { - list-style-type: none; - padding: 0; -} - -.widget-area ul li { - line-height: var(--widget--line-height-list); -} - -.widget-area ul.sub-menu, -.widget-area ul.children { - margin-left: var(--widget--spacing-menu); -} - -.widget-area ul .sub-menu-toggle { - display: none; -} - -.widget-area a { - color: var(--footer--color-link); - text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: currentColor; -} - -.widget-area a:link, -.widget-area a:visited, -.widget-area a:active { - color: var(--footer--color-link); -} - -.widget-area a:hover { - color: var(--footer--color-link-hover); - text-decoration-style: dotted; -} - .widget-area .wp-block-social-links.alignright { margin-top: var(--global--spacing-vertical); justify-content: flex-end; @@ -5548,6 +5512,42 @@ h1.page-title { font-size: var(--global--font-size-xs); } +.widget ul { + list-style-type: none; + padding: 0; +} + +.widget ul li { + line-height: var(--widget--line-height-list); +} + +.widget ul.sub-menu, +.widget ul.children { + margin-left: var(--widget--spacing-menu); +} + +.widget ul .sub-menu-toggle { + display: none; +} + +.widget a { + color: var(--footer--color-link); + text-decoration: underline; + text-decoration-style: solid; + text-decoration-color: currentColor; +} + +.widget a:link, +.widget a:visited, +.widget a:active { + color: var(--footer--color-link); +} + +.widget a:hover { + color: var(--footer--color-link-hover); + text-decoration-style: dotted; +} + .search-form { display: flex; flex-wrap: wrap; diff --git a/wp-includes/version.php b/wp-includes/version.php index 3d4daa3652..478964d832 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-alpha-52236'; +$wp_version = '5.9-alpha-52237'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.