Modal, navbar, footer adjustments & fixes

creativetimofficial · Oct 18, 2018 · 169da17 · 169da17
1 parent 71395c6
commit 169da17
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 26 deletions.
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
@@ -26,7 +26,7 @@
             </slot>
           </div>
 
-          <div class="modal-body" :class="bodyClasses">
+          <div v-if="$slots.default" class="modal-body" :class="bodyClasses">
             <slot></slot>
           </div>
 

diff --git a/src/layout/dashboard/ContentFooter.vue b/src/layout/dashboard/ContentFooter.vue
@@ -1,26 +1,24 @@
 <template>
   <footer class="footer">
-    <div class="container-fluid d-flex flex-wrap justify-content-between">
-      <nav>
-        <ul class="nav">
-          <li class="nav-item">
-            <a class="nav-link" href="http://www.creative-tim.com">
-              Creative Tim
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="http://blog.creative-tim.com">
-              Blog
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="http://www.creative-tim.com/license">
-              Licenses
-            </a>
-          </li>
-        </ul>
-      </nav>
-      <div class="copyright float-right">
+    <div class="container-fluid">
+      <ul class="nav">
+        <li class="nav-item">
+          <a class="nav-link" href="http://www.creative-tim.com">
+            Creative Tim
+          </a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="http://blog.creative-tim.com">
+            Blog
+          </a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="http://www.creative-tim.com/license">
+            Licenses
+          </a>
+        </li>
+      </ul>
+      <div class="copyright">
         © {{year}} made with <i class="tim-icons icon-heart-2"></i> by
         <a href="https://www.binarcode.com" target="_blank">Binar Code</a>&nbsp;&
         <a href="https://www.creative-tim.com" target="_blank">Creative Tim</a> for a better web.

diff --git a/src/layout/dashboard/TopNavbar.vue b/src/layout/dashboard/TopNavbar.vue
@@ -1,6 +1,6 @@
 <template>
   <nav class="navbar navbar-expand-lg navbar-absolute"
-       :class="{'bg-white': showMenu}">
+       :class="{'bg-white': showMenu, 'navbar-transparent': !showMenu}">
     <div class="container-fluid">
       <div class="navbar-wrapper">
         <div class="navbar-toggle d-inline" :class="{toggled: $sidebar.showSidebar}">
@@ -36,12 +36,15 @@
               <!-- You can choose types of search input -->
             </div>
             <modal :show.sync="searchModalVisible"
+                   class="modal-search"
                    id="searchModal"
                    :centered="false"
                    :show-close="true">
-              <base-input slot="header" v-model="searchQuery" type="text" id="inlineFormInputGroup" placeholder="SEARCH"/>
+              <input slot="header" v-model="searchQuery" type="text" class="form-control" id="inlineFormInputGroup" placeholder="SEARCH">
             </modal>
-            <base-dropdown tag="li" title-tag="a" class="nav-item" menu-on-right>
+            <base-dropdown tag="li"
+                           :menu-on-right="!$rtl.isRTL"
+                           title-tag="a" class="nav-item">
               <a slot="title" href="#" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-expanded="true">
                 <div class="notification d-none d-lg-block d-xl-block"></div>
                 <i class="tim-icons icon-sound-wave"></i>
@@ -65,7 +68,11 @@
                 <a href="#" class="nav-item dropdown-item">Another one</a>
               </li>
             </base-dropdown>
-            <base-dropdown tag="li" title-tag="a" class="nav-item" menu-classes="dropdown-navbar">
+            <base-dropdown tag="li"
+                           :menu-on-right="!$rtl.isRTL"
+                           title-tag="a"
+                           class="nav-item"
+                           menu-classes="dropdown-navbar">
               <a slot="title" href="#" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-expanded="true">
                 <div class="photo">
                   <img src="img/anime3.png">