Skip to content

Commit

Permalink
Fix time css #98
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuNls committed Jan 8, 2016
1 parent 978dc55 commit e01b354
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 32 deletions.
3 changes: 3 additions & 0 deletions application/views/measure/dashboard/steps.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<div class="row">
<div class="col-md-12"><center><h1>My measures</h1></center></div>
</div>
<br><br>
<div class="row">
<div class="col-md-12"><div class="line black"></div></div>
</div>
<br>
<div class="row step-measure">
<div class="col-sm-3"><center><img src="/assets/img/step1.jpg" alt="Step 1" width="100"><br> <b>Step 1</b><br>Add a watch to the list</center></div>
<div class="col-sm-1"><span class="fa fa-arrow-right"></span></div>
<div class="col-sm-4"><center><img src="/assets/img/step2.jpg" alt="Step 2" width="100"><br><b>Step 2</b><br>Synchronize with our accuracy system (first measure)</center></div>
<div class="col-sm-1"><span class="fa fa-arrow-right"></span></div>
<div class="col-sm-3"><center><img src="/assets/img/step3.jpg" alt="Step 2" width="100"><br><b>Step 3</b><br>Get your accuracy (second measure)</center></div>
</div>
<br><br>
<div class="row show-steps">
<div class="col-md-12"><a class="btn btn-default" href="#" data-trigger="slideDown" data-target=".step-measure">Show steps</a></div>
</div>
47 changes: 15 additions & 32 deletions application/views/time.php
Original file line number Diff line number Diff line change
@@ -1,44 +1,27 @@
<div style="margin-top:30px;" class="row">
<div style="margin-top:40px;" class="row">
<div class="col-md-12"><div class="line black"></div></div>
</div>
<div class="row">
<div id="clockdiv" class="row">

<div id="demo" class="col-sm-12">

<div class="col-sm-3" >
<canvas id="canvas_animated_watch" width="250" height="250"></canvas>
<img style="display:none" id="watch" src="<?php echo img_url('flatwatch-blank.png');?>">
</div>

<div id="clockdiv" class="col-sm-offset-1 col-sm-8">
<div class="row">

<div class="col-sm-12">
<div class="col-sm-4">
<br>
<span class="days"></span>
<span class="months"></span>,
<span class="months"></span><br />
<span class="years"></span>
</div>

</div>

<div class="row">
<div class="col-sm-4" >
<canvas id="canvas_animated_watch" width="250" height="250"></canvas>
<img style="display:none" id="watch" src="<?php echo img_url('flatwatch-blank.png');?>">
</div>

<div class="col-sm-offset-1 col-sm-7">

<div class="col-sm-4">
<br>
<span class="hours"></span>
:<span class="minutes"></span>
:<span class="seconds"></span>

: <span class="minutes"></span>
: <span class="seconds"></span>
<br />
<img style="margin-top:-5px" id="moonPhaseImage" src="<?php echo base_url();?>/assets/img/moon/" border="0" width="60px" height="100%" title="">
</div>

<div class="col-sm-3">
<img style="margin-top:-5px" id="moonPhaseImage" src="<?php echo base_url();?>/assets/img/moon/" border="0" width="100%" height="100%" title="">
</div>

</div>

</div>

</div>

</div>
5 changes: 5 additions & 0 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,7 @@ footer .links{
}

#clockdiv{
width: 100%;
margin-top: 30px;
color: #4d77a7;
display: inline-block;
Expand All @@ -952,6 +953,10 @@ footer .links{
display: inline-block;
}

#clockdiv span{
margin-top: 30px;
}

.smalltext{
padding-top: 5px;
font-size: 16px;
Expand Down

0 comments on commit e01b354

Please sign in to comment.