From 07eba31e0be6367759bbc8678ce795fe7c34dd77 Mon Sep 17 00:00:00 2001
From: Ian Stewart <ian@themeshaper.com>
Date: Wed, 12 Nov 2014 23:39:23 +0000
Subject: [PATCH] Twenty Fifteen: improve appearance of page links when there
 are tons of pages to link to

Props iamtakashi, fixes #30301


Built from https://develop.svn.wordpress.org/trunk@30317


git-svn-id: http://core.svn.wordpress.org/trunk@30316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfifteen/css/ie.css | 15 +++++++--
 wp-content/themes/twentyfifteen/rtl.css    | 32 +++++++++++++++++-
 wp-content/themes/twentyfifteen/style.css  | 39 ++++++++++++++++++----
 wp-includes/version.php                    |  2 +-
 4 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/wp-content/themes/twentyfifteen/css/ie.css b/wp-content/themes/twentyfifteen/css/ie.css
index b57a73c0b6..56dcd25689 100644
--- a/wp-content/themes/twentyfifteen/css/ie.css
+++ b/wp-content/themes/twentyfifteen/css/ie.css
@@ -586,7 +586,12 @@ img.aligncenter {
 }
 
 .page-links {
-	margin-bottom: 1.5789em;
+	margin-bottom: 1.4736em;
+}
+
+.page-links a,
+.page-links > span {
+	margin: 0 0.25em 0.25em 0;
 }
 
 .format-aside .entry-title,
@@ -687,7 +692,8 @@ img.aligncenter {
 }
 
 .site-footer {
-	border-top: 0;
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
 	margin: 0 auto;
 	max-width: 806px;
 	padding: 0;
@@ -840,6 +846,11 @@ video {
 	margin: 0.7188em 1em 0 0;
 }
 
+.rtl .page-links a,
+.rtl .page-links > span {
+	margin: 0 0 0.25em 0.25em;
+}
+
 .rtl .author-info .avatar {
 	margin: 0 0 1.6842em 1.6842em;
 }
diff --git a/wp-content/themes/twentyfifteen/rtl.css b/wp-content/themes/twentyfifteen/rtl.css
index 2e4c3ba385..a1c6f81f3c 100644
--- a/wp-content/themes/twentyfifteen/rtl.css
+++ b/wp-content/themes/twentyfifteen/rtl.css
@@ -269,6 +269,11 @@ img.alignleft {
 	display: inline;
 }
 
+.entry-content .page-links a,
+.page-content .page-links a {
+	display: inline-block;
+}
+
 .author-link:after {
 	content: "\f430";
 }
@@ -303,7 +308,7 @@ img.alignleft {
 
 .page-links a,
 .page-links > span {
-	margin: 0 0 2px 1px;
+	margin: 0 0 0.3333em 0.3333em;
 }
 
 .page-links > .page-links-title {
@@ -481,6 +486,11 @@ img.alignleft {
 		margin: 0.9643em 1em 0 0;
 	}
 
+	.page-links a,
+	.page-links > span {
+		margin: 0 0 0.2857em 0.2857em;
+	}
+
 	.author-info .avatar {
 		margin: 0 0 1.6471em 1.6471em;
 	}
@@ -549,6 +559,11 @@ img.alignleft {
 		margin: 0.7188em 1em 0 0;
 	}
 
+	.page-links a,
+	.page-links > span {
+		margin: 0 0 0.25em 0.25em;
+	}
+
 	.author-info .avatar {
 		margin: 0 0 1.6842em 1.6842em;
 	}
@@ -624,6 +639,11 @@ img.alignleft {
 		margin: 0.4583em 1em 0 0;
 	}
 
+	.page-links a,
+	.page-links > span {
+		margin: 0 0 0.3333em 0.3333em;
+	}
+
 	.author-info .avatar {
 		margin: 0 0 1.5em 1.5em;
 	}
@@ -694,6 +714,11 @@ img.alignleft {
 		margin: 0.4643em 1em 0 0;
 	}
 
+	.page-links a,
+	.page-links > span {
+		margin: 0 0 0.2857em 0.2857em;
+	}
+
 	.author-info .avatar {
 		margin: 0 0 1.6471em 1.6471em;
 	}
@@ -755,6 +780,11 @@ img.alignleft {
 		margin: 0.4688em 1em 0 0;
 	}
 
+	.page-links a,
+	.page-links > span {
+		margin: 0 0 0.25em 0.25em;
+	}
+
 	.author-info .avatar {
 		margin: 0 0 1.6842em 1.6842em;
 	}
diff --git a/wp-content/themes/twentyfifteen/style.css b/wp-content/themes/twentyfifteen/style.css
index 4feff30c81..90ea4b0f92 100644
--- a/wp-content/themes/twentyfifteen/style.css
+++ b/wp-content/themes/twentyfifteen/style.css
@@ -2027,7 +2027,7 @@ a.post-thumbnail:focus {
 .page-links {
 	clear: both;
 	font-family: "Noto Sans", sans-serif;
-	margin: 0 0 1.4667em;
+	margin-bottom: 1.3333em;
 }
 
 .page-links a,
@@ -2039,7 +2039,7 @@ a.post-thumbnail:focus {
 	font-size: 1.2rem;
 	height: 2em;
 	line-height: 2;
-	margin: 0 6px 2px 0;
+	margin: 0 0.3333em 0.3333em 0;
 	text-align: center;
 	width: 2em;
 }
@@ -3266,7 +3266,12 @@ span > video {
 	}
 
 	.page-links {
-		margin-bottom: 1.5294em;
+		margin-bottom: 1.4117em;
+	}
+
+	.page-links a,
+	.page-links > span {
+		margin: 0 0.2857em 0.2857em 0;
 	}
 
 	.entry-attachment {
@@ -3797,7 +3802,12 @@ span > video {
 	}
 
 	.page-links {
-		margin-bottom: 1.5789em;
+		margin-bottom: 1.4736em;
+	}
+
+	.page-links a,
+	.page-links > span {
+		margin: 0 0.25em 0.25em 0;
 	}
 
 	.entry-attachment {
@@ -4452,7 +4462,12 @@ span > video {
 	}
 
 	.page-links {
-		margin-bottom: 1.4667em;
+		margin-bottom: 1.3333em;
+	}
+
+	.page-links a,
+	.page-links > span {
+		margin: 0 0.3333em 0.3333em 0;
 	}
 
 	.entry-attachment {
@@ -4970,7 +4985,12 @@ span > video {
 	}
 
 	.page-links {
-		margin-bottom: 1.5294em;
+		margin-bottom: 1.4117em;
+	}
+
+	.page-links a,
+	.page-links > span {
+		margin: 0 0.2857em 0.2857em 0;
 	}
 
 	.entry-attachment {
@@ -5483,7 +5503,12 @@ span > video {
 	}
 
 	.page-links {
-		margin-bottom: 1.5789em;
+		margin-bottom: 1.4736em;
+	}
+
+	.page-links a,
+	.page-links > span {
+		margin: 0 0.25em 0.25em 0;
 	}
 
 	.entry-attachment {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 775d2d963c..c5aaa19b0c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30316';
+$wp_version = '4.1-alpha-30317';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.