diff --git a/Bootstrap.Admin/Content/css/admin.css b/Bootstrap.Admin/Content/css/admin.css index 49586078..79ae8c1e 100644 --- a/Bootstrap.Admin/Content/css/admin.css +++ b/Bootstrap.Admin/Content/css/admin.css @@ -123,10 +123,15 @@ } #main-content { + padding: 15px 15px 0 15px; margin-left: 210px; height: auto; } + #main-content > .panel:last-child .panel-body { + padding-bottom: 0; + } + #main-content > .panel > .panel-body > .modal-footer { text-align: left; } diff --git a/Bootstrap.Admin/Content/css/site-responsive.css b/Bootstrap.Admin/Content/css/site-responsive.css index 64abb94a..8803a91a 100644 --- a/Bootstrap.Admin/Content/css/site-responsive.css +++ b/Bootstrap.Admin/Content/css/site-responsive.css @@ -69,19 +69,4 @@ top: 94px; 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; - } } diff --git a/Bootstrap.Admin/Content/css/site.css b/Bootstrap.Admin/Content/css/site.css index 907bbf46..c9640bb3 100644 --- a/Bootstrap.Admin/Content/css/site.css +++ b/Bootstrap.Admin/Content/css/site.css @@ -27,14 +27,6 @@ a, a:hover, a:focus { color: #fff; } -#main-content { - padding: 15px 15px 0 15px; -} - - #main-content > .panel:last-child .panel-body { - padding-bottom: 0; - } - .header, .footer { padding: 0 15px; } @@ -558,7 +550,19 @@ ul.breadcrumb { padding-right: 6px; } -.content-body iframe { - width: 100%; - border: none; + +.content-body { + position: fixed; + left: 0; + bottom: 40px; + right: 0; + top: 94px; + background-image: url('../images/bg.jpg'); + overflow: hidden; } + + .content-body iframe { + width: 100%; + height: 100%; + border: none; + } diff --git a/Bootstrap.Admin/Controllers/HomeController.cs b/Bootstrap.Admin/Controllers/HomeController.cs index 68f96c4f..7e2be9e7 100644 --- a/Bootstrap.Admin/Controllers/HomeController.cs +++ b/Bootstrap.Admin/Controllers/HomeController.cs @@ -19,7 +19,6 @@ namespace Bootstrap.Admin.Controllers public ActionResult Index() { var v = new ContentModel(); - v.Url = "/Content/html/dummy.html"; return View(v); } /// diff --git a/Bootstrap.Admin/Scripts/Content.js b/Bootstrap.Admin/Scripts/Content.js index 6428edd0..04ba0aa3 100644 --- a/Bootstrap.Admin/Scripts/Content.js +++ b/Bootstrap.Admin/Scripts/Content.js @@ -1,16 +1,13 @@ $(function () { - $('#navbar').attr('data-toggle', "dropdown").addClass('dropdown-toggle'); - function iframeResposive() { - try { - var fra = $('iframe').get(0); - fra.height = fra.contentDocument.body.offsetHeight; - } - catch (e) { - } + 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); } - $(window).on('load', iframeResposive); - $(window).on('resize', iframeResposive); - + $('#navbar').attr('data-toggle', "dropdown").addClass('dropdown-toggle'); var $subMenu = $('#submenu'); var $breadNav = $('#breadNav'); $subMenu.on('click', 'a', function (event) { @@ -26,11 +23,4 @@ var $this = $(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); - } }); \ No newline at end of file diff --git a/Bootstrap.Admin/Views/Home/Index.cshtml b/Bootstrap.Admin/Views/Home/Index.cshtml index 4cef9b0e..1763598c 100644 --- a/Bootstrap.Admin/Views/Home/Index.cshtml +++ b/Bootstrap.Admin/Views/Home/Index.cshtml @@ -8,6 +8,6 @@ @section header { @Html.Partial("Header", Model) } -
+
\ No newline at end of file