Merge branch 'release/0.3.14' into develop

Author: dalelotts

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker version: 0.3.13
+# Angular bootstrap date & time picker version: 0.3.14
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "This directive allows you to add a datetime-picker to your form.",
   "author": "https://github.com/dalelotts/angular-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "This directive allows you to add a datetime-picker to your form elements.",
   "author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
   "bugs": {

src/css/datetimepicker.css

@@ -1,5 +1,5 @@
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.13
+ * @license angular-bootstrap-datetimepicker  version: 0.3.14
  * Copyright 2013-2015 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
@@ -41,53 +41,36 @@
 .datetimepicker .table td,
 .datetimepicker .table th {
     text-align: center;
-    width: 14.6%;
     height: 20px;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     border: none;
 }
 
-.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td,
-.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td,
-.datetimepicker .table-striped > tbody > tr:nth-child(odd) > td,
-.datetimepicker .table-striped > tbody > tr:nth-child(odd) > th,
-.datetimepicker .table-striped > tbody > tr:nth-child(odd) {
-    background-color: transparent;
-}
-
-.datetimepicker table tr .minute:hover {
-    background: #eeeeee;
-    cursor: pointer;
-}
-
-.datetimepicker table tr .hour:hover {
-    background: #eeeeee;
-    cursor: pointer;
-}
-
-.datetimepicker table tr .day:hover {
+.datetimepicker .minute:hover,
+.datetimepicker .hour:hover,
+.datetimepicker .day:hover {
     background: #eeeeee;
     cursor: pointer;
 }
 
-.datetimepicker table tr td.past,
-.datetimepicker table tr td.future {
+.datetimepicker .past,
+.datetimepicker .future {
     color: #999999;
 }
 
-.datetimepicker table tr td.disabled,
-.datetimepicker table tr td.disabled:hover {
+.datetimepicker td.disabled,
+.datetimepicker td.disabled:hover {
     background: none;
     color: #999999;
     cursor: default;
 }
 
-.datetimepicker table tr td.active,
-.datetimepicker table tr td.active:hover,
-.datetimepicker table tr td.active.disabled,
-.datetimepicker table tr td.active.disabled:hover {
+.datetimepicker td.active,
+.datetimepicker td.active:hover,
+.datetimepicker td.active.disabled,
+.datetimepicker td.active.disabled:hover {
     background-color: #006dcc;
     background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
     background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
@@ -103,30 +86,30 @@
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 
-.datetimepicker table tr td.active:hover,
-.datetimepicker table tr td.active:hover:hover,
-.datetimepicker table tr td.active.disabled:hover,
-.datetimepicker table tr td.active.disabled:hover:hover,
-.datetimepicker table tr td.active:active,
-.datetimepicker table tr td.active:hover:active,
-.datetimepicker table tr td.active.disabled:active,
-.datetimepicker table tr td.active.disabled:hover:active,
-.datetimepicker table tr td.active.active,
-.datetimepicker table tr td.active:hover.active,
-.datetimepicker table tr td.active.disabled.active,
-.datetimepicker table tr td.active.disabled:hover.active,
-.datetimepicker table tr td.active.disabled,
-.datetimepicker table tr td.active:hover.disabled,
-.datetimepicker table tr td.active.disabled.disabled,
-.datetimepicker table tr td.active.disabled:hover.disabled,
-.datetimepicker table tr td.active[disabled],
-.datetimepicker table tr td.active:hover[disabled],
-.datetimepicker table tr td.active.disabled[disabled],
-.datetimepicker table tr td.active.disabled:hover[disabled] {
+.datetimepicker td.active:hover,
+.datetimepicker td.active:hover:hover,
+.datetimepicker td.active.disabled:hover,
+.datetimepicker td.active.disabled:hover:hover,
+.datetimepicker td.active:active,
+.datetimepicker td.active:hover:active,
+.datetimepicker td.active.disabled:active,
+.datetimepicker td.active.disabled:hover:active,
+.datetimepicker td.active.active,
+.datetimepicker td.active:hover.active,
+.datetimepicker td.active.disabled.active,
+.datetimepicker td.active.disabled:hover.active,
+.datetimepicker td.active.disabled,
+.datetimepicker td.active:hover.disabled,
+.datetimepicker td.active.disabled.disabled,
+.datetimepicker td.active.disabled:hover.disabled,
+.datetimepicker td.active[disabled],
+.datetimepicker td.active:hover[disabled],
+.datetimepicker td.active.disabled[disabled],
+.datetimepicker td.active.disabled:hover[disabled] {
     background-color: #0044cc;
 }
 
-.datetimepicker table tr td span {
+.datetimepicker span {
     display: block;
     width: 23%;
     height: 54px;
@@ -139,21 +122,21 @@
     border-radius: 4px;
 }
 
-.datetimepicker table tr td span:hover {
+.datetimepicker span:hover {
     background: #eeeeee;
 }
 
-.datetimepicker table tr td span.disabled,
-.datetimepicker table tr td span.disabled:hover {
+.datetimepicker span.disabled,
+.datetimepicker span.disabled:hover {
     background: none;
     color: #999999;
     cursor: default;
 }
 
-.datetimepicker table tr td span.active,
-.datetimepicker table tr td span.active:hover,
-.datetimepicker table tr td span.active.disabled,
-.datetimepicker table tr td span.active.disabled:hover {
+.datetimepicker span.active,
+.datetimepicker span.active:hover,
+.datetimepicker span.active.disabled,
+.datetimepicker span.active.disabled:hover {
     background-color: #006dcc;
     background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
     background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
@@ -169,31 +152,31 @@
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 
-.datetimepicker table tr td span.active:hover,
-.datetimepicker table tr td span.active:hover:hover,
-.datetimepicker table tr td span.active.disabled:hover,
-.datetimepicker table tr td span.active.disabled:hover:hover,
-.datetimepicker table tr td span.active:active,
-.datetimepicker table tr td span.active:hover:active,
-.datetimepicker table tr td span.active.disabled:active,
-.datetimepicker table tr td span.active.disabled:hover:active,
-.datetimepicker table tr td span.active.active,
-.datetimepicker table tr td span.active:hover.active,
-.datetimepicker table tr td span.active.disabled.active,
-.datetimepicker table tr td span.active.disabled:hover.active,
-.datetimepicker table tr td span.active.disabled,
-.datetimepicker table tr td span.active:hover.disabled,
-.datetimepicker table tr td span.active.disabled.disabled,
-.datetimepicker table tr td span.active.disabled:hover.disabled,
-.datetimepicker table tr td span.active[disabled],
-.datetimepicker table tr td span.active:hover[disabled],
-.datetimepicker table tr td span.active.disabled[disabled],
-.datetimepicker table tr td span.active.disabled:hover[disabled] {
+.datetimepicker span.active:hover,
+.datetimepicker span.active:hover:hover,
+.datetimepicker span.active.disabled:hover,
+.datetimepicker span.active.disabled:hover:hover,
+.datetimepicker span.active:active,
+.datetimepicker span.active:hover:active,
+.datetimepicker span.active.disabled:active,
+.datetimepicker span.active.disabled:hover:active,
+.datetimepicker span.active.active,
+.datetimepicker span.active:hover.active,
+.datetimepicker span.active.disabled.active,
+.datetimepicker span.active.disabled:hover.active,
+.datetimepicker span.active.disabled,
+.datetimepicker span.active:hover.disabled,
+.datetimepicker span.active.disabled.disabled,
+.datetimepicker span.active.disabled:hover.disabled,
+.datetimepicker span.active[disabled],
+.datetimepicker span.active:hover[disabled],
+.datetimepicker span.active.disabled[disabled],
+.datetimepicker span.active.disabled:hover[disabled] {
     background-color: #0044cc;
 }
 
-.datetimepicker table tr td span.past,
-.datetimepicker table tr td span.future {
+.datetimepicker span.past,
+.datetimepicker span.future {
     color: #999999;
 }
 

src/js/datetimepicker.js

@@ -106,7 +106,7 @@
         restrict: 'E',
         require: 'ngModel',
         template: '<div class="datetimepicker table-responsive">' +
-        '<table class="table table-striped  {{ data.currentView }}-view">' +
+        '<table class="table table-condensed  {{ data.currentView }}-view">' +
         '   <thead>' +
         '       <tr>' +
         '           <th class="left" data-ng-click="changeView(data.currentView, data.leftDate, $event)" data-ng-show="data.leftDate.selectable"><i class="glyphicon glyphicon-arrow-left"/></th>' +