Merge branch 'dev-v7' into dev-v7-U4-10130

src/Umbraco.Web.UI.Client/src/less/buttons.less

@@ -20,7 +20,7 @@
   color: @black;
   border: none;
   box-shadow: none;
-  .border-radius(@borderRadiusSmall);
+  border-radius: 3px;
 
     // Hover/focus state
     &:hover,

src/Umbraco.Web.UI.Client/src/less/forms.less

@@ -81,6 +81,8 @@ label.control-label, .control-label {
   font-size: @fontSizeLarge;
   font-weight: 400;
   border: 1px solid @gray-8;
+  padding: 4px 0px 4px 16px;
+  padding-left: 25px !Important;
   line-height: 22px;
   background: @white
 }
@@ -193,7 +195,7 @@ input[type="tel"],
 input[type="color"],
 .uneditable-input {
   display: inline-block;
-  height: @inputHeight;
+  height: @inputHeight;
   padding: 4px 6px;
   margin-bottom: @baseLineHeight / 2;
   font-size: @baseFontSize;
@@ -580,9 +582,9 @@ input[type="checkbox"][readonly] {
   .add-on {
     display: inline-block;
     width: auto;
-    height: 22px;
-    min-width: 18px;
-    padding: 4px 6px;
+    height: 22px;
+    min-width: 18px;
+    padding: 4px 6px;
     font-size: @baseFontSize;
     font-weight: normal;
     line-height: @baseLineHeight;
@@ -657,20 +659,19 @@ input.search-query {
 }
 
 /* Allow for input prepend/append in search forms */
-.form-search {
-    .input-prepend {
-        .btn {
-            .border-radius(0 @borderRadiusSmall @borderRadiusSmall 0);
-        }
-    }
-    .input-append {
-        .btn {
-            .border-radius(0 @borderRadiusSmall @borderRadiusSmall 0);
-        }
-    } 
+.form-search {
+    .input-prepend {
+        .btn {
+            .border-radius(0 @borderRadiusSmall @borderRadiusSmall 0);
+        }
+    }
+    .input-append {
+        .btn {
+            .border-radius(0 @borderRadiusSmall @borderRadiusSmall 0);
+        }
+    } 
 }
 
-
 // HORIZONTAL & VERTICAL FORMS
 // ---------------------------
 

src/Umbraco.Web.UI.Client/src/less/main.less

@@ -47,10 +47,25 @@ h5.-black {
     background: none;
     border: none
 }
-.datepicker td.active,
-.datepicker td span.active {
-    background: @turquoise !important;
+.bootstrap-datetimepicker-widget {
+    td {
+        &.active, span.active {
+            background: @turquoise !important;
+        }
+        &.today:not(.active):before {
+            border-bottom-color: @purple-l1 !important;
+        }
+        a[data-action] {
+            padding: 0 !important;
+        }
+        .timepicker-hour,
+        .timepicker-minute,
+        .timepicker-second {
+            margin: 8px 0;
+        }
+    }
 }
+
 .umb-datetime-picker div.info {
     vertical-align: middle
 }