Merge pull request #1698 from gethinode/templatev2

Templatev2

Author: markdumay

assets/scss/app-dart.scss

@@ -43,6 +43,7 @@
 @import "components/sidebar.scss";
 @import "components/syntax-dart.scss"; // note: modified for dart-sass
 @import "components/table.scss";
+@import "components/testimonial.scss";
 @import "components/toast.scss";
 @import "components/timeline.scss";
 @import "components/toc.scss";

assets/scss/app.scss

@@ -41,6 +41,7 @@
 @import "components/sidebar.scss";
 @import "components/syntax.scss";
 @import "components/table.scss";
+@import "components/testimonial.scss";
 @import "components/toast.scss";
 @import "components/timeline.scss";
 @import "components/toc.scss";

assets/scss/components/_pagination.scss

@@ -5,8 +5,12 @@
     --bs-pagination-hover-color: var(--bs-pagination-active-color);
     --bs-pagination-hover-bg: var(--bs-pagination-active-bg);
     --bs-pagination-hover-border-color: none;
-}
 
-.pagination .page-item {
-    margin: 0.4rem;
-}
+    .page-item {
+        margin: 0.4rem;
+    }
+
+    .page-item:first-of-type {
+        margin-left: 0;
+    }
+}

assets/scss/components/_testimonial.scss

@@ -0,0 +1,20 @@
+.testimonial-img {
+    height: 10vw;
+    width: 10vw;
+    background-color: var(--#{$prefix}body-bg);
+}
+
+.testimonial-logo {
+    width: 20vw;
+}
+
+@include media-breakpoint-up(md) {
+    .testimonial-img {
+        height: 5vw;
+        width: 5vw;
+    }
+
+    .testimonial-logo {
+        width: 10vw;
+    }
+}

component-library/components/testimonials/testimonials.scss

@@ -1,24 +1,3 @@
-.testimonial-img {
-    height: 10vw;
-    width: 10vw;
-    background-color: var(--#{$prefix}body-bg);
-}
-
-.testimonial-logo {
-    width: 20vw;
-}
-
-@include media-breakpoint-up(md) {
-    .testimonial-img {
-        height: 5vw;
-        width: 5vw;
-    }
-
-    .testimonial-logo {
-        width: 10vw;
-    }
-}
-
 section.testimonials {
     .carousel, .testimonial-grid {
         width: 100%;

layouts/_partials/assets/helpers/navbar-render-menu.html

@@ -11,7 +11,7 @@
         {{ if $entry.Params.spacing }}
             <li class="nav-item flex-grow-1"></li>
         {{ else }}
-            <li class="nav-item {{ if .HasChildren }} dropdown me-auto{{ if $horizontal }} dropdown-horizontal-{{ $breakpoint }}{{ end }}{{ end }}">
+            <li class="nav-item {{ if .HasChildren }} dropdown me-auto my-auto{{ if $horizontal }} dropdown-horizontal-{{ $breakpoint }}{{ end }}{{ end }}">
                 {{- partial "assets/helpers/navbar-item.html" (dict "menu-entry" $entry "page" $page) -}}
                 {{- if .HasChildren -}}
                     <ul class="dropdown-menu{{ if $control }} dropdown-menu-end{{ end }}">