首頁 探索 說明
註冊 登入
wilson.silva
/
AdminLte
镜像来自 https://github.com/almasaeed2010/AdminLTE
1
0
複刻 0
檔案 問題管理 0 Wiki
瀏覽代碼

Add Fix header height issue

Abdullah Almsaeed 9 年之前
父節點
f0977ab235
當前提交
846cee1b4d
共有 9 個文件被更改，包括 608 次插入 和 1250 次删除
統一視圖 顯示文件統計
  1. 1 1
      build/scss/_core.scss
  2. 29 0
      build/scss/_header.scss
  3. 1 1
      build/scss/_sidebar.scss
  4. 2 2
      build/scss/skins/skin-blue.scss
  5. 546 1206
      dist/tmp/AdminLTE.css
  6. 0 0
      dist/tmp/AdminLTE.css.map
  7. 2 1
      dist/tmp/AdminLTE.min.css
  8. 0 0
      dist/tmp/AdminLTE.min.css.map
  9. 27 39
      starter.html

+ 1 - 1
build/scss/_core.scss
查看文件 

@@ -126,7 +126,7 @@ body.hold-transition {
 
 /* Content */
 
 /* Content */
 
 .content {
 
 .content {
 
   min-height: 250px;
 
   min-height: 250px;
 
-  padding: 15px;
 
+  padding: 0 15px 15px 15px;
 
   // @include container-fixed($grid-gutter-width);
 
   // @include container-fixed($grid-gutter-width);
 
 }
 
 }

+ 29 - 0
build/scss/_header.scss
查看文件 

@@ -4,5 +4,34 @@
 
  */
 
  */
 
 
 
 .main-header {
 
 .main-header {
 
+  position: relative;
 
+  z-index: $zindex-navbar;
 
 
 
+  > .navbar {
 
+    margin-left: $sidebar-width;
 
+    height: 55px;
 
+  }
 
+
 
+  > .logo {
 
+    width: $sidebar-width;
 
+    padding: 0 15px;
 
+    text-align: center;
 
+    float: left;
 
+    font-size: 18px;
 
+    height: 55px;
 
+    line-height: 55px;
 
+  }
 
+}
 
+
 
+.content-header {
 
+  padding: 15px;
 
+  h1 {
 
+    font-size: 2rem;
 
+    margin: 0;
 
+
 
+  }
 
+  .breadcrumb {
 
+    margin-bottom: 0;
 
+    padding: 0;
 
+  }
 
 }
 
 }

+ 1 - 1
build/scss/_sidebar.scss
查看文件 

@@ -10,7 +10,7 @@
 
   position: absolute;
 
   position: absolute;
 
   top: 0;
 
   top: 0;
 
   left: 0;
 
   left: 0;
 
-  padding-top: 50px;
 
+  padding-top: 55px;
 
   min-height: 100%;
 
   min-height: 100%;
 
   width: $sidebar-width;
 
   width: $sidebar-width;
 
   z-index: 810;
 
   z-index: 810;

+ 2 - 2
build/scss/skins/skin-blue.scss
查看文件 

@@ -4,7 +4,7 @@
 
  */
 
  */
 
 .skin-blue {
 
 .skin-blue {
 
   //Navbar
 
   //Navbar
 
-  .main-header {
 
+  .main-header {/*
 
     .navbar {
 
     .navbar {
 
       @include navbar-variant($light-blue, #fff);
 
       @include navbar-variant($light-blue, #fff);
 
       .sidebar-toggle {
 
       .sidebar-toggle {
 
@@ -28,7 +28,7 @@
 
           }
 
           }
 
         }
 
         }
 
       }
 
       }
 
-    }
 
+    }*/
 
     //Logo
 
     //Logo
 
     .logo {
 
     .logo {
 
       @include logo-variant(darken($light-blue, 5%));
 
       @include logo-variant(darken($light-blue, 5%));

文件差異過大導致無法顯示
+ 546 - 1206
dist/tmp/AdminLTE.css


文件差異過大導致無法顯示
+ 0 - 0
dist/tmp/AdminLTE.css.map


文件差異過大導致無法顯示
+ 2 - 1
dist/tmp/AdminLTE.min.css


文件差異過大導致無法顯示
+ 0 - 0
dist/tmp/AdminLTE.min.css.map


+ 27 - 39
starter.html
查看文件 

@@ -3,13 +3,13 @@
 
 This is a starter template page. Use this page to start your new project from
 
 This is a starter template page. Use this page to start your new project from
 
 scratch. This page gets rid of all links and provides the needed markup only.
 
 scratch. This page gets rid of all links and provides the needed markup only.
 
 -->
 
 -->
 
-<html>
 
+<html lang="en">
 
 <head>
 
 <head>
 
   <meta charset="utf-8">
 
   <meta charset="utf-8">
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
 
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
 
+
 
   <title>AdminLTE 2 | Starter</title>
 
   <title>AdminLTE 2 | Starter</title>
 
-  <!-- Tell the browser to be responsive to screen width -->
 
-  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
   <!-- Font Awesome -->
 
   <!-- Font Awesome -->
 
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
 
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
 
   <!-- Theme style -->
 
   <!-- Theme style -->
 
@@ -35,36 +35,37 @@ desired effect
 
 |               | skin-red                                |
 
 |               | skin-red                                |
 
 |               | skin-green                              |
 
 |               | skin-green                              |
 
 |---------------------------------------------------------|
 
 |---------------------------------------------------------|
 
-|LAYOUT OPTIONS | fixed                                   |
 
+|LAYOUT OPTIONS | layout-fixed                                   |
 
 |               | layout-boxed                            |
 
 |               | layout-boxed                            |
 
 |               | layout-top-nav                          |
 
 |               | layout-top-nav                          |
 
 |               | sidebar-collapse                        |
 
 |               | sidebar-collapse                        |
 
 |               | sidebar-mini                            |
 
 |               | sidebar-mini                            |
 
 |---------------------------------------------------------|
 
 |---------------------------------------------------------|
 
 -->
 
 -->
 
-<body class="hold-transition skin-blue sidebar-mini">
 
+<body class="hold-transition skin-blue sidebar-mini sidebar-collapsed">
 
 <div class="wrapper">
 
 <div class="wrapper">
 
-  <!-- Navbar -->
 
-  <nav class="navbar navbar-static-top main-header navbar-dark bg-light-blue">
 
+  <div class="main-header">
 
     <!-- Logo -->
 
     <!-- Logo -->
 
-    <a class="navbar-brand" href="#"><b>Admin</b>LTE</a>
 
-
 
-    <ul class="nav navbar-nav">
 
-      <li class="nav-item active">
 
-        <a class="nav-link" href="#">Home</a>
 
-      </li>
 
-      <li class="nav-item">
 
-        <a class="nav-link" href="#">Features</a>
 
-      </li>
 
-      <li class="nav-item">
 
-        <a class="nav-link" href="#">Pricing</a>
 
-      </li>
 
-      <li class="nav-item">
 
-        <a class="nav-link" href="#">About</a>
 
-      </li>
 
-    </ul>
 
-  </nav>
 
-  <!-- /.navbar -->
 
+    <a class="logo" href="#"><b>Admin</b>LTE</a>
 
+    <!-- Navbar -->
 
+    <nav class="navbar navbar-static-top navbar-dark bg-light-blue">
 
+      <ul class="nav navbar-nav">
 
+        <li class="nav-item active">
 
+          <a class="nav-link" href="#">Home</a>
 
+        </li>
 
+        <li class="nav-item">
 
+          <a class="nav-link" href="#">Features</a>
 
+        </li>
 
+        <li class="nav-item">
 
+          <a class="nav-link" href="#">Pricing</a>
 
+        </li>
 
+        <li class="nav-item">
 
+          <a class="nav-link" href="#">About</a>
 
+        </li>
 
+      </ul>
 
+    </nav>
 
+    <!-- /.navbar -->
 
+  </div>
 
 
 
   <!-- Left side column. contains the logo and sidebar -->
 
   <!-- Left side column. contains the logo and sidebar -->
 
   <aside class="main-sidebar">
 
   <aside class="main-sidebar">
 
@@ -84,18 +85,6 @@ desired effect
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
 
 
-      <!-- search form (Optional) -->
 
-      <form action="#" method="get" class="sidebar-form">
 
-        <div class="input-group">
 
-          <input type="text" name="q" class="form-control" placeholder="Search...">
 
-              <span class="input-group-btn">
 
-                <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i>
 
-                </button>
 
-              </span>
 
-        </div>
 
-      </form>
 
-      <!-- /.search form -->
 
-
 
       <!-- Sidebar Menu -->
 
       <!-- Sidebar Menu -->
 
       <ul class="sidebar-menu">
 
       <ul class="sidebar-menu">
 
         <li class="header">HEADER</li>
 
         <li class="header">HEADER</li>
 
@@ -123,7 +112,6 @@ desired effect
 
         <div class="col-sm-6">
 
         <div class="col-sm-6">
 
           <h1>
 
           <h1>
 
             Page Header
 
             Page Header
 
-            <small>Optional description</small>
 
           </h1>
 
           </h1>
 
         </div>
 
         </div>
 
         <!-- /.col-sm-6 -->
 
         <!-- /.col-sm-6 -->

部分文件因文件數量過多而無法顯示