Merge pull request #1 from weareoutman/gh-pages

Updates

.travis.yml

@@ -2,4 +2,7 @@ language: node_js
 node_js:
   - "0.10"
 before_script:
-  - npm install -g gulp
+  - npm install -g gulp
+branches:
+  only:
+    - gh-pages

README.md

@@ -1,10 +1,10 @@
-# ClockPicker [![Build Status](https://travis-ci.org/weareoutman/clockpicker.svg)](https://travis-ci.org/weareoutman/clockpicker)  [![devDependency Status](https://david-dm.org/weareoutman/clockpicker.svg)](https://david-dm.org/weareoutman/clockpicker#info=devDependencies)
+# ClockPicker [![Bower version](https://badge.fury.io/bo/clockpicker.svg)](http://badge.fury.io/bo/clockpicker) [![Build Status](https://travis-ci.org/weareoutman/clockpicker.svg)](https://travis-ci.org/weareoutman/clockpicker)  [![devDependency Status](https://david-dm.org/weareoutman/clockpicker/dev-status.svg)](https://david-dm.org/weareoutman/clockpicker#info=devDependencies)
 
 A clock-style timepicker for Bootstrap (or jQuery).
 [Documentation and examples](http://weareoutman.github.io/clockpicker/).
 
 ![Screenshot](http://weareoutman.github.io/clockpicker/assets/images/screenshot-1.png)
-
+![clockpicker-12-hour-screenshot](https://cloud.githubusercontent.com/assets/5218249/3613434/03da9888-0db8-11e4-8bdb-dbabb5e91e5c.png)
 ## Browser support
 
 All major browsers are supported, including IE 9+. It should look and behave well enough in IE 8.
@@ -74,8 +74,18 @@ if (something) {
 | align | 'left' | popover arrow align |
 | donetext | '完成' | done button text |
 | autoclose | false | auto close when minute is selected |
+| twelvehour | false | enables twelve hour mode with AM & PM buttons |
 | vibrate | true | vibrate the device when dragging clock hand |
 | fromnow | 0 | set default time to * milliseconds from now (using with default = 'now') |
+| init | | callback function triggered after the colorpicker has been initiated |
+| beforeShow | | callback function triggered before popup is shown |
+| afterShow | | callback function triggered after popup is shown |
+| beforeHide | | callback function triggered before popup is hidden Note:will be triggered between a beforeDone and afterDone |
+| afterHide | | callback function triggered after popup is hidden Note:will be triggered between a beforeDone and afterDone |
+| beforeHourSelect | | callback function triggered before user makes an hour selection |
+| afterHourSelect | | callback function triggered after user makes an hour selection |
+| beforeDone | | callback function triggered before time is written to input |
+| afterDone | | callback function triggered after time is written to input |
 
 ## Operations
 
@@ -125,6 +135,10 @@ gulp
 
 ## Change log
 
+0.0.7
+
+* Enables twelve hour mode with AM & PM buttons.
+
 0.0.6
 
 * Default time can be setted to `now`.

bower.json

@@ -1,22 +1,26 @@
 {
   "name": "clockpicker",
   "description": "A clock-style timepicker for Bootstrap (or jQuery)",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": [
-	  "dist/jquery-clockpicker.js",
-	  "dist/jquery-clockpicker.css"],
+    "dist/jquery-clockpicker.js",
+    "dist/jquery-clockpicker.css"
+  ],
   "license": "MIT",
   "ignore": [
-  	"*",
-  	"!dist/*"
+    "*",
+    "!dist/*",
+    "!bower.json",
+    "!LICENSE",
+    "!README.md"
   ],
   "keywords": ["timepicker", "jquery"],
   "authors": [
-	  {
-	    "name": "Wang Shenwei",
-	    "email": "[email protected]",
-	    "homepage": "http://wangshenwei.com/"
-	  }
+    {
+      "name": "Wang Shenwei",
+      "email": "[email protected]",
+      "homepage": "http://wangshenwei.com/"
+    }
   ],
   "homepage": "http://weareoutman.github.io/clockpicker/",
   "repository": {

dist/bootstrap-clockpicker.css

@@ -1,7 +1,7 @@
 /*!
- * ClockPicker v0.0.6 for Bootstrap (http://weareoutman.github.io/clockpicker/)
+ * ClockPicker v0.0.7 for Bootstrap (http://weareoutman.github.io/clockpicker/)
  * Copyright 2014 Wang Shenwei.
- * Licensed under MIT (https://github.com/weareoutman/clockpicker/blob/master/LICENSE)
+ * Licensed under MIT (https://github.com/weareoutman/clockpicker/blob/gh-pages/LICENSE)
  */
 
 .clockpicker .input-group-addon {
@@ -152,4 +152,17 @@
 	stroke-width: 1;
 	stroke-linecap: round;
 	/*shape-rendering: crispEdges;*/
-}
+}
+.clockpicker-button.am-button {
+	margin: 1px;
+	padding: 5px;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 4px;
+
+}
+.clockpicker-button.pm-button {
+	margin: 1px 1px 1px 136px;
+	padding: 5px;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 4px;
+}