small layout-top-nav enhancements

- fixed logo position - added ability to use top-nav with sidebar (incl. demo)
alz3abi · Jan 14, 2020 · 6c06201 · 6c06201
1 parent dbe3e80
commit 6c06201
Show file tree

Hide file tree

Showing 54 changed files with 1,158 additions and 23 deletions.
diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss
@@ -392,9 +392,11 @@ body,
   .layout-top-nav & {
     margin-left: 0;
 
-    & .text-sm {
+    .main-header {    
       .brand-image {
         margin-top: -.5rem;
+        margin-right: .2rem;
+        height: 33px;
       }
     }
 
@@ -403,14 +405,6 @@ body,
       height: inherit;
     }
 
-    .brand-image {
-      height: 33px;
-    }
-
-    & .main-sidebar {
-      display: none;
-    }
-
     & .content-wrapper,
     & .main-header,
     & .main-footer {

diff --git a/dist/css/adminlte.css b/dist/css/adminlte.css
@@ -11168,23 +11168,17 @@ body:not(.layout-fixed).layout-navbar-fixed.text-sm .wrapper .main-sidebar .side
   margin-left: 0;
 }
 
-.layout-top-nav .wrapper .text-sm .brand-image {
+.layout-top-nav .wrapper .main-header .brand-image {
   margin-top: -.5rem;
+  margin-right: .2rem;
+  height: 33px;
 }
 
 .layout-top-nav .wrapper .main-sidebar {
   bottom: inherit;
   height: inherit;
 }
 
-.layout-top-nav .wrapper .brand-image {
-  height: 33px;
-}
-
-.layout-top-nav .wrapper .main-sidebar {
-  display: none;
-}
-
 .layout-top-nav .wrapper .content-wrapper,
 .layout-top-nav .wrapper .main-header,
 .layout-top-nav .wrapper .main-footer {

diff --git a/dist/css/adminlte.css.map b/dist/css/adminlte.css.map
diff --git a/dist/css/adminlte.min.css b/dist/css/adminlte.min.css
diff --git a/dist/css/adminlte.min.css.map b/dist/css/adminlte.min.css.map
diff --git a/dist/js/adminlte.js b/dist/js/adminlte.js
diff --git a/dist/js/adminlte.min.js b/dist/js/adminlte.min.js
diff --git a/index.html b/index.html
@@ -233,6 +233,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="pages/layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="pages/layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/index2.html b/index2.html
@@ -220,6 +220,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="pages/layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="pages/layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/index3.html b/index3.html
@@ -230,6 +230,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="pages/layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="pages/layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/buttons.html b/pages/UI/buttons.html
@@ -222,6 +222,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/general.html b/pages/UI/general.html
@@ -268,6 +268,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/icons.html b/pages/UI/icons.html
@@ -222,6 +222,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/modals.html b/pages/UI/modals.html
@@ -226,6 +226,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/navbar.html b/pages/UI/navbar.html
@@ -228,6 +228,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/ribbons.html b/pages/UI/ribbons.html
@@ -223,6 +223,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/sliders.html b/pages/UI/sliders.html
@@ -227,6 +227,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/UI/timeline.html b/pages/UI/timeline.html
@@ -221,6 +221,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/calendar.html b/pages/calendar.html
@@ -227,6 +227,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html
@@ -222,6 +222,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/charts/flot.html b/pages/charts/flot.html
@@ -223,6 +223,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/charts/inline.html b/pages/charts/inline.html
@@ -224,6 +224,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/404.html b/pages/examples/404.html
@@ -223,6 +223,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/500.html b/pages/examples/500.html
@@ -223,6 +223,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/blank.html b/pages/examples/blank.html
@@ -224,6 +224,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/contacts.html b/pages/examples/contacts.html
@@ -224,6 +224,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/e_commerce.html b/pages/examples/e_commerce.html
@@ -224,6 +224,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/invoice.html b/pages/examples/invoice.html
@@ -222,6 +222,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/language-menu.html b/pages/examples/language-menu.html
@@ -236,6 +236,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/legacy-user-menu.html b/pages/examples/legacy-user-menu.html
@@ -251,6 +251,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/pace.html b/pages/examples/pace.html
@@ -226,6 +226,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>

diff --git a/pages/examples/profile.html b/pages/examples/profile.html
@@ -223,6 +223,12 @@ <h3 class="dropdown-item-title">
                   <p>Top Navigation</p>
                 </a>
               </li>
+              <li class="nav-item">
+                <a href="../layout/top-nav-sidebar.html" class="nav-link">
+                  <i class="far fa-circle nav-icon"></i>
+                  <p>Top Navigation + Sidebar</p>
+                </a>
+              </li>
               <li class="nav-item">
                 <a href="../layout/boxed.html" class="nav-link">
                   <i class="far fa-circle nav-icon"></i>