Fixed input prepend and append

[bootswatch] / flatly / bootstrap.css

diff --git a/flatly/bootstrap.css b/flatly/bootstrap.css
index 6ff225d..cf5de22 100644 (file)
--- a/flatly/bootstrap.css
+++ b/flatly/bootstrap.css
@@ -36,7 +36,7 @@
 .input-block-level {
   display: block;
   width: 100%;
-  min-height: 31px;
+  min-height: 30px;
   -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
           box-sizing: border-box;
@@ -227,7 +227,7 @@ body {
   margin: 0;
   font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 15px;
-  line-height: 21px;
+  line-height: 20px;
   color: #2c3e50;
   background-color: #ffffff;
 }
@@ -410,7 +410,7 @@ a:focus {
   display: block;
   float: left;
   width: 100%;
-  min-height: 31px;
+  min-height: 30px;
   margin-left: 2.127659574468085%;
   *margin-left: 2.074468085106383%;
   -webkit-box-sizing: border-box;
@@ -651,14 +651,14 @@ a:focus {
 }
 
 p {
-  margin: 0 0 10.5px;
+  margin: 0 0 10px;
 }
 
 .lead {
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   font-size: 22.5px;
   font-weight: 200;
-  line-height: 31.5px;
+  line-height: 30px;
 }
 
 small {
@@ -740,10 +740,10 @@ h3,
 h4,
 h5,
 h6 {
-  margin: 10.5px 0;
+  margin: 10px 0;
   font-family: inherit;
   font-weight: bold;
-  line-height: 21px;
+  line-height: 20px;
   color: inherit;
   text-rendering: optimizelegibility;
 }
@@ -762,7 +762,7 @@ h6 small {
 h1,
 h2,
 h3 {
-  line-height: 42px;
+  line-height: 40px;
 }
 
 h1 {
@@ -806,15 +806,15 @@ h4 small {
 }
 
 .page-header {
-  padding-bottom: 9.5px;
-  margin: 21px 0 31.5px;
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
   border-bottom: 1px solid #ecf0f1;
 }
 
 ul,
 ol {
   padding: 0;
-  margin: 0 0 10.5px 25px;
+  margin: 0 0 10px 25px;
 }
 
 ul ul,
@@ -825,7 +825,7 @@ ol ul {
 }
 
 li {
-  line-height: 21px;
+  line-height: 20px;
 }
 
 ul.unstyled,
@@ -850,12 +850,12 @@ ol.inline > li {
 }
 
 dl {
-  margin-bottom: 21px;
+  margin-bottom: 20px;
 }
 
 dt,
 dd {
-  line-height: 21px;
+  line-height: 20px;
 }
 
 dt {
@@ -863,7 +863,7 @@ dt {
 }
 
 dd {
-  margin-left: 10.5px;
+  margin-left: 10px;
 }
 
 .dl-horizontal {
@@ -896,7 +896,7 @@ dd {
 }
 
 hr {
-  margin: 21px 0;
+  margin: 20px 0;
   border: 0;
   border-top: 1px solid #ecf0f1;
   border-bottom: 1px solid #ffffff;
@@ -915,7 +915,7 @@ abbr.initialism {
 
 blockquote {
   padding: 0 0 0 15px;
-  margin: 0 0 21px;
+  margin: 0 0 20px;
   border-left: 5px solid #ecf0f1;
 }
 
@@ -928,7 +928,7 @@ blockquote p {
 
 blockquote small {
   display: block;
-  line-height: 21px;
+  line-height: 20px;
   color: #b4bcc2;
 }
 
@@ -966,9 +966,9 @@ blockquote:after {
 
 address {
   display: block;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   font-style: normal;
-  line-height: 21px;
+  line-height: 20px;
 }
 
 code,
@@ -992,10 +992,10 @@ code {
 
 pre {
   display: block;
-  padding: 10px;
-  margin: 0 0 10.5px;
+  padding: 9.5px;
+  margin: 0 0 10px;
   font-size: 14px;
-  line-height: 21px;
+  line-height: 20px;
   word-break: break-all;
   word-wrap: break-word;
   white-space: pre;
@@ -1009,7 +1009,7 @@ pre {
 }
 
 pre.prettyprint {
-  margin-bottom: 21px;
+  margin-bottom: 20px;
 }
 
 pre code {
@@ -1027,7 +1027,7 @@ pre code {
 }
 
 form {
-  margin: 0 0 21px;
+  margin: 0 0 20px;
 }
 
 fieldset {
@@ -1040,16 +1040,16 @@ legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   font-size: 22.5px;
-  line-height: 42px;
+  line-height: 40px;
   color: #7b8a8b;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
 }
 
 legend small {
-  font-size: 15.75px;
+  font-size: 15px;
   color: #b4bcc2;
 }
 
@@ -1060,7 +1060,7 @@ select,
 textarea {
   font-size: 15px;
   font-weight: normal;
-  line-height: 21px;
+  line-height: 20px;
 }
 
 input,
@@ -1093,11 +1093,11 @@ input[type="tel"],
 input[type="color"],
 .uneditable-input {
   display: inline-block;
-  height: 21px;
+  height: 20px;
   padding: 4px 6px;
-  margin-bottom: 10.5px;
+  margin-bottom: 10px;
   font-size: 15px;
-  line-height: 21px;
+  line-height: 20px;
   color: #95a5a6;
   vertical-align: middle;
   -webkit-border-radius: 6px;
@@ -1188,13 +1188,13 @@ input[type="checkbox"] {
 
 select,
 input[type="file"] {
-  height: 31px;
+  height: 30px;
   /* In IE7, the height of the select element cannot be changed by height, only font-size */
 
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */
 
-  line-height: 31px;
+  line-height: 30px;
 }
 
 select {
@@ -1255,7 +1255,7 @@ textarea::-webkit-input-placeholder {
 
 .radio,
 .checkbox {
-  min-height: 21px;
+  min-height: 20px;
   padding-left: 20px;
 }
 
@@ -1629,9 +1629,9 @@ select:focus:invalid:focus {
 }
 
 .form-actions {
-  padding: 20px 20px 21px;
-  margin-top: 21px;
-  margin-bottom: 21px;
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
   background-color: #f5f5f5;
   border-top: 1px solid #e5e5e5;
   *zoom: 1;
@@ -1655,7 +1655,7 @@ select:focus:invalid:focus {
 
 .help-block {
   display: block;
-  margin-bottom: 10.5px;
+  margin-bottom: 10px;
 }
 
 .help-inline {
@@ -1669,7 +1669,7 @@ select:focus:invalid:focus {
 .input-append,
 .input-prepend {
   display: inline-block;
-  margin-bottom: 10.5px;
+  margin-bottom: 10px;
   font-size: 0;
   white-space: nowrap;
   vertical-align: middle;
@@ -1716,12 +1716,12 @@ select:focus:invalid:focus {
 .input-prepend .add-on {
   display: inline-block;
   width: auto;
-  height: 21px;
+  height: 20px;
   min-width: 16px;
   padding: 4px 5px;
   font-size: 15px;
   font-weight: normal;
-  line-height: 21px;
+  line-height: 20px;
   text-align: center;
   text-shadow: 0 1px 0 #ffffff;
   background-color: #ecf0f1;
@@ -1937,16 +1937,16 @@ input.search-query {
 }
 
 .control-group {
-  margin-bottom: 10.5px;
+  margin-bottom: 10px;
 }
 
 legend + .control-group {
-  margin-top: 21px;
+  margin-top: 20px;
   -webkit-margin-top-collapse: separate;
 }
 
 .form-horizontal .control-group {
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   *zoom: 1;
 }
 
@@ -1989,7 +1989,7 @@ legend + .control-group {
 .form-horizontal .uneditable-input + .help-block,
 .form-horizontal .input-prepend + .help-block,
 .form-horizontal .input-append + .help-block {
-  margin-top: 10.5px;
+  margin-top: 10px;
 }
 
 .form-horizontal .form-actions {
@@ -2005,13 +2005,13 @@ table {
 
 .table {
   width: 100%;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
 }
 
 .table th,
 .table td {
   padding: 8px;
-  line-height: 21px;
+  line-height: 20px;
   text-align: left;
   vertical-align: top;
   border-top: 1px solid #dddddd;
@@ -2939,7 +2939,7 @@ table th[class*="span"],
 .dropdown-menu .divider {
   *width: 100%;
   height: 1px;
-  margin: 9.5px 1px;
+  margin: 9px 1px;
   *margin: -5px 0 5px;
   overflow: hidden;
   background-color: rgba(0, 0, 0, 0.2);
@@ -2951,7 +2951,7 @@ table th[class*="span"],
   padding: 3px 20px;
   clear: both;
   font-weight: normal;
-  line-height: 21px;
+  line-height: 20px;
   color: #ffffff;
   white-space: nowrap;
 }
@@ -3173,7 +3173,7 @@ table th[class*="span"],
   float: right;
   font-size: 20px;
   font-weight: bold;
-  line-height: 21px;
+  line-height: 20px;
   color: #000000;
   text-shadow: 0 1px 0 #ffffff;
   opacity: 0.2;
@@ -3204,7 +3204,7 @@ button.close {
   margin-bottom: 0;
   *margin-left: .3em;
   font-size: 15px;
-  line-height: 21px;
+  line-height: 20px;
   color: #7b8a8b;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
@@ -3639,8 +3639,8 @@ input[type="submit"].btn.btn-mini {
 }
 
 .btn-toolbar {
-  margin-top: 10.5px;
-  margin-bottom: 10.5px;
+  margin-top: 10px;
+  margin-bottom: 10px;
   font-size: 0;
 }
 
@@ -3877,7 +3877,7 @@ input[type="submit"].btn.btn-mini {
 
 .alert {
   padding: 8px 35px 8px 14px;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   background-color: #f7f3e1;
   border: 1px solid transparent;
@@ -3899,7 +3899,7 @@ input[type="submit"].btn.btn-mini {
   position: relative;
   top: -2px;
   right: -21px;
-  line-height: 21px;
+  line-height: 20px;
 }
 
 .alert-success {
@@ -3949,7 +3949,7 @@ input[type="submit"].btn.btn-mini {
 }
 
 .nav {
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   margin-left: 0;
   list-style: none;
 }
@@ -3977,7 +3977,7 @@ input[type="submit"].btn.btn-mini {
   padding: 3px 15px;
   font-size: 11px;
   font-weight: bold;
-  line-height: 21px;
+  line-height: 20px;
   color: #b4bcc2;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
   text-transform: uppercase;
@@ -4020,7 +4020,7 @@ input[type="submit"].btn.btn-mini {
 .nav-list .divider {
   *width: 100%;
   height: 1px;
-  margin: 9.5px 1px;
+  margin: 9px 1px;
   *margin: -5px 0 5px;
   overflow: hidden;
   background-color: #e5e5e5;
@@ -4070,7 +4070,7 @@ input[type="submit"].btn.btn-mini {
 .nav-tabs > li > a {
   padding-top: 8px;
   padding-bottom: 8px;
-  line-height: 21px;
+  line-height: 20px;
   border: 1px solid transparent;
   -webkit-border-radius: 4px 4px 0 0;
      -moz-border-radius: 4px 4px 0 0;
@@ -4367,7 +4367,7 @@ input[type="submit"].btn.btn-mini {
 .navbar {
   *position: relative;
   *z-index: 2;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   overflow: visible;
 }
 
@@ -4416,7 +4416,7 @@ input[type="submit"].btn.btn-mini {
 .navbar .brand {
   display: block;
   float: left;
-  padding: 14.5px 20px 14.5px;
+  padding: 15px 20px 15px;
   margin-left: -20px;
   font-size: 20px;
   font-weight: 200;
@@ -4614,7 +4614,7 @@ input[type="submit"].btn.btn-mini {
 
 .navbar .nav > li > a {
   float: none;
-  padding: 14.5px 15px 14.5px;
+  padding: 15px 15px 15px;
   color: #ffffff;
   text-decoration: none;
   text-shadow: 0 1px 0 #2c3e50;
@@ -4950,7 +4950,7 @@ input[type="submit"].btn.btn-mini {
 
 .breadcrumb {
   padding: 8px 15px;
-  margin: 0 0 21px;
+  margin: 0 0 20px;
   list-style: none;
   background-color: #f5f5f5;
   -webkit-border-radius: 6px;
@@ -4975,7 +4975,7 @@ input[type="submit"].btn.btn-mini {
 }
 
 .pagination {
-  margin: 21px 0;
+  margin: 20px 0;
 }
 
 .pagination ul {
@@ -5000,7 +5000,7 @@ input[type="submit"].btn.btn-mini {
 .pagination ul > li > span {
   float: left;
   padding: 4px 12px;
-  line-height: 21px;
+  line-height: 20px;
   text-decoration: none;
   background-color: #ffffff;
   border: 1px solid #dddddd;
@@ -5121,7 +5121,7 @@ input[type="submit"].btn.btn-mini {
 }
 
 .pager {
-  margin: 21px 0;
+  margin: 20px 0;
   text-align: center;
   list-style: none;
   *zoom: 1;
@@ -5552,14 +5552,14 @@ input[type="submit"].btn.btn-mini {
 
 .thumbnails > li {
   float: left;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   margin-left: 20px;
 }
 
 .thumbnail {
   display: block;
   padding: 4px;
-  line-height: 21px;
+  line-height: 20px;
   border: 1px solid #ddd;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
@@ -5779,8 +5779,8 @@ a.badge:focus {
 }
 
 .progress {
-  height: 21px;
-  margin-bottom: 21px;
+  height: 20px;
+  margin-bottom: 20px;
   overflow: hidden;
   background-color: #f7f7f7;
   background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
@@ -5942,7 +5942,7 @@ a.badge:focus {
 }
 
 .accordion {
-  margin-bottom: 21px;
+  margin-bottom: 20px;
 }
 
 .accordion-group {
@@ -5973,7 +5973,7 @@ a.badge:focus {
 
 .carousel {
   position: relative;
-  margin-bottom: 21px;
+  margin-bottom: 20px;
   line-height: 1;
 }
 
@@ -6107,7 +6107,7 @@ a.badge:focus {
 
 .carousel-caption h4,
 .carousel-caption p {
-  line-height: 21px;
+  line-height: 20px;
   color: #ffffff;
 }
 
@@ -6124,7 +6124,7 @@ a.badge:focus {
   margin-bottom: 30px;
   font-size: 18px;
   font-weight: 200;
-  line-height: 31.5px;
+  line-height: 30px;
   color: inherit;
   background-color: #ecf0f1;
   -webkit-border-radius: 6px;
@@ -6141,7 +6141,7 @@ a.badge:focus {
 }
 
 .hero-unit li {
-  line-height: 31.5px;
+  line-height: 30px;
 }
 
 .pull-right {
@@ -6554,31 +6554,41 @@ input[type="color"]:focus,
           border-radius: 0 6px 6px 0;
 }
 
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
+.input-prepend input,
+.input-append input,
+.input-prepend select,
+.input-append select,
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
   -webkit-border-radius: 0;
      -moz-border-radius: 0;
           border-radius: 0;
 }
 
-.input-prepend.input-append input + .btn-group .btn,
-.input-prepend.input-append select + .btn-group .btn,
-.input-prepend.input-append .uneditable-input + .btn-group .btn {
+.input-prepend input + .btn-group .btn,
+.input-append input + .btn-group .btn,
+.input-prepend select + .btn-group .btn,
+.input-append select + .btn-group .btn,
+.input-prepend .uneditable-input + .btn-group .btn,
+.input-append .uneditable-input + .btn-group .btn {
   -webkit-border-radius: 0 6px 6px 0;
      -moz-border-radius: 0 6px 6px 0;
           border-radius: 0 6px 6px 0;
 }
 
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
+.input-prepend .add-on:first-child,
+.input-append .add-on:first-child,
+.input-prepend .btn:first-child,
+.input-append .btn:first-child {
   -webkit-border-radius: 6px 0 0 6px;
      -moz-border-radius: 6px 0 0 6px;
           border-radius: 6px 0 0 6px;
 }
 
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
+.input-prepend .add-on:last-child,
+.input-append .add-on:last-child,
+.input-prepend .btn:last-child,
+.input-append .btn:last-child {
   -webkit-border-radius: 0 6px 6px 0;
      -moz-border-radius: 0 6px 6px 0;
           border-radius: 0 6px 6px 0;
@@ -6588,6 +6598,7 @@ input[type="color"]:focus,
 .input-prepend .add-on {
   padding: 9px 5px;
   text-shadow: none;
+  border: none;
 }
 
 .control-group.error,
@@ -6640,12 +6651,6 @@ input[type="file"] {
   line-height: 16px;
 }
 
-.input-append .add-on,
-.input-prepend .add-on {
-  background: none;
-  border: none;
-}
-
 legend {
   color: #2c3e50;
   border-bottom: none;
@@ -6804,6 +6809,12 @@ legend {
   div.subnav .nav > li:last-child > a {
     border-radius: 0 0 4px 4px;
   }
+  .input-append .add-on,
+  .input-prepend .add-on,
+  .input-append .btn,
+  .input-prepend .btn {
+    padding: 5px;
+  }
 }
 
 @media (max-width: 979px) {