Merge pull request #489 from Eonasdan/development

v3.1.0

CONTRIBUTING.md

@@ -20,7 +20,7 @@ grunt                 # this runs tests and jshint
 Very important notes
 ====================
 
- * **Pull pull requests to the `master` branch will be closed.** Please submit all pull requests to the `development` branch.
+ * **Pull requests to the `master` branch will be closed.** Please submit all pull requests to the `development` branch.
  * **Do not include the minified files in your pull request.** Don't worry, we'll build them when we cut a release.
 
 Grunt tasks

Gruntfile.js

@@ -108,4 +108,48 @@ module.exports = function (grunt) {
     grunt.registerTask('build', [
         'jshint', 'jscs', 'uglify', 'less'
     ]);
+
+    grunt.registerTask('nuget', 'Create a nuget package', function () {
+        var target = grunt.option('target') || 'less', done = this.async();
+        if (target === 'less') {
+            grunt.util.spawn({
+                cmd: 'src/nuget/nuget.exe',
+                args: [
+                    'pack',
+                    'src/nuget/Bootstrap.v3.Datetimepicker.nuspec',
+                    '-OutputDirectory',
+                    'build/nuget',
+                    '-Version',
+                    grunt.config.get('pkg').version
+                ]
+            }, function (error, result) {
+                if (error) {
+                    grunt.log.error(error);
+                } else {
+                    grunt.log.write(result);
+                }
+                done();
+            });
+        }
+        else {
+            grunt.util.spawn({
+                cmd: 'src/nuget/nuget.exe',
+                args: [
+                    'pack',
+                    'src/nuget/Bootstrap.v3.Datetimepicker.CSS.nuspec',
+                    '-OutputDirectory',
+                    'build/nuget',
+                    '-Version',
+                    grunt.config.get('pkg').version
+                ]
+            }, function (error, result) {
+                if (error) {
+                    grunt.log.error(error);
+                } else {
+                    grunt.log.write(result);
+                }
+                done();
+            });
+        }
+    });
 };

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "eonasdan-bootstrap-datetimepicker",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "main": [
     "build/css/bootstrap-datetimepicker.min.css",
     "build/js/bootstrap-datetimepicker.min.js"

build/css/bootstrap-datetimepicker.css

@@ -1,6 +1,6 @@
 /*!
  * Datetimepicker for Bootstrap v3
-//! version : 3.0.3
+//! version : 3.1.0
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 .bootstrap-datetimepicker-widget {
@@ -111,6 +111,12 @@
   line-height: 54px;
   width: 54px;
 }
+.bootstrap-datetimepicker-widget td.cw {
+  font-size: 10px;
+  height: 20px;
+  line-height: 20px;
+  color: #777777;
+}
 .bootstrap-datetimepicker-widget td.day {
   height: 20px;
   line-height: 20px;

component.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-datetimepicker",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "main": ["build/css/bootstrap-datetimepicker.min.css","build/js/bootstrap-datetimepicker.min.js"],
   "dependencies": {
     "jquery" : ">=1.8.3",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "eonasdan/bootstrap-datetimepicker",
   "type": "component",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Date/time picker widget based on twitter bootstrap",
   "keywords": [
     "bootstrap",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap-datetimepicker",
   "filename": "js/bootstrap-datetimepicker.min.js",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/eonasdan/bootstrap-datetimepicker.git"