Browse Source

some little scss changes
- added .anchor for anchors with offset while fixed navbar
- fixed .main-header border
- added sidebar color variations (colors)
- added pre & blockquote style for doc usage
- fixed brand-link width with .logo-switch

REJack 5 years ago
parent
commit
7e2ec226e0

+ 24 - 12
build/scss/_layout.scss

@@ -34,7 +34,19 @@ body,
     }
   }
 
+  .layout-navbar-fixed.layout-fixed & {
+    .sidebar {
+      margin-top: $main-header-height;
+    }
+  }
+
   .layout-navbar-fixed & {
+    a.anchor {
+      display: block;
+      position: relative;
+      top: calc((#{$main-header-height-inner} + #{$main-header-bottom-border-width} + (#{$main-header-link-padding-y} * 2)) / -1);
+    }
+
     &.sidebar-collapse {
       .brand-link {
         height: $main-header-height;
@@ -50,12 +62,6 @@ body,
       }
     }
 
-    &.layout-fixed {
-      .sidebar {
-        margin-top: $main-header-height;
-      }
-    }
-
     .brand-link {
       overflow: hidden;
       position: fixed;
@@ -108,7 +114,19 @@ body,
     @include media-breakpoint-up($breakpoint) {
       $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
 
+      .layout#{$infix}-navbar-fixed.layout-fixed & {
+        .sidebar {
+          margin-top: $main-header-height;
+        }
+      }
+
       .layout#{$infix}-navbar-fixed & {
+        a.anchor {
+          display: block;
+          position: relative;
+          top: calc((#{$main-header-height-inner} + #{$main-header-bottom-border-width} + (#{$main-header-link-padding-y} * 2)) / -1);
+        }
+
         &.sidebar-collapse {
           .brand-link {
             height: $main-header-height;
@@ -124,12 +142,6 @@ body,
           }
         }
 
-        &.layout-fixed {
-          .sidebar {
-            margin-top: $main-header-height;
-          }
-        }
-
         .brand-link {
           overflow: hidden;
           position: fixed;

+ 1 - 1
build/scss/_main-header.scss

@@ -4,7 +4,7 @@
  */
  
 .main-header {
-  border: $main-header-bottom-border;
+  border-bottom: $main-header-bottom-border;
   z-index: $zindex-main-header;
 
   .nav-link {

+ 10 - 0
build/scss/_main-sidebar.scss

@@ -193,4 +193,14 @@
   }
 }
 
+@each $name, $color in $colors {
+  .sidebar-dark-#{$name} {
+    @include skin-dark-sidebar($color)
+  }
+
+  .sidebar-light-#{$name} {
+    @include skin-light-sidebar($color)
+  }
+}
+
 

+ 62 - 0
build/scss/_miscellaneous.scss

@@ -364,3 +364,65 @@
     box-shadow: none;
   }
 }
+
+// Pre
+pre {
+  padding: .75rem;
+}
+
+// Blockquotes styles
+blockquote {
+  background: $white;
+  border-left: .7rem solid $primary;
+  margin: 1.5em .7rem;
+  padding: 0.5em .7rem;
+
+  .box & {
+    background: $gray-200;
+  }
+
+  p:last-child {
+    margin-bottom: 0;
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    color: $primary;
+    font-size: 1.25rem;
+    font-weight: 600;
+  }
+
+  @each $color, $value in $theme-colors {
+    &.quote-#{$color} {
+      border-color: $value;
+
+      h1,
+      h2,
+      h3,
+      h4,
+      h5,
+      h6 {
+        color: $value;
+      }
+    }
+  }
+
+  @each $color, $value in $colors {
+    &.quote-#{$color} {
+      border-color: $value;
+
+      h1,
+      h2,
+      h3,
+      h4,
+      h5,
+      h6 {
+        color: $value;
+      }
+    }
+  }
+}

+ 14 - 0
build/scss/_sidebar-mini.scss

@@ -121,6 +121,20 @@
     .visible-sidebar-mini {
       display: block !important;
     }
+
+    .main-sidebar:hover {
+      .brand-link {
+        &.logo-switch {
+          width: $sidebar-width;
+        }
+      }
+    }
+
+    .brand-link {
+      &.logo-switch {
+        width: $sidebar-mini-width;
+      }
+    }
   }
 }
 

File diff suppressed because it is too large
+ 2050 - 120
dist/css/adminlte.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/adminlte.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/css/adminlte.min.css


File diff suppressed because it is too large
+ 0 - 0
dist/css/adminlte.min.css.map


Some files were not shown because too many files changed in this diff