Merge branch 'master' into pr/12670

wwwcs59 · Mar 7, 2014 · c03b8f1 · c03b8f1
2 parents cb7eb67 + 6452b40
commit c03b8f1
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 26 deletions.
diff --git a/dist/css/bootstrap-rtl.css b/dist/css/bootstrap-rtl.css
diff --git a/dist/css/bootstrap-rtl.min.css b/dist/css/bootstrap-rtl.min.css
diff --git a/dist/css/bootstrap-theme.css.map b/dist/css/bootstrap-theme.css.map
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
@@ -1352,6 +1352,10 @@ <h2 id="list-group">List group</h2>
     <label for="input-@list-group-link-color">@list-group-link-color</label>
     <input id="input-@list-group-link-color" type="text" value="#555" data-var="@list-group-link-color" class="form-control"/>
   </div>
+  <div class="bs-customizer-input">
+    <label for="input-@list-group-link-hover-color">@list-group-link-hover-color</label>
+    <input id="input-@list-group-link-hover-color" type="text" value="@list-group-link-color" data-var="@list-group-link-hover-color" class="form-control"/>
+  </div>
   <div class="bs-customizer-input">
     <label for="input-@list-group-link-heading-color">@list-group-link-heading-color</label>
     <input id="input-@list-group-link-heading-color" type="text" value="#333" data-var="@list-group-link-heading-color" class="form-control"/>

diff --git a/docs/assets/js/raw-files.min.js b/docs/assets/js/raw-files.min.js
diff --git a/docs/dist/css/bootstrap-rtl.min.css b/docs/dist/css/bootstrap-rtl.min.css
diff --git a/docs/dist/css/bootstrap-theme.css.map b/docs/dist/css/bootstrap-theme.css.map
diff --git a/docs/dist/css/bootstrap.css.map b/docs/dist/css/bootstrap.css.map
diff --git a/docs/dist/css/bootstrap.min.css b/docs/dist/css/bootstrap.min.css
diff --git a/less/button-groups.less b/less/button-groups.less
@@ -220,7 +220,17 @@
 
 
 // Checkbox and radio options
+//
+// In order to support the browser's form validation feedback, powered by the
+// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
+// use `display: none;` or `visibility: hidden;` as that also hides the popover.
+// This way, we ensure a DOM element is visible to position the popover from.
+//
+// See https://github.com/twbs/bootstrap/pull/12794 for more.
+
 [data-toggle="buttons"] > .btn > input[type="radio"],
 [data-toggle="buttons"] > .btn > input[type="checkbox"] {
-  display: none;
+  position: absolute;
+  z-index: -1;
+  opacity: 0;
 }
diff --git a/less/list-group.less b/less/list-group.less
@@ -62,6 +62,7 @@ a.list-group-item {
   &:hover,
   &:focus {
     text-decoration: none;
+    color: @list-group-link-hover-color;
     background-color: @list-group-hover-bg;
   }
 }

diff --git a/less/mixins.less b/less/mixins.less
@@ -602,7 +602,7 @@
   &.active,
   .open .dropdown-toggle& {
     color: @color;
-    background-color: darken(@background, 8%);
+    background-color: darken(@background, 10%);
         border-color: darken(@border, 12%);
   }
   &:active,

diff --git a/less/variables.less b/less/variables.less
@@ -662,6 +662,7 @@
 @list-group-disabled-text-color: @list-group-disabled-color;
 
 @list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
 @list-group-link-heading-color: #333;
 
 

diff --git a/test-infra/npm-shrinkwrap.canonical.json b/test-infra/npm-shrinkwrap.canonical.json