diff --git a/Bootstrap.Admin/Content/css/admin-responsive.css b/Bootstrap.Admin/Content/css/admin-responsive.css
index 13d0cc05..9ecdc631 100644
--- a/Bootstrap.Admin/Content/css/admin-responsive.css
+++ b/Bootstrap.Admin/Content/css/admin-responsive.css
@@ -96,6 +96,15 @@
}
}
+@media (min-width: 768px) {
+ #sidebar {
+ top: 94px;
+ bottom: 40px;
+ position: absolute;
+ overflow-y: auto;
+ }
+}
+
@media (min-height: 672px) {
#sidebar {
top: 94px;
diff --git a/Bootstrap.Admin/Content/css/admin.css b/Bootstrap.Admin/Content/css/admin.css
index 771a4460..79ae8c1e 100644
--- a/Bootstrap.Admin/Content/css/admin.css
+++ b/Bootstrap.Admin/Content/css/admin.css
@@ -153,13 +153,6 @@
position: relative;
}
-.desktop #sidebar {
- top: 94px;
- bottom: 40px;
- position: absolute;
- overflow-y: auto;
-}
-
ul.sidebar-menu {
padding: 20px 0 15px 0;
margin-bottom: 0;
diff --git a/Bootstrap.Admin/Content/css/site-responsive.css b/Bootstrap.Admin/Content/css/site-responsive.css
index 8803a91a..3a8f8025 100644
--- a/Bootstrap.Admin/Content/css/site-responsive.css
+++ b/Bootstrap.Admin/Content/css/site-responsive.css
@@ -38,6 +38,34 @@
}
}
+@media (min-width: 768px) {
+ .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;
+ }
+}
+
@media (min-height: 672px) {
html, body {
height: 100%;
diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css
index 932be73d..40a49711 100644
--- a/Bootstrap.Admin/Content/css/site.css
+++ b/Bootstrap.Admin/Content/css/site.css
@@ -61,54 +61,12 @@ a, a:hover, a:focus {
text-transform: uppercase;
}
- .sidebar-toggle-box:hover, .sidebar-toggle-box:focus {
- text-decoration: none;
- outline: none;
- color: #337ab7;
- }
-
- .sidebar-toggle-box span {
- padding-left: 6px;
- }
-
- .sidebar-toggle-box .fa-bars {
- cursor: pointer;
- display: inline-block;
- font-size: 20px;
- }
-
.site-footer {
background: #5b6e84;
color: #fff;
padding: 10px 4px;
height: 40px;
}
-
-.desktop .header {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- z-index: 50;
-}
-
-.desktop .site-footer {
- position: fixed;
- left: 0;
- bottom: 0;
- right: 0;
- z-index: 50;
-}
-
-.desktop #main-content {
- margin-top: 0;
- position: fixed;
- left: 0;
- bottom: 40px;
- right: 0;
- top: 94px;
- overflow: auto;
-}
/*end title*/
.go-top {
diff --git a/Bootstrap.Admin/Content/js/Longbow.Common.js b/Bootstrap.Admin/Content/js/Longbow.Common.js
index bb568fc4..9cf7647d 100644
--- a/Bootstrap.Admin/Content/js/Longbow.Common.js
+++ b/Bootstrap.Admin/Content/js/Longbow.Common.js
@@ -208,6 +208,4 @@ $(function () {
return this.optional(element) || /^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$/.test(value);
}, "请填写正确的IP地址");
}
-
- if ($.browser.versions.mobile) { $('body').removeClass('desktop'); }
});
\ No newline at end of file
diff --git a/Bootstrap.Admin/Views/Shared/_Layout.cshtml b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
index 1fd0dfbe..6ec49f26 100644
--- a/Bootstrap.Admin/Views/Shared/_Layout.cshtml
+++ b/Bootstrap.Admin/Views/Shared/_Layout.cshtml
@@ -10,7 +10,7 @@
@RenderSection("css", false)
-
+
@RenderBody()