mirror
/
kilnController
kopia lustrzana https://github.com/botheredbybees/kilnController
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Moved bspatch into bootstrap-modal

MAX31855-EH
chrono 2013-12-10 23:26:47 +01:00
rodzic 1dbe03c0a1
commit 2591bea3ba
4 zmienionych plików z 33 dodań i 39 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
public/assets/css/bootstrap-modal-bs3patch.css
Wyświetl plik

@ -1,29 +0,0 @@
/*!
* Bootstrap Modal
*
* Copyright Jordan Schroter
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Boostrap 3 patch for for bootstrap-modal. Include BEFORE bootstrap-modal.css!
*/
body.modal-open,
.modal-open .navbar-fixed-top,
.modal-open .navbar-fixed-bottom {
margin-right: 0;
}
.modal {
left: 50%;
bottom: auto;
right: auto;
padding: 0;
width: 500px;
margin-left: -250px;
background-clip: padding-box;
}
.modal.container {
max-width: none;
}

31
public/assets/css/bootstrap-modal.css
Wyświetl plik

@ -1,3 +1,34 @@
/*!
* Bootstrap Modal
*
* Copyright Jordan Schroter
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Boostrap 3 patch for for bootstrap-modal. Include BEFORE bootstrap-modal.css!
*/
body.modal-open,
.modal-open .navbar-fixed-top,
.modal-open .navbar-fixed-bottom {
margin-right: 0;
}
.modal {
left: 50%;
bottom: auto;
right: auto;
padding: 0;
width: 500px;
margin-left: -250px;
background-clip: padding-box;
}
.modal.container {
max-width: none;
}
/*!
* Bootstrap Modal
*

8
public/assets/js/jquery.flot.draggable.js
Wyświetl plik

@ -78,7 +78,7 @@
}
var is_last = series[sidx].data.length == didx+1;
// funny hack to make drag resizing usable
if (newx > ax.max)
{
@ -86,14 +86,8 @@
}
else if (newx < (ax.max*0.5) && newx >= ax.datamax && is_last)
{
console.log(ax);
ax.options.max = newx*2;
//ax.options.max = ;
console.log(ax);
//plot.setRange(ax);
plot.setupGrid();
//ax.max = ax.max*2;
//ax2.max = ax2.max*0.9;
}
plot.draw();

4
public/index.html
Wyświetl plik

@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>PicoReflow</title>
<title>picoReflow</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="assets/js/jquery-1.10.2.min.js"></script>
@ -17,7 +17,6 @@
<link rel="stylesheet" href="assets/css/bootstrap.min.css"/>
<link rel="stylesheet" href="assets/css/bootstrap-theme.min.css"/>
<link rel="stylesheet" href="assets/css/bootstrap-modal-bs3patch.css"/>
<link rel="stylesheet" href="assets/css/bootstrap-modal.css"/>
<link rel="stylesheet" href="assets/css/select2.css"/>
<link rel="stylesheet" href="assets/css/picoreflow.css"/>
@ -155,6 +154,5 @@
</div>
</div>
</body>
</html>