Merge branch 'master' into footer-fixes-275

cloudposse · Dec 13, 2018 · a95936d · a95936d
2 parents 24d9738 + face34a
commit a95936d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/themes/cloudposse/src/js/search.js b/themes/cloudposse/src/js/search.js
@@ -81,20 +81,32 @@ if (document.querySelector('.page-search-results')) {
       },
     ]
   }));
-  search.addWidget(
-    pagination({
-      container: '#pagination-container',
-      maxPages: 20,
-      scrollTo: false,
-      showFirstLast: false,
-      cssClasses: {
-        root: "pagination",
-        item: "page-item",
-        link: "page-link",
-        active: "active"
-      }
-    })
-  );
+
+  let paginationContainer = document.querySelector('#pagination-container');
+  var paginationWidget = pagination({
+    container: paginationContainer,
+    maxPages: 20,
+    scrollTo: false,
+    showFirstLast: false,
+    cssClasses: {
+      root: "pagination",
+      item: "page-item",
+      link: "page-link",
+      active: "active"
+    }
+  });
+  var oldRender = paginationWidget.render;
+
+  // Rewrite original render function.
+  paginationWidget.render = function (params) {
+    var currentState = params.results;
+
+    if (currentState.nbPages <= 1) paginationContainer.style.display = 'none';
+    else paginationContainer.style.display = 'block';
+    oldRender.call(this, params);
+  }
+
+  search.addWidget(paginationWidget);
 }
 
 search.addWidget(searchBox({

diff --git a/themes/cloudposse/src/scss/components/page-elements/right-sidebar.scss b/themes/cloudposse/src/scss/components/page-elements/right-sidebar.scss
@@ -7,6 +7,7 @@
   margin-right: 20px;
   overflow-y: auto;
   display: none;
+  padding-top: 2rem;
 
   @include respond-to('large') {
     display: block;

diff --git a/themes/cloudposse/src/scss/pages/faq.scss b/themes/cloudposse/src/scss/pages/faq.scss
@@ -8,6 +8,12 @@
     h2 {
       margin: 0;
       padding-bottom: 0;
+
+      &::before {
+        content: '✅';
+        vertical-align: top;
+        margin-right: .2rem;
+      }
     }
 
     a {

diff --git a/themes/cloudposse/src/scss/pages/home.scss b/themes/cloudposse/src/scss/pages/home.scss
@@ -67,6 +67,7 @@
 
     &--depth1 {
       border-bottom: 1px solid $color_alto_approx;
+      flex: 0 0 auto;
       margin-top: 0;
 
       @include respond-to('tablet') {
@@ -88,8 +89,6 @@
     &--depth1 {
       font-size: 1.6rem;
       text-transform: none;
-      display: flex;
-      align-items: center;
 
       > a {
         transition: color .2s;