fix style

hunter-and1 · Jul 9, 2019 · 4261fa1 · 4261fa1
1 parent 68c6f0a
commit 4261fa1
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-/node_modules
+/node_modules
+dev
+gulpfile.js
diff --git a/dev/sass/components/_sidebar.scss b/dev/sass/components/_sidebar.scss
@@ -123,7 +123,7 @@
   * ------------------
   */
  .main-sidebar {
-    z-index: 950;
+    z-index: 3000;
     height: 100vh;
     overflow-y: hidden;
   }

diff --git a/dev/sass/layout/_header.scss b/dev/sass/layout/_header.scss
@@ -151,7 +151,7 @@
   }
 
   .brand-link {
-    padding: 0.8125rem 0.5rem;
+    padding: 0.8125rem 0rem;
     font-size: 1.25rem;
     display: block;
     line-height: 1.5;

diff --git a/dev/sass/themes/_mydash.scss b/dev/sass/themes/_mydash.scss
@@ -294,7 +294,7 @@
    .sidebar-mini.sidebar-collapse .content-wrapper,
    .sidebar-mini.sidebar-collapse .main-footer,
    .sidebar-mini.sidebar-collapse .main-header {
-     margin-left: 4.6rem !important;
+     margin-left: 4rem !important;
    }
    .sidebar-mini.sidebar-collapse .nav-sidebar .nav-header {
      display: none;
@@ -311,7 +311,8 @@
    }
    .sidebar-mini.sidebar-collapse .main-sidebar, .sidebar-mini.sidebar-collapse .main-sidebar:before {
      margin-left: 0;
-     width: 4.6rem;
+     overflow: hidden;
+     width: 4rem;
    }
    .sidebar-mini.sidebar-collapse .main-sidebar .user-panel .image {
      float: none;
@@ -3769,8 +3770,8 @@
  .elevation-0 {
    box-shadow: none;
  }
-
- .elevation-1, .sidebar-dark-primary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-primary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-secondary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-secondary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-success .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-success .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-info .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-info .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-warning .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-warning .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-danger .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-danger .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-light .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-light .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-dark .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-dark .nav-sidebar > .nav-item > .nav-link.active, .callout {
+ /* .sidebar-light-primary .nav-sidebar > .nav-item > .nav-link.active */
+ .elevation-1, .sidebar-dark-primary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-secondary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-secondary .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-success .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-success .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-info .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-info .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-warning .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-warning .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-danger .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-danger .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-light .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-light .nav-sidebar > .nav-item > .nav-link.active, .sidebar-dark-dark .nav-sidebar > .nav-item > .nav-link.active, .sidebar-light-dark .nav-sidebar > .nav-item > .nav-link.active, .callout {
    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
  }
 

diff --git a/dist/css/main.css b/dist/css/main.css
diff --git a/dist/css/main.css.map b/dist/css/main.css.map
diff --git a/dist/index.html b/dist/index.html
@@ -113,13 +113,13 @@
                     <ul class="nav nav-treeview">
                         <li class="nav-item">
                         <a href="#" class="nav-link active">
-                            <i class="far fa-circle nav-icon"></i>
+                            <i class="fas fa-minus nav-icon"></i>
                             <p>Active Page</p>
                         </a>
                         </li>
                         <li class="nav-item">
                         <a href="#" class="nav-link">
-                            <i class="far fa-circle nav-icon"></i>
+                            <i class="fas fa-minus nav-icon"></i>
                             <p>Inactive Page</p>
                         </a>
                         </li>
@@ -134,6 +134,7 @@
 
         <!-- Content Wrapper. Contains page content -->
         <div class="content-wrapper">
+
             <!-- Content Header (Page header) -->
             <div class="content-header">
                 <div class="container-fluid">