Преглед изворни кода

Merge branch 'enhancement/add-wc-support' into enhancement/add-wc-support-coutoire

Allan Cole пре 5 година
родитељ
комит
b28f2bb9fc

Разлика између датотеке није приказан због своје велике величине
+ 6 - 5
rockfield/inc/headstart/en.json


Разлика између датотеке није приказан због своје велике величине
+ 3 - 2
stratford/inc/headstart/en.json


+ 1 - 1
stratford/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "stratford",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

+ 1 - 1
stratford/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stratford",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Stratford",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

+ 1 - 1
stratford/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Stratford is the perfect design for your business or educational institutes online presence. Highlight your products and services, Stratford is versatile enough to be your personal blog too.
 Requires at least: WordPress 4.9.6
-Version: 1.2.1
+Version: 1.2.2
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

+ 2 - 4
stratford/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Stratford is the perfect design for your business or educational institutes online presence. Highlight your products and services, Stratford is versatile enough to be your personal blog too.
 Requires at least: WordPress 4.9.6
-Version: 1.2.1
+Version: 1.2.2
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 
 /**

+ 2 - 4
stratford/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Stratford is the perfect design for your business or educational institutes online presence. Highlight your products and services, Stratford is versatile enough to be your personal blog too.
 Requires at least: WordPress 4.9.6
-Version: 1.2.1
+Version: 1.2.2
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 
 /**

+ 14 - 1
varia/sass/abstracts/_responsive-logic.scss

@@ -3,7 +3,7 @@
  */
 
 /* Responsive width-content overrides */
-$horizontal-padding: #{2 * map-deep-get($config-global, "spacing", "horizontal")};
+$horizontal-padding: (2 * map-deep-get($config-global, "spacing", "horizontal"));
 $content-width-flex: 100%;
 $content-width-sm: calc( #{map-deep-get($config-global, "breakpoint", "sm")} - #{$horizontal-padding} );
 $content-width-md: calc( #{map-deep-get($config-global, "breakpoint", "md")} - #{$horizontal-padding} );
@@ -110,6 +110,19 @@ $content-width-xxl: calc( #{map-deep-get($config-global, "breakpoint", "xxl")} -
 	}
 }
 
+%responsive-alignfull-nested {
+
+	width: 100%;
+	max-width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+
+	@include media(mobile) {
+		width: calc(100% - #{2 * $horizontal-padding});
+		max-width: 100%;
+	}
+}
+
 %responsive-alignright {
 
 	/*rtl:ignore*/

+ 1 - 3
varia/sass/base/_clearings.scss

@@ -21,7 +21,5 @@
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }

+ 2 - 2
varia/sass/vendors/woocommerce/layout/_structure.scss

@@ -7,7 +7,7 @@
  * WooCommerce Wrapper Width
  */
 
-body[class*="woocommerce"] #page .woocommerce,
+body[class*="woocommerce"] #page .woocommerce:not(.widget),
 body[class*="woocommerce"] #page #woocommerce-wrapper,
 body[class*="woocommerce"] #page .woocommerce-Tabs-panel.entry-content > *:not(.alignwide):not(.alignfull):not(.alignleft):not(.alignright):not(.wp-block-separator):not(.entry-attachment) {
 
@@ -17,7 +17,7 @@ body[class*="woocommerce"] #page .woocommerce-Tabs-panel.entry-content > *:not(.
 	@if $wc-wrapper-width == wide {
 		@extend %responsive-alignwide-nested;
 	} @else if $wc-wrapper-width == full {
-		@extend %responsive-alignfull;
+		@extend %responsive-alignfull-nested;
 	} @else {
 		// Default width
 	}

+ 1 - 3
varia/style-rtl.css

@@ -802,9 +802,7 @@ a {
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 
 /**

+ 1 - 3
varia/style.css

@@ -802,9 +802,7 @@ a {
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 
 /**

Неке датотеке нису приказане због велике количине промена