Skip to content

Commit

Permalink
Merge pull request #1921 from Automattic/fix/full-width-items-inside-…
Browse files Browse the repository at this point in the history 
…of-columns-recompile

All Varia Child Themes: Ensures full-width items inside of columns do not overlap.
  • Loading branch information
@allancole
allancole authored Apr 15, 2020
2 parents 94bae33 + 230c68a commit 7357f9a
Show file tree
Hide file tree
Showing 101 changed files with 3,218 additions and 3,127 deletions.
274 changes: 134 additions & 140 deletions alves/package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion alves/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@wordpress/browserslist-config": "^2.6.0",
"autoprefixer": "^9.6.1",
"chokidar-cli": "^2.0.0",
"node-sass": "^4.12.0",
"node-sass": "^4.13.1",
"npm-run-all": "^4.1.5",
"postcss-cli": "^6.1.3",
"postcss-focus-within": "^3.0.0",
Expand Down
26 changes: 26 additions & 0 deletions alves/style-editor.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ object {
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

Expand Down Expand Up @@ -558,6 +559,30 @@ object {
border-radius: 0;
}

/* Default Style */
.button {
color: #ffffff;
font-weight: bold;
font-family: "Karla", Arial, sans-serif;
font-family: var(--font-base, "Karla", Arial, sans-serif);
font-size: 1.04167em;
line-height: 1;
background-color: #3E7D98;
border-radius: 160px;
padding: 16px 48px;
}

.button:hover, .button:focus, .button.has-focus {
color: #ffffff;
background-color: #2f5f74;
}

.wp-block-columns .wp-block[data-align=full],
.wp-block-columns .alignfull {
margin-left: inherit;
margin-right: inherit;
}

.wp-block-cover,
.wp-block-cover-image {
background-color: black;
Expand Down Expand Up @@ -1631,6 +1656,7 @@ p:not(.site-title) a:hover {
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

Expand Down
60 changes: 26 additions & 34 deletions alves/style-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ $grid-configuration: map-extend($grid-configuration-default, $grid-configuration
* let’s use a placeholder to keep them all
* in-sync
*/
button[data-load-more-btn], button,
.button,
button[data-load-more-btn], .button, button,
input[type="submit"],
.wp-block-button__link,
.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
Expand All @@ -209,15 +208,14 @@ input[type="submit"],
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, button:after,
.button:after,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
Expand All @@ -227,32 +225,27 @@ input[type="submit"]:after,
width: 0;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
margin-bottom: -0.12em;
}

button[data-load-more-btn]:after, button:after,
.button:after,
button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
margin-top: -0.11em;
}

button:hover,
.button:hover,
.button:hover, button:hover,
input:hover[type="submit"],
.wp-block-button__link:hover,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
.button:focus,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, .button:focus, button:focus,
input:focus[type="submit"],
.wp-block-button__link:focus,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
.has-focus.button,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, .has-focus.button, button.has-focus,
input.has-focus[type="submit"],
.has-focus.wp-block-button__link,
.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
Expand Down Expand Up @@ -1321,8 +1314,7 @@ object {
* let’s use a placeholder to keep them all
* in-sync
*/
button[data-load-more-btn], button,
.button,
button[data-load-more-btn], .button, button,
input[type="submit"],
.wp-block-button__link,
.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
Expand All @@ -1336,15 +1328,14 @@ input[type="submit"],
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, button:after,
.button:after,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
Expand All @@ -1354,32 +1345,27 @@ input[type="submit"]:after,
width: 0;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
margin-bottom: -0.12em;
}

button[data-load-more-btn]:after, button:after,
.button:after,
button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
margin-top: -0.11em;
}

button:hover,
.button:hover,
.button:hover, button:hover,
input:hover[type="submit"],
.wp-block-button__link:hover,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
.button:focus,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, .button:focus, button:focus,
input:focus[type="submit"],
.wp-block-button__link:focus,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
.has-focus.button,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, .has-focus.button, button.has-focus,
input.has-focus[type="submit"],
.has-focus.wp-block-button__link,
.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
Expand All @@ -1393,13 +1379,15 @@ input.has-focus[type="submit"],
* let’s use a placeholder to keep them all
* in-sync
*/
button[data-load-more-btn] {
button[data-load-more-btn], .button {
display: inline-block;
}

.has-background:not(.has-background-background-color) button[data-load-more-btn],
[class*="background-color"]:not(.has-background-background-color) button[data-load-more-btn],
[style*="background-color"] button[data-load-more-btn] {
[style*="background-color"] button[data-load-more-btn], .has-background:not(.has-background-background-color) .button,
[class*="background-color"]:not(.has-background-background-color) .button,
[style*="background-color"] .button {
background-color: transparent;
border: 2px solid currentColor;
color: currentColor;
Expand All @@ -1418,6 +1406,10 @@ button[data-load-more-btn] {
padding: 14px 48px;
}

.wp-block-button.is-style-outline .wp-block-button__link:active {
color: #3E7D98;
}

.wp-block-button.is-style-outline .wp-block-button__link:hover, .wp-block-button.is-style-outline .wp-block-button__link:focus, .wp-block-button.is-style-outline .wp-block-button__link.has-focus {
color: #2f5f74;
}
Expand Down
1 change: 1 addition & 0 deletions alves/style-woocommerce.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ body[class*="woocommerce"] #page .woocommerce.widget_shopping_cart .buttons a {
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

Expand Down
60 changes: 26 additions & 34 deletions alves/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ $grid-configuration: map-extend($grid-configuration-default, $grid-configuration
* let’s use a placeholder to keep them all
* in-sync
*/
button[data-load-more-btn], button,
.button,
button[data-load-more-btn], .button, button,
input[type="submit"],
.wp-block-button__link,
.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
Expand All @@ -209,15 +208,14 @@ input[type="submit"],
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, button:after,
.button:after,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
Expand All @@ -227,32 +225,27 @@ input[type="submit"]:after,
width: 0;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
margin-bottom: -0.12em;
}

button[data-load-more-btn]:after, button:after,
.button:after,
button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
margin-top: -0.11em;
}

button:hover,
.button:hover,
.button:hover, button:hover,
input:hover[type="submit"],
.wp-block-button__link:hover,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
.button:focus,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, .button:focus, button:focus,
input:focus[type="submit"],
.wp-block-button__link:focus,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
.has-focus.button,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, .has-focus.button, button.has-focus,
input.has-focus[type="submit"],
.has-focus.wp-block-button__link,
.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
Expand Down Expand Up @@ -1321,8 +1314,7 @@ object {
* let’s use a placeholder to keep them all
* in-sync
*/
button[data-load-more-btn], button,
.button,
button[data-load-more-btn], .button, button,
input[type="submit"],
.wp-block-button__link,
.wp-block-file__button, .a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept {
Expand All @@ -1336,15 +1328,14 @@ input[type="submit"],
background-color: #3E7D98;
border-radius: 160px;
border-width: 0;
text-decoration: none;
padding: 16px 48px;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, button:after,
.button:after,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before, button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
Expand All @@ -1354,32 +1345,27 @@ input[type="submit"]:after,
width: 0;
}

button[data-load-more-btn]:before, button:before,
.button:before,
button[data-load-more-btn]:before, .button:before, button:before,
input[type="submit"]:before,
.wp-block-button__link:before,
.wp-block-file__button:before, .a8c-posts-list__view-all:before, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:before {
margin-bottom: -0.12em;
}

button[data-load-more-btn]:after, button:after,
.button:after,
button[data-load-more-btn]:after, .button:after, button:after,
input[type="submit"]:after,
.wp-block-button__link:after,
.wp-block-file__button:after, .a8c-posts-list__view-all:after, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:after {
margin-top: -0.11em;
}

button:hover,
.button:hover,
.button:hover, button:hover,
input:hover[type="submit"],
.wp-block-button__link:hover,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, button:focus,
.button:focus,
.wp-block-file__button:hover, .a8c-posts-list__view-all:hover, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:hover, .button:focus, button:focus,
input:focus[type="submit"],
.wp-block-button__link:focus,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, button.has-focus,
.has-focus.button,
.wp-block-file__button:focus, .a8c-posts-list__view-all:focus, body .widget_eu_cookie_law_widget #eu-cookie-law input.accept:focus, .has-focus.button, button.has-focus,
input.has-focus[type="submit"],
.has-focus.wp-block-button__link,
.has-focus.wp-block-file__button, .has-focus.a8c-posts-list__view-all, body .widget_eu_cookie_law_widget #eu-cookie-law input.has-focus.accept {
Expand All @@ -1393,13 +1379,15 @@ input.has-focus[type="submit"],
* let’s use a placeholder to keep them all
* in-sync
*/
button[data-load-more-btn] {
button[data-load-more-btn], .button {
display: inline-block;
}

.has-background:not(.has-background-background-color) button[data-load-more-btn],
[class*="background-color"]:not(.has-background-background-color) button[data-load-more-btn],
[style*="background-color"] button[data-load-more-btn] {
[style*="background-color"] button[data-load-more-btn], .has-background:not(.has-background-background-color) .button,
[class*="background-color"]:not(.has-background-background-color) .button,
[style*="background-color"] .button {
background-color: transparent;
border: 2px solid currentColor;
color: currentColor;
Expand All @@ -1418,6 +1406,10 @@ button[data-load-more-btn] {
padding: 14px 48px;
}

.wp-block-button.is-style-outline .wp-block-button__link:active {
color: #3E7D98;
}

.wp-block-button.is-style-outline .wp-block-button__link:hover, .wp-block-button.is-style-outline .wp-block-button__link:focus, .wp-block-button.is-style-outline .wp-block-button__link.has-focus {
color: #2f5f74;
}
Expand Down
Loading

0 comments on commit 7357f9a

Please sign in to comment.