From 89c1782304d9304e4d4dbfd1c5bbbb1bac7dc105 Mon Sep 17 00:00:00 2001 From: Laurel Fulford Date: Thu, 14 Feb 2019 13:36:56 -0800 Subject: [PATCH] Sophisticated Business: Update quote block border styles, to work better with the new styles planned for Gutenberg 5.2. See #594. --- .../sass/blocks/_blocks.scss | 3 +- sophisticated-business/style-editor.css | 3 +- sophisticated-business/style-editor.scss | 3 +- sophisticated-business/style-rtl.css | 71 +------------------ sophisticated-business/style.css | 3 +- 5 files changed, 10 insertions(+), 73 deletions(-) diff --git a/sophisticated-business/sass/blocks/_blocks.scss b/sophisticated-business/sass/blocks/_blocks.scss index b287723680..2473a398ce 100644 --- a/sophisticated-business/sass/blocks/_blocks.scss +++ b/sophisticated-business/sass/blocks/_blocks.scss @@ -463,7 +463,8 @@ &:not(.is-large), &:not(.is-style-large) { - border-left: 2px solid $color__link; + border-color: $color__link; + border-width: 2px; padding-top: 0; padding-bottom: 0; } diff --git a/sophisticated-business/style-editor.css b/sophisticated-business/style-editor.css index a4afe8c3b8..1e15f16041 100644 --- a/sophisticated-business/style-editor.css +++ b/sophisticated-business/style-editor.css @@ -393,7 +393,8 @@ figcaption, /** === Blockquote === */ .wp-block-quote:not(.is-large):not(.is-style-large) { - border-left: 2px solid #caab57; + border-color: #caab57; + border-width: 2px; } .wp-block-quote.is-large, .wp-block-quote.is-style-large { diff --git a/sophisticated-business/style-editor.scss b/sophisticated-business/style-editor.scss index 1c47109a1c..7d27c682aa 100644 --- a/sophisticated-business/style-editor.scss +++ b/sophisticated-business/style-editor.scss @@ -397,7 +397,8 @@ figcaption, .wp-block-quote { &:not(.is-large):not(.is-style-large) { - border-left: 2px solid $color__link; + border-color: $color__link; + border-width: 2px; } &.is-large, diff --git a/sophisticated-business/style-rtl.css b/sophisticated-business/style-rtl.css index 44be3ad710..1e031189ee 100644 --- a/sophisticated-business/style-rtl.css +++ b/sophisticated-business/style-rtl.css @@ -1239,17 +1239,6 @@ body.page .main-navigation { margin-left: calc( .25 * 1rem); } -.main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu { - display: block; - right: 0; - margin-top: 0; - opacity: 1; - width: auto; - min-width: 100%; - /* Non-mobile position */ - /* Nested sub-menu dashes */ -} - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu { display: block; right: 0; @@ -1262,21 +1251,6 @@ body.page .main-navigation { } @media only screen and (min-width: 768px) { - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu { - display: block; - margin-top: 0; - opacity: 1; - position: absolute; - right: 0; - left: auto; - top: auto; - bottom: auto; - height: auto; - min-width: -moz-max-content; - min-width: -webkit-max-content; - min-width: max-content; - transform: none; - } .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu { display: block; margin-top: 0; @@ -1294,13 +1268,6 @@ body.page .main-navigation { } } -.main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu.hidden-links { - right: 0; - width: 100%; - display: table; - position: absolute; -} - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu.hidden-links { right: 0; width: 100%; @@ -1309,12 +1276,6 @@ body.page .main-navigation { } @media only screen and (min-width: 768px) { - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu.hidden-links { - left: 0; - right: auto; - display: block; - width: max-content; - } .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu.hidden-links { left: 0; right: auto; @@ -1323,24 +1284,10 @@ body.page .main-navigation { } } -.main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu .submenu-expand { - display: none; -} - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu .submenu-expand { display: none; } -.main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu .sub-menu { - display: block; - margin-top: inherit; - position: relative; - width: 100%; - right: 0; - opacity: 1; - /* Non-mobile position */ -} - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu .sub-menu { display: block; margin-top: inherit; @@ -1352,31 +1299,16 @@ body.page .main-navigation { } @media only screen and (min-width: 768px) { - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu .sub-menu { - float: none; - max-width: 100%; - } .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu .sub-menu { float: none; max-width: 100%; } } -.main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu .sub-menu { - counter-reset: submenu; -} - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu .sub-menu { counter-reset: submenu; } -.main-navigation .main-menu .menu-item-has-children:not(.off-canvas)[focus-within] > .sub-menu .sub-menu > li > a::before { - font-family: "Poppins", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - font-weight: normal; - content: "– " counters(submenu, "– ", none); - counter-increment: submenu; -} - .main-navigation .main-menu .menu-item-has-children:not(.off-canvas):focus-within > .sub-menu .sub-menu > li > a::before { font-family: "Poppins", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; font-weight: normal; @@ -3850,7 +3782,8 @@ body.page .main-navigation { } .entry .entry-content .wp-block-quote:not(.is-large), .entry .entry-content .wp-block-quote:not(.is-style-large) { - border-right: 2px solid #caab57; + border-color: #caab57; + border-width: 2px; padding-top: 0; padding-bottom: 0; } diff --git a/sophisticated-business/style.css b/sophisticated-business/style.css index 2aafb48cf4..1ce580e28c 100644 --- a/sophisticated-business/style.css +++ b/sophisticated-business/style.css @@ -3862,7 +3862,8 @@ body.page .main-navigation { } .entry .entry-content .wp-block-quote:not(.is-large), .entry .entry-content .wp-block-quote:not(.is-style-large) { - border-left: 2px solid #caab57; + border-color: #caab57; + border-width: 2px; padding-top: 0; padding-bottom: 0; }