merge in master, resolve conflicts

1 files changed, 14 insertions, 14 deletions

diff --git a/lib/forms.less b/lib/forms.less
index ae67acd00..cd5cffc31 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -23,7 +23,7 @@ form {
   }
 
   // Parent element that clears floats and wraps labels and fields together
-  div.clearfix {
+  .clearfix {
     margin-bottom: @baseline;
   }
 
@@ -112,7 +112,7 @@ form {
   }
 
   // Error styles
-  div.error {
+  .error {
     background: lighten(@red, 57%);
     padding: 10px 0;
     margin: -10px 0 10px;
@@ -133,8 +133,8 @@ form {
         .box-shadow(0 0 6px rgba(171,41,32,.5));
       }
     }
-    div.input-prepend,
-    div.input-append {
+    .input-prepend,
+    .input-append {
       span.add-on {
         background: lighten(@red, 50%);
         border-color: @error-text;
@@ -177,14 +177,14 @@ form {
 }
 
 // Actions (the buttons)
-div.actions {
+.actions {
   background: #f5f5f5;
   margin-top: @baseline;
   margin-bottom: @baseline;
   padding: (@baseline - 1) 20px @baseline 150px;
   border-top: 1px solid #ddd;
   .border-radius(0 0 3px 3px);
-  div.secondary-action {
+  .secondary-action {
     float: right;
     a {
       line-height: 30px;
@@ -213,7 +213,7 @@ div.actions {
 }
 
 // Inline Fields (input fields that appear as inline objects
-div.inline-inputs {
+.inline-inputs {
   color: @gray;
   span, input[type=text] {
     display: inline-block;
@@ -230,8 +230,8 @@ div.inline-inputs {
 }
 
 // Allow us to put symbols and text within the input field for a cleaner look
-div.input-prepend,
-div.input-append {
+.input-prepend,
+.input-append {
   input[type=text] {
     .border-radius(0 3px 3px 0);
   }
@@ -257,7 +257,7 @@ div.input-append {
     border-color: @green;
   }
 }
-div.input-append {
+.input-append {
   input[type=text] {
     float: left;
     .border-radius(3px 0 0 3px);
@@ -270,7 +270,7 @@ div.input-append {
 }
 
 // Stacked options for forms (radio buttons or checkboxes)
-ul.inputs-list {
+.inputs-list {
   margin: 0 0 5px;
   width: 100%;
   li {
@@ -326,13 +326,13 @@ form.form-stacked {
     line-height: 20px;
     padding-top: 0;
   }
-  div.clearfix {
+  .clearfix {
     margin-bottom: @baseline / 2;
     div.input {
       margin-left: 0;
     }
   }
-  ul.inputs-list {
+  .inputs-list {
     margin-bottom: 0;
     li {
       padding-top: 0;
@@ -349,7 +349,7 @@ form.form-stacked {
     margin-top: 0;
     margin-left: -10px;
   }
-  div.actions {
+  .actions {
     margin-left: -20px;
     padding-left: 20px;
   }