merge
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body style="min-height: 660px; cursor: auto;" class="edit toolbox-reset">
|
||||
<body style="cursor: auto;" class="edit toolbox-reset">
|
||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
<div class="container-fluid">
|
||||
@@ -72,7 +72,7 @@
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!--/.nav-collapse -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -296,10 +296,10 @@ var stopsave = 0;
|
||||
var startdrag = 0;
|
||||
var demoHtml = $(".demo").html();
|
||||
var currenteditor = null;
|
||||
$(window).resize(function() {
|
||||
$("body").css("min-height", $(window).height() - 90);
|
||||
$(".demo").css("min-height", $(window).height() - 160)
|
||||
});
|
||||
// $(window).resize(function() {
|
||||
// $("body").css("min-height", $(window).height() - 90);
|
||||
// $(".demo").css("min-height", $(window).height() - 160)
|
||||
// });
|
||||
|
||||
function restoreData(){
|
||||
if (supportstorage()) {
|
||||
@@ -334,8 +334,8 @@ $(document).ready(function() {
|
||||
contentsCss: ['css/bootstrap-combined.min.css'],
|
||||
allowedContent: true
|
||||
});
|
||||
$("body").css("min-height", $(window).height() - 50);
|
||||
$(".demo").css("min-height", $(window).height() - 130);
|
||||
// $("body").css("min-height", $(window).height() - 50);
|
||||
// $(".demo").css("min-height", $(window).height() - 130);
|
||||
$(".sidebar-nav .lyrow").draggable({
|
||||
connectToSortable: ".demo",
|
||||
helper: "clone",
|
||||
@@ -499,4 +499,3 @@ function saveHtml()
|
||||
saveAs(blob, "webpage.html");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user