Skip to content

Commit 59ffbc9

Browse files
committed
Merge remote branch 'upstream/master'
Conflicts: jquery-ui-timepicker-addon.js
2 parents d80f9c7 + 4496926 commit 59ffbc9

18 files changed

+670
-116
lines changed

README

Whitespace-only changes.

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
jQuery Timepicker Addon
2+
=======================
3+
4+
Use
5+
---
6+
- To use this plugin you must include jQuery and jQuery UI with datepicker and slider
7+
- Include timepicker-addon script
8+
- now use timepicker with $('#selector').datetimepicker() or $('#selector').timepicker()
9+
10+
Contributing Code - Please Read!
11+
--------------------------------
12+
All code contributions and bug reports are much appreciated. Please be sure to apply your fixes to the "dev" branch.

jquery-ui-timepicker-addon.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
2+
.ui-timepicker-div dl { text-align: left; }
3+
.ui-timepicker-div dl dt { height: 25px; }
4+
.ui-timepicker-div dl dd { margin: -25px 10px 10px 65px; }
5+
.ui-timepicker-div td { font-size: 90%; }
6+
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }

0 commit comments

Comments
 (0)