移除Fix样式表，整合固定模式到响应式脚本中

Bootstrap.Admin/Bootstrap.Admin.csproj

@@ -103,7 +103,6 @@
     <Content Include="Content\css\admin.css" />
     <Content Include="Content\css\blue.css" />
     <Content Include="Content\css\fa.css" />
-    <Content Include="Content\css\fix.css" />
     <Content Include="Content\css\font-awesome.css" />
     <Content Include="Content\css\bootstrap-table.css" />
     <Content Include="Content\css\bootstrap-table.min.css" />
@@ -208,7 +207,6 @@
     <Content Include="packages.config" />
     <Content Include="Content\fonts\fontawesome-webfont.ttf" />
     <Content Include="Content\fonts\fontawesome-webfont.woff" />
-    <Content Include="Views\Shared\_Fix.cshtml" />
     <Content Include="Views\Shared\_Normal.cshtml" />
     <Content Include="Views\Shared\_Admin.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />

Bootstrap.Admin/Content/css/admin.css

@@ -1,5 +1,6 @@
 #main-content {
     margin-left: 210px;
+    height: auto;
 }
 
 .sidebar-closed > #sidebar > ul {
@@ -16,11 +17,10 @@
 
 #sidebar {
     width: 210px;
-    height: 100%;
-    position: fixed;
+    height: auto;
     background: #2a3542;
     overflow-y: scroll;
-    margin-top: 94px;
+    position: absolute;
 }
 
     #sidebar .sub-menu > .sub li {
@@ -144,4 +144,4 @@ ul.sidebar-menu {
                     -ms-transition: all 0.3s ease;
                     transition: all 0.3s ease;
                     color: #aeb2b7;
-                }
+                }

Bootstrap.Admin/Content/css/fix.css

@@ -1,23 +0,0 @@
-html, body {
-    height: 100%;
-    overflow: hidden;
-}
-
-#main-content {
-    margin-top: 0;
-    position: fixed;
-    left: 0;
-    bottom: 40px;
-    right: 0;
-    top: 94px;
-    overflow: auto;
-}
-
-.site-footer {
-    position: fixed;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    z-index: 50;
-    height: 40px;
-}

Bootstrap.Admin/Content/css/site-responsive.css

@@ -82,8 +82,46 @@
     }
 }
 
-@media (max-width:320px) {
+@media (max-width: 320px) {
     .modal-dialog {
         width: 300px;
     }
 }
+
+@media (min-height: 768px) {
+    html, body {
+        height: 100%;
+        overflow: hidden;
+    }
+
+    #sidebar {
+        margin-top: 94px;
+        height: 100%;
+    }
+
+    .header {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        z-index: 50;
+    }
+
+    .site-footer {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        z-index: 50;
+    }
+
+    #main-content {
+        margin-top: 0;
+        position: fixed;
+        left: 0;
+        bottom: 40px;
+        right: 0;
+        top: 94px;
+        overflow: auto;
+    }
+}

Bootstrap.Admin/Content/css/site.css

@@ -10,10 +10,6 @@
     -moz-font-smoothing: antialiased;
 }
 
-#main-content {
-    margin-top: 94px;
-}
-
 .wrapper {
     display: inline-block;
     padding: 15px;
@@ -42,16 +38,10 @@ div button span {
 }
 
 .header, .footer {
-    min-height: 60px;
     padding: 0 15px;
 }
 
 .header {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    z-index: 1002;
     height: 94px;
     border-color: #ddd;
     border-width: 0 0 1px 0;
@@ -95,7 +85,8 @@ a.logo {
 .site-footer {
     background: #5b6e84;
     color: #fff;
-    padding: 10px 0;
+    padding: 10px 4px;
+    height: 40px;
 }
 
 .go-top {
@@ -318,20 +309,20 @@ a.logo {
         -webkit-border-radius: 4px 4px 0px 0px;
     }
 
-    .dropdown-menu.extended li p.green {
-        background-color: #a9d86e;
-        color: #fff;
-    }
+        .dropdown-menu.extended li p.green {
+            background-color: #a9d86e;
+            color: #fff;
+        }
 
-    .dropdown-menu.extended li p.yellow {
-        background-color: #fcb322;
-        color: #fff;
-    }
+        .dropdown-menu.extended li p.yellow {
+            background-color: #fcb322;
+            color: #fff;
+        }
 
-    .dropdown-menu.extended li p.red {
-        background-color: #ff6c60;
-        color: #fff;
-    }
+        .dropdown-menu.extended li p.red {
+            background-color: #ff6c60;
+            color: #fff;
+        }
 
     .dropdown-menu.extended .progress {
         margin-bottom: 0 !important;

Bootstrap.Admin/Views/Home/Index.cshtml

@@ -1,7 +1,7 @@
 @model Bootstrap.Admin.Models.HeaderBarModel
 @{
     ViewBag.Title = "Rules";
-    Layout = "~/Views/Shared/_Fix.cshtml";
+    Layout = "~/Views/Shared/_Normal.cshtml";
 }
 @section header {
     @Html.Partial("Header", Model)

Bootstrap.Admin/Views/Shared/_Admin.cshtml

@@ -7,9 +7,8 @@
     <link href="~/Content/css/bootstrap-table.css" rel="stylesheet" />
     <link href="~/Content/css/sweetalert.css" rel="stylesheet" />
     <link href="~/Content/css/site.css" rel="stylesheet" />
-    <link href="~/Content/css/site-responsive.css" rel="stylesheet" />
-    <link href="~/Content/css/fix.css" rel="stylesheet" />
     <link href="~/Content/css/admin.css" rel="stylesheet" />
+    <link href="~/Content/css/site-responsive.css" rel="stylesheet" />
     @RenderSection("css", false)
 }
 @section javascript {

Bootstrap.Admin/Views/Shared/_Fix.cshtml

@@ -1,17 +0,0 @@
-@{
-    Layout = "~/Views/Shared/_Normal.cshtml";
-}
-@section css {
-    <link href="~/Content/css/fix.css" rel="stylesheet" />
-    @RenderSection("css", false)
-}
-@section javascript {
-    @RenderSection("Javascript", false)
-}
-@section modal{
-    @RenderSection("modal", false)
-}
-@section header {
-    @RenderSection("header", false)
-}
-@RenderBody()