Improve empty ready-links class and style

richtabor · Apr 30, 2018 · db0705a · db0705a
1 parent a95b958
commit db0705a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/assets/css/merlin.css b/assets/css/merlin.css
@@ -2550,6 +2550,14 @@ body.loaded .merlin__content__footer--fullwidth {
 	filter: blur(0);
 }
 
+.merlin__content__footer--nolinks {
+	margin-bottom: 3.14em;
+}
+
+.merlin__content__footer--nolinks .merlin__button {
+	margin-top: 0.57em;
+}
+
 .merlin__content--license .merlin__content__footer {
 	margin-top: -0.24em;
 }

diff --git a/assets/css/merlin.min.css b/assets/css/merlin.min.css
diff --git a/assets/scss/modules/_footer.scss b/assets/scss/modules/_footer.scss
@@ -25,7 +25,11 @@
 	}
 
 	&--nolinks {
-		margin-bottom: 1.9em;
+		margin-bottom: 3.14em;
+
+		.merlin__button {
+			margin-top: .57em;
+		}
 	}
 
 	.merlin__content--license & {

diff --git a/class-merlin.php b/class-merlin.php
@@ -1208,12 +1208,15 @@ protected function ready() {
 
 		// Links.
 		$links = array();
+
 		for ( $i = 1; $i < 4; $i++ ) {
 			if ( ! empty( $strings[ "ready-link-$i" ] ) ) {
 				$links[] = $strings[ "ready-link-$i" ];
 			}
 		}
 
+		$links_class = empty( $links ) ? 'merlin__content__footer--nolinks' : null;
+
 		$allowed_html_array = array(
 			'a' => array(
 				'href'   => array(),
@@ -1235,7 +1238,7 @@ protected function ready() {
 
 		</div>
 
-		<footer class="merlin__content__footer merlin__content__footer--fullwidth<?php if ( empty( $links ) ) { ?> merlin__content__footer--nolinks<?php } ?>">
+		<footer class="merlin__content__footer merlin__content__footer--fullwidth <?php echo esc_attr( $links_class ); ?>">
 
 			<a href="<?php echo esc_url( home_url( '/' ) ); ?>" class="merlin__button merlin__button--blue merlin__button--fullwidth merlin__button--popin"><?php echo esc_html( $big_btn ); ?></a>