mirror of
https://github.com/Doodle3D/doodle3d-client.git
synced 2024-11-22 09:17:56 +01:00
clearfix fix for progressguage and thermometer layouting
This commit is contained in:
parent
b2191217cb
commit
524643e28a
@ -454,7 +454,6 @@ PROGRESS GUAGE
|
|||||||
.progressbarCanvasContainerParent {
|
.progressbarCanvasContainerParent {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding-top: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#progressbarCanvasContainer {
|
#progressbarCanvasContainer {
|
||||||
@ -477,6 +476,7 @@ padding: 5px;
|
|||||||
-ms-transition: right 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
|
-ms-transition: right 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
|
||||||
transition: right 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
|
transition: right 0.4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
|
||||||
right: -60%;
|
right: -60%;
|
||||||
|
margin-top: 5%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#progressbarCanvas {
|
#progressbarCanvas {
|
||||||
@ -497,7 +497,7 @@ THERMOMETER
|
|||||||
.thermometerContainerParent {
|
.thermometerContainerParent {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding-top: 5px;
|
padding-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#thermometerContainer {
|
#thermometerContainer {
|
||||||
|
2
css/styles.min.css
vendored
2
css/styles.min.css
vendored
File diff suppressed because one or more lines are too long
19
index.html
19
index.html
@ -40,22 +40,9 @@
|
|||||||
<!-- right panel -->
|
<!-- right panel -->
|
||||||
<div class="rightpanel shadowleft">
|
<div class="rightpanel shadowleft">
|
||||||
<!--<div class='sidebutton shadowleft'></div>-->
|
<!--<div class='sidebutton shadowleft'></div>-->
|
||||||
<!--<div><img class="btnPrint btn" src="img/buttons/btnPrint.png" /></div>-->
|
<img class="btnPrint btn clearfix" src="img/buttons/btnPrint.png" />
|
||||||
<!--<div><img class="btnStop btn disabled" src="img/buttons/btnStop.png" /></div>-->
|
<img class="btnStop btn clearfix disabled" src="img/buttons/btnStop.png" />
|
||||||
<div class="clearfix">
|
|
||||||
<img class="btnPrint btn" src="img/buttons/btnPrint.png" />
|
|
||||||
</div>
|
|
||||||
<div class="clearfix">
|
|
||||||
<img class="btnStop btn disabled" src="img/buttons/btnStop.png" />
|
|
||||||
</div>
|
|
||||||
<!-- not now
|
|
||||||
<div id="printProgressContainer">
|
|
||||||
<label for="progressbarContainer">Progress:</label><span class="progressAmount">0%</span>
|
|
||||||
<div id="progressbarContainer">
|
|
||||||
<div id="progressbar"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
<div class="progressbarCanvasContainerParent clearfix">
|
<div class="progressbarCanvasContainerParent clearfix">
|
||||||
<div id="progressbarCanvasContainer">
|
<div id="progressbarCanvasContainer">
|
||||||
<canvas id="progressbarCanvas" width="93" height="82"></canvas>
|
<canvas id="progressbarCanvas" width="93" height="82"></canvas>
|
||||||
|
@ -72,6 +72,9 @@ $(function() {
|
|||||||
|
|
||||||
$("#debug_display").css("display", "block");
|
$("#debug_display").css("display", "block");
|
||||||
|
|
||||||
|
// show and hide the progressguage and thermometer
|
||||||
|
showhideInterval = setInterval(showOrHideThermo, 2500);
|
||||||
|
|
||||||
// $("#debugContainer").css("display", "block");
|
// $("#debugContainer").css("display", "block");
|
||||||
|
|
||||||
/* TEMP CODE!! -> artificially populates the startgcode and endgcode textareas in the settings window */
|
/* TEMP CODE!! -> artificially populates the startgcode and endgcode textareas in the settings window */
|
||||||
@ -98,7 +101,6 @@ $(function() {
|
|||||||
}, 1000);
|
}, 1000);
|
||||||
//*/
|
//*/
|
||||||
}
|
}
|
||||||
showhideInterval = setInterval(showOrHideThermo, 2500);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
var showhideInterval;
|
var showhideInterval;
|
||||||
|
@ -64,7 +64,6 @@
|
|||||||
.progressbarCanvasContainerParent {
|
.progressbarCanvasContainerParent {
|
||||||
position:relative;
|
position:relative;
|
||||||
width:100%;
|
width:100%;
|
||||||
padding-top: 5px;
|
|
||||||
}
|
}
|
||||||
#progressbarCanvasContainer {
|
#progressbarCanvasContainer {
|
||||||
position: relative;
|
position: relative;
|
||||||
@ -82,6 +81,7 @@
|
|||||||
|
|
||||||
transition: right .40s cubic-bezier(0.68, -0.55, 0.265, 1.55);
|
transition: right .40s cubic-bezier(0.68, -0.55, 0.265, 1.55);
|
||||||
right: -60%;
|
right: -60%;
|
||||||
|
margin-top: 5%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#progressbarCanvas {
|
#progressbarCanvas {
|
||||||
@ -109,7 +109,7 @@
|
|||||||
.thermometerContainerParent {
|
.thermometerContainerParent {
|
||||||
position:relative;
|
position:relative;
|
||||||
width:100%;
|
width:100%;
|
||||||
padding-top: 5px;
|
padding-top: 10px;
|
||||||
}
|
}
|
||||||
#thermometerContainer {
|
#thermometerContainer {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
Loading…
Reference in New Issue
Block a user