Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dangrossman/bootstrap-daterangepi…
Browse files Browse the repository at this point in the history
…cker
  • Loading branch information
dangrossman committed Aug 10, 2015
2 parents a8d42cd + da14775 commit 67c80ed
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/momentjs/2.9.0/moment.min.js"></script>
<script src="moment.min.js"></script>

<script src="https://cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/bootstrap.daterangepicker/2/daterangepicker.css" />
<script src="daterangepicker.js"></script>
<link rel="stylesheet" type="text/css" href="daterangepicker.css" />

<script src="website.js"></script>
<link rel="stylesheet" type="text/css" href="website.css" />
Expand Down Expand Up @@ -400,17 +400,17 @@ <h2>Configuration Generator</h2>
</label>
</div>

<div class="form-group">
<label for="timePickerIncrement">timePickerIncrement (in minutes)</label>
<input type="text" class="form-control" id="timePickerIncrement" value="1">
</div>

<div class="checkbox">
<label>
<input type="checkbox" id="timePicker24Hour"> timePicker24Hour
</label>
</div>

<div class="form-group">
<label for="timePickerIncrement">timePickerIncrement (in minutes)</label>
<input type="text" class="form-control" id="timePickerIncrement" value="1">
</div>

<div class="checkbox">
<label>
<input type="checkbox" id="timePickerSeconds"> timePickerSeconds
Expand Down Expand Up @@ -730,4 +730,4 @@ <h2>Comments</h2>
</div>

</body>
</html>
</html>

0 comments on commit 67c80ed

Please sign in to comment.