瀏覽代碼

Merge pull request #1495 from Automattic/update/morden-2019100414815

Morden: Add auto-loading-homepage tag to stylesheet, minor version bump again
Takashi Irie 5 年之前
父節點
當前提交
7a1b6ca42c

+ 1 - 1
morden/package-lock.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "morden",
   "name": "morden",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "lockfileVersion": 1,
   "lockfileVersion": 1,
   "requires": true,
   "requires": true,
   "dependencies": {
   "dependencies": {

+ 1 - 1
morden/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "morden",
   "name": "morden",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Morden",
   "description": "Morden",
   "bugs": {
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"
     "url": "https://github.com/Automattic/themes/issues"

+ 2 - 2
morden/sass/_extra-child-theme.scss

@@ -23,9 +23,9 @@ a {
 	margin-left: auto;
 	margin-left: auto;
 	margin-right: auto;
 	margin-right: auto;
 
 
-	@include media(wide) {
+	@include media(desktop) {
 		box-shadow: 0 0 30px rgba(#000, 0.2);
 		box-shadow: 0 0 30px rgba(#000, 0.2);
-		max-width: 1280px;
+		max-width: 1134px;
 	}
 	}
 }
 }
 
 

+ 2 - 2
morden/sass/style-child-theme.scss

@@ -5,12 +5,12 @@ Author: Automattic
 Author URI: https://automattic.com/
 Author URI: https://automattic.com/
 Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Requires at least: WordPress 4.9.6
 Requires at least: WordPress 4.9.6
-Version: 1.1.2
+Version: 1.1.3
 License: GNU General Public License v2 or later
 License: GNU General Public License v2 or later
 License URI: LICENSE
 License URI: LICENSE
 Template: varia
 Template: varia
 Text Domain: morden
 Text Domain: morden
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage
 
 
 This theme, like WordPress, is licensed under the GPL.
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
 Use it to make something cool, have fun, and share what you've learned with others.

+ 4 - 4
morden/style-rtl.css

@@ -6,12 +6,12 @@ Author: Automattic
 Author URI: https://automattic.com/
 Author URI: https://automattic.com/
 Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Requires at least: WordPress 4.9.6
 Requires at least: WordPress 4.9.6
-Version: 1.1.2
+Version: 1.1.3
 License: GNU General Public License v2 or later
 License: GNU General Public License v2 or later
 License URI: LICENSE
 License URI: LICENSE
 Template: varia
 Template: varia
 Text Domain: morden
 Text Domain: morden
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage
 
 
 This theme, like WordPress, is licensed under the GPL.
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -3587,10 +3587,10 @@ p:not(.site-title) a:hover {
 	margin-left: auto;
 	margin-left: auto;
 }
 }
 
 
-@media only screen and (min-width: 1280px) {
+@media only screen and (min-width: 1024px) {
 	#page {
 	#page {
 		box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
 		box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
-		max-width: 1280px;
+		max-width: 1134px;
 	}
 	}
 }
 }
 
 

+ 4 - 4
morden/style.css

@@ -6,12 +6,12 @@ Author: Automattic
 Author URI: https://automattic.com/
 Author URI: https://automattic.com/
 Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Description: Morden is a functional and responsive multi-purpose theme that is the perfect solution for your business's online presence.
 Requires at least: WordPress 4.9.6
 Requires at least: WordPress 4.9.6
-Version: 1.1.2
+Version: 1.1.3
 License: GNU General Public License v2 or later
 License: GNU General Public License v2 or later
 License URI: LICENSE
 License URI: LICENSE
 Template: varia
 Template: varia
 Text Domain: morden
 Text Domain: morden
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, auto-loading-homepage
 
 
 This theme, like WordPress, is licensed under the GPL.
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -3616,10 +3616,10 @@ p:not(.site-title) a:hover {
 	margin-right: auto;
 	margin-right: auto;
 }
 }
 
 
-@media only screen and (min-width: 1280px) {
+@media only screen and (min-width: 1024px) {
 	#page {
 	#page {
 		box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
 		box-shadow: 0 0 30px rgba(0, 0, 0, 0.2);
-		max-width: 1280px;
+		max-width: 1134px;
 	}
 	}
 }
 }