diff --git a/Bootstrap.Admin/Content/css/site-responsive.css b/Bootstrap.Admin/Content/css/site-responsive.css index f8b9e8a0..3925f6a2 100644 --- a/Bootstrap.Admin/Content/css/site-responsive.css +++ b/Bootstrap.Admin/Content/css/site-responsive.css @@ -133,4 +133,20 @@ top: 94px; overflow: auto; } + + .content-body { + position: fixed; + left: 0; + bottom: 40px; + right: 0; + top: 94px; + overflow: hidden; + } + + .content-body iframe { + width: 100%; + border: none; + height: 100%; + overflow: auto; + } } diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css index 98f2bd96..76d1cfe8 100644 --- a/Bootstrap.Admin/Content/css/site.css +++ b/Bootstrap.Admin/Content/css/site.css @@ -628,8 +628,7 @@ ul.breadcrumb { padding-right: 6px; } -iframe { +.content-body iframe { width: 100%; border: none; - height: 500px; } diff --git a/Bootstrap.Admin/Content/html/dummy.html b/Bootstrap.Admin/Content/html/dummy.html index 66ecf3d2..6f211f1c 100644 --- a/Bootstrap.Admin/Content/html/dummy.html +++ b/Bootstrap.Admin/Content/html/dummy.html @@ -9,7 +9,7 @@ -
我就是一个测试页面
+
我就是一个测试页面
Bottom
diff --git a/Bootstrap.Admin/Scripts/Content.js b/Bootstrap.Admin/Scripts/Content.js index 5f282702..72994b42 100644 --- a/Bootstrap.Admin/Scripts/Content.js +++ b/Bootstrap.Admin/Scripts/Content.js @@ -1 +1,4 @@ - \ No newline at end of file +$(function () { + var fra = $('iframe').get(0); + fra.height = fra.contentDocument.body.offsetHeight; +}); \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Shared/Content.cshtml b/Bootstrap.Admin/Views/Shared/Content.cshtml index 5af3f5bf..c4551d53 100644 --- a/Bootstrap.Admin/Views/Shared/Content.cshtml +++ b/Bootstrap.Admin/Views/Shared/Content.cshtml @@ -1,3 +1,4 @@ @model ContentModel -

欢迎使用本系统

- \ No newline at end of file +
+ +