修复BUG:前端配置好跨域菜单后,出现多重滚动条

This commit is contained in:
Argo-Lenovo 2016-11-19 17:45:36 +08:00
parent 319b7c3256
commit 73b8e43428
6 changed files with 29 additions and 46 deletions

View File

@ -123,10 +123,15 @@
} }
#main-content { #main-content {
padding: 15px 15px 0 15px;
margin-left: 210px; margin-left: 210px;
height: auto; height: auto;
} }
#main-content > .panel:last-child .panel-body {
padding-bottom: 0;
}
#main-content > .panel > .panel-body > .modal-footer { #main-content > .panel > .panel-body > .modal-footer {
text-align: left; text-align: left;
} }

View File

@ -69,19 +69,4 @@
top: 94px; top: 94px;
overflow: auto; overflow: auto;
} }
.content-body {
position: fixed;
left: 0;
bottom: 40px;
right: 0;
top: 94px;
overflow: auto;
}
.content-body iframe {
width: 100%;
border: none;
overflow: hidden;
}
} }

View File

@ -27,14 +27,6 @@ a, a:hover, a:focus {
color: #fff; color: #fff;
} }
#main-content {
padding: 15px 15px 0 15px;
}
#main-content > .panel:last-child .panel-body {
padding-bottom: 0;
}
.header, .footer { .header, .footer {
padding: 0 15px; padding: 0 15px;
} }
@ -558,7 +550,19 @@ ul.breadcrumb {
padding-right: 6px; padding-right: 6px;
} }
.content-body {
position: fixed;
left: 0;
bottom: 40px;
right: 0;
top: 94px;
background-image: url('../images/bg.jpg');
overflow: hidden;
}
.content-body iframe { .content-body iframe {
width: 100%; width: 100%;
height: 100%;
border: none; border: none;
} }

View File

@ -19,7 +19,6 @@ namespace Bootstrap.Admin.Controllers
public ActionResult Index() public ActionResult Index()
{ {
var v = new ContentModel(); var v = new ContentModel();
v.Url = "/Content/html/dummy.html";
return View(v); return View(v);
} }
/// <summary> /// <summary>

View File

@ -1,16 +1,13 @@
$(function () { $(function () {
if ($.browser.versions.ios) $('#content').css({ 'overflow': 'auto', '-webkit-overflow-scrolling': 'touch' });
function setActive(ele) {
ele.addClass('active');
ele.parents("ul").first().find('p').addClass('active');
var breadcrumb = ele.text();
if (breadcrumb === "") $breadNav.hide();
else $breadNav.text(breadcrumb);
}
$('#navbar').attr('data-toggle', "dropdown").addClass('dropdown-toggle'); $('#navbar').attr('data-toggle', "dropdown").addClass('dropdown-toggle');
function iframeResposive() {
try {
var fra = $('iframe').get(0);
fra.height = fra.contentDocument.body.offsetHeight;
}
catch (e) {
}
}
$(window).on('load', iframeResposive);
$(window).on('resize', iframeResposive);
var $subMenu = $('#submenu'); var $subMenu = $('#submenu');
var $breadNav = $('#breadNav'); var $breadNav = $('#breadNav');
$subMenu.on('click', 'a', function (event) { $subMenu.on('click', 'a', function (event) {
@ -26,11 +23,4 @@
var $this = $(this); var $this = $(this);
if ($this.attr('href') == window.location.pathname) setActive($this); if ($this.attr('href') == window.location.pathname) setActive($this);
}); });
function setActive(ele) {
ele.addClass('active');
ele.parents("ul").first().find('p').addClass('active');
var breadcrumb = ele.text();
if (breadcrumb === "") $breadNav.hide();
else $breadNav.text(breadcrumb);
}
}); });

View File

@ -8,6 +8,6 @@
@section header { @section header {
@Html.Partial("Header", Model) @Html.Partial("Header", Model)
} }
<div class="content-body"> <div id="content" class="content-body">
<iframe src="@Model.Url"></iframe> <iframe src="@Model.Url"></iframe>
</div> </div>