easylinux/BootstrapPageGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jesus Herman
2015-12-04 15:04:17 +01:00
parent ce1b0fa8ac 848164d708
commit dda648b43d
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@@ -43,7 +43,7 @@
</style> </style>
</head> </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 navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container-fluid"> <div class="container-fluid">
@@ -72,7 +72,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<!--/.nav-collapse -->
</div> </div>
</div> </div>
</div> </div>

13
js/scripts.js
View File

@@ -296,10 +296,10 @@ var stopsave = 0;
var startdrag = 0; var startdrag = 0;
var demoHtml = $(".demo").html(); var demoHtml = $(".demo").html();
var currenteditor = null; var currenteditor = null;
$(window).resize(function() { // $(window).resize(function() {
$("body").css("min-height", $(window).height() - 90); // $("body").css("min-height", $(window).height() - 90);
$(".demo").css("min-height", $(window).height() - 160) // $(".demo").css("min-height", $(window).height() - 160)
}); // });
function restoreData(){ function restoreData(){
if (supportstorage()) { if (supportstorage()) {
@@ -334,8 +334,8 @@ $(document).ready(function() {
contentsCss: ['css/bootstrap-combined.min.css'], contentsCss: ['css/bootstrap-combined.min.css'],
allowedContent: true allowedContent: true
}); });
$("body").css("min-height", $(window).height() - 50); // $("body").css("min-height", $(window).height() - 50);
$(".demo").css("min-height", $(window).height() - 130); // $(".demo").css("min-height", $(window).height() - 130);
$(".sidebar-nav .lyrow").draggable({ $(".sidebar-nav .lyrow").draggable({
connectToSortable: ".demo", connectToSortable: ".demo",
helper: "clone", helper: "clone",
@@ -499,4 +499,3 @@ function saveHtml()
saveAs(blob, "webpage.html"); saveAs(blob, "webpage.html");
} }
} }