Merge branch 'development'

Conflicts: bower.json build/css/bootstrap-datetimepicker.min.css build/js/bootstrap-datetimepicker.min.js composer.json package.json src/js/bootstrap-datetimepicker.js
nkovacs · Jun 11, 2015 · 0d65da3 · 0d65da3
2 parents a549aa8 + b0ecffd
commit 0d65da3
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 30 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
-  "name": "eonasdan-bootstrap-datetimepicker",
-  "version": "4.14.30",
+  "name": "nkovacs-bootstrap-datetimepicker",
+  "version": "5.0.0",
   "main": [
     "build/css/bootstrap-datetimepicker.min.css",
     "build/js/bootstrap-datetimepicker.min.js"
@@ -9,7 +9,7 @@
     "jquery": ">=1.8.3",
     "moment": ">=2.9.0"
   },
-  "homepage": "https://github.com/Eonasdan/bootstrap-datetimepicker",
+  "homepage": "https://github.com/nkovacs/bootstrap-datetimepicker",
   "authors": [
     "Eonasdan"
   ],

diff --git a/build/css/bootstrap-datetimepicker.css b/build/css/bootstrap-datetimepicker.css
@@ -299,7 +299,8 @@
 .bootstrap-datetimepicker-widget table td.today:before {
   content: '';
   display: inline-block;
-  border: 0 0 7px 7px solid transparent;
+  border: solid transparent;
+  border-width: 0 0 7px 7px;
   border-bottom-color: #337ab7;
   border-top-color: rgba(0, 0, 0, 0.2);
   position: absolute;

diff --git a/build/css/bootstrap-datetimepicker.min.css b/build/css/bootstrap-datetimepicker.min.css
diff --git a/build/js/bootstrap-datetimepicker.min.js b/build/js/bootstrap-datetimepicker.min.js
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
-  "name": "eonasdan/bootstrap-datetimepicker",
+  "name": "nkovacs/bootstrap-datetimepicker",
   "type": "component",
-  "version": "4.14.30",
+  "version": "5.0.0",
   "description": "Date/time picker widget based on twitter bootstrap",
   "keywords": [
     "bootstrap",

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
         "name": "Jonathan Peterson"
     },
     "bugs": {
-        "url": "https://github.com/eonasdan/bootstrap-datetimepicker/issues"
+        "url": "https://github.com/nkovacs/bootstrap-datetimepicker/issues"
     },
     "dependencies": {
         "moment": "~2.8.2",
@@ -36,7 +36,7 @@
     "name": "bootstrap-datetimepicker",
     "repository": {
         "type": "git",
-        "url": "https://github.com/eonasdan/bootstrap-datetimepicker.git"
+        "url": "https://github.com/nkovacs/bootstrap-datetimepicker.git"
     },
-    "version": "4.14.30"
+    "version": "5.0.0"
 }