Skip to content

Commit

Permalink
1.3.8
Browse files Browse the repository at this point in the history
  • Loading branch information
webmandesign committed Sep 26, 2022
1 parent f46961f commit c0483e9
Show file tree
Hide file tree
Showing 18 changed files with 43 additions and 31 deletions.
2 changes: 1 addition & 1 deletion assets/css/blocks-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/blocks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/editor-style-blocks-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/editor-style-blocks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/editor-style-classic-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/editor-style-classic.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/global-rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/global.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/scss/blocks/_archives.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@extend %widget_list_items;

&:not(:last-child) {
margin-bottom: var(--gap); // Simulating rem unit for block editor.
margin-bottom: var(--gap);
}

}
2 changes: 1 addition & 1 deletion assets/scss/blocks/_categories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-size: .875em;

&:not(:last-child) {
margin-bottom: var(--gap); // Simulating rem unit for block editor.
margin-bottom: var(--gap);
}

ul {
Expand Down
22 changes: 11 additions & 11 deletions assets/scss/blocks/_gallery.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
/* FILE: blocks/_gallery.scss */

.wp-block-gallery,
.blocks-gallery-grid {

// WP6.0+ fix
&.alignfull {
margin-#{$left}: calc( 50% - 50vw + ( var(--scrollbar_width) / 2 ) );
margin-#{$right}: auto;
}

}

.wp-block-gallery:not(.alignfull):not(.alignwide),
.blocks-gallery-grid {
// Do not apply max-width in block editor!
Expand Down Expand Up @@ -35,17 +46,6 @@
@include gallery_caption();
}

.wp-block-gallery,
.blocks-gallery-grid {

&.alignfull {
// Unfortunately, we need to do this for WP6.0+
// @see assets/scss/global/wp/_alignment.scss
margin-#{$left}: calc( 50% - 50vw + ( var(--scrollbar_width) / 2 ) );
}

}

.is-style-hide-caption figcaption {
display:none;
}
Expand Down
3 changes: 2 additions & 1 deletion assets/scss/blocks/_spacer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
.has-no-margin, .margin-none, .m0, .m-0,
.has-no-margin-bottom, .margin-bottom-none, .mb0, .mb-0,
.has-no-margin-vertical, .margin-vertical-none, .margin-top-bottom-none, .mtb0, .mtb-0,
.is-style-no-margin-vertical {
.is-style-no-margin-vertical,
.is-style-no-gaps {

+ .wp-block-spacer {
margin-top: 0;
Expand Down
5 changes: 5 additions & 0 deletions assets/scss/editor-block/blocks/_block.scss
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@

}

.has-background [data-align="wide"] {
padding-left: 0;
padding-right: 0;
}

#{ $selector_editor_wrapper } .has-background.has-background .wp-block[data-align="full"] {
width: auto;
margin-left: calc( -1 * var(--block_padding) );
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/global/elements/_hr.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ hr {
&.alignleft,
&.alignright {
float: none;
margin-bottom: var(--gap); // Simulating rem unit for block editor.
margin-bottom: var(--gap);
}

&.alignleft.alignleft {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/global/elements/_spacing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@if not variable-exists( 'selector_editor_wrapper' ) {
#{ $selectors_margin_bottom } {
margin-top: 0;
margin-bottom: var(--gap); // Simulating rem unit for block editor.
margin-bottom: var(--gap);

&:last-child {
margin-bottom: 0;
Expand Down
8 changes: 7 additions & 1 deletion assets/scss/global/modifiers/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
.has-background.has-background {
// Need to use absolute units due to possible
// custom font size set on the paragraph block.
padding: var(--gap) $important_modifiers; // Simulating rem unit for block editor.
padding: var(--gap) $important_modifiers;

@include media( ( map_get( $breakpoint, 'm' ), 'max-width' ) ) {
padding-left: 6vw $important_modifiers;
Expand All @@ -67,6 +67,12 @@
padding: var(--block_padding) $important_modifiers;
}

.has-background.alignfull,
[data-align="full"] > .has-background {
padding-left: var(--body_padding) $important_modifiers;
padding-right: var(--body_padding) $important_modifiers;
}

$important_modifiers: null; // Required reset.

// Has text color
Expand Down
4 changes: 2 additions & 2 deletions assets/scss/global/wp/_alignment.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
.alignfull,
.alignwide-wrap {
clear: both;
// position: relative;
position: relative;
width: calc( 100vw - var(--scrollbar_width) );
max-width: calc( 100vw - var(--scrollbar_width) );
margin-#{$left}: calc( 50% - 50vw + ( var(--scrollbar_width) / 2 ) );
// z-index: 1; // This is for when using negative top margin to stack up over the Cover block overlay.
z-index: 1; // This is for when using negative top margin to stack up over the Cover block overlay.
}

.alignwide {
Expand Down
8 changes: 4 additions & 4 deletions includes/Tool/AMP.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @copyright WebMan Design, Oliver Juhas
*
* @since 1.0.0
* @version 1.3.0
* @version 1.3.8
*/

namespace WebManDesign\Michelle\Tool;
Expand Down Expand Up @@ -40,7 +40,7 @@ class AMP implements Component_Interface {
* Initialization.
*
* @since 1.0.0
* @version 1.3.0
* @version 1.3.8
*
* @return void
*/
Expand All @@ -54,8 +54,8 @@ public static function init() {

// Filters

add_action( 'michelle/assets/is_js_disabled', __CLASS__ . '::is_amp' );
add_action( 'michelle/assets/is_preloading_styles_disabled', __CLASS__ . '::is_amp' );
add_filter( 'michelle/assets/is_js_disabled', __CLASS__ . '::is_amp' );
add_filter( 'michelle/assets/is_preloading_styles_disabled', __CLASS__ . '::is_amp' );

add_filter( 'body_class', __CLASS__ . '::body_class', 98 );

Expand Down

0 comments on commit c0483e9

Please sign in to comment.