Просмотр исходного кода

Merge branch 'master' into fix/varia-issue-1505

Allan Cole 5 лет назад
Родитель
Сommit
1de183271b

+ 5 - 1
morden/sass/_extra-child-theme.scss

@@ -63,10 +63,14 @@ body {
 		}
 	}
 }
-
 #colophon {
 	padding-left: 0;
 	padding-right: 0;
+
+	@include media(mobile-only) {
+		padding-left: map-deep-get($config-global, "spacing", "horizontal");
+		padding-right: map-deep-get($config-global, "spacing", "horizontal");
+	}
 }
 
 /**

+ 8 - 3
morden/style-rtl.css

@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 
 /**
@@ -3670,6 +3668,13 @@ p:not(.site-title) a:hover {
 	padding-left: 0;
 }
 
+@media only screen and (max-width: 559px) {
+	#colophon {
+		padding-right: 16px;
+		padding-left: 16px;
+	}
+}
+
 /**
  * Mobile-Menu
  */

+ 8 - 3
morden/style.css

@@ -684,9 +684,7 @@ a {
 .site-header:after,
 .site-content:after,
 .site-footer:after {
-	content: "";
-	display: table;
-	table-layout: fixed;
+	clear: both;
 }
 
 /**
@@ -3699,6 +3697,13 @@ p:not(.site-title) a:hover {
 	padding-right: 0;
 }
 
+@media only screen and (max-width: 559px) {
+	#colophon {
+		padding-left: 16px;
+		padding-right: 16px;
+	}
+}
+
 /**
  * Mobile-Menu
  */

+ 0 - 11
radcliffe-2/assets/js/radcliffe-2.js

@@ -7,16 +7,6 @@
 
 	var $window = $( window );
 
-	// Toggle search form.
-	function searchToggle() {
-		$( '.search-toggle' ).on( 'click', function() {
-			$( this ).toggleClass( 'active' );
-			$( '.header-search' ).slideToggle();
-			$( '.header-search .s' ).focus();
-			return false;
-		} );
-	}
-
 	// Manage full-screen featured images.
 	function fullScreenImages() {
 		var $entryBackground = $( '.entry-thumbnail' ),
@@ -60,7 +50,6 @@
 
 	// Initialize init on page load.
 	$( document ).on( 'ready', function() {
-		searchToggle();
 		fullScreenImages();
 		imageZoomIcon();
 	});

+ 1 - 1
stow/package-lock.json

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

+ 1 - 1
stow/package.json

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

+ 8 - 7
stow/sass/_extra-child-theme.scss

@@ -23,13 +23,14 @@
  */
 body {
 	font-weight: 300;
-	&.hide-homepage-title {
-		.site-main {
-			padding: 0;
-			article {
-				.entry-content {
-					margin-top: 0;
-				}
+}
+
+.home.page.hide-homepage-title {
+	.site-main {
+		padding: 0;
+		article {
+			.entry-content {
+				margin-top: 0;
 			}
 		}
 	}

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

@@ -1,11 +1,11 @@
 /*
 Theme Name: Stow
-Theme URI: https://github.com/Automattic/themes/stow
+Theme URI: https://github.com/Automattic/themes/tree/master/stow
 Author: Automattic
 Author URI: https://automattic.com/
 Description: A bold and clean theme - Stow is the ideal choice for creating an online presence for your business.
 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

+ 5 - 7
stow/style-rtl.css

@@ -1,12 +1,12 @@
 @charset "UTF-8";
 /*
 Theme Name: Stow
-Theme URI: https://github.com/Automattic/themes/stow
+Theme URI: https://github.com/Automattic/themes/tree/master/stow
 Author: Automattic
 Author URI: https://automattic.com/
 Description: A bold and clean theme - Stow is the ideal choice for creating an online presence for your business.
 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;
 }
 
 /**
@@ -3622,11 +3620,11 @@ body {
 	font-weight: 300;
 }
 
-body.hide-homepage-title .site-main {
+.home.page.hide-homepage-title .site-main {
 	padding: 0;
 }
 
-body.hide-homepage-title .site-main article .entry-content {
+.home.page.hide-homepage-title .site-main article .entry-content {
 	margin-top: 0;
 }
 

+ 5 - 7
stow/style.css

@@ -1,12 +1,12 @@
 @charset "UTF-8";
 /*
 Theme Name: Stow
-Theme URI: https://github.com/Automattic/themes/stow
+Theme URI: https://github.com/Automattic/themes/tree/master/stow
 Author: Automattic
 Author URI: https://automattic.com/
 Description: A bold and clean theme - Stow is the ideal choice for creating an online presence for your business.
 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;
 }
 
 /**
@@ -3651,11 +3649,11 @@ body {
 	font-weight: 300;
 }
 
-body.hide-homepage-title .site-main {
+.home.page.hide-homepage-title .site-main {
 	padding: 0;
 }
 
-body.hide-homepage-title .site-main article .entry-content {
+.home.page.hide-homepage-title .site-main article .entry-content {
 	margin-top: 0;
 }