2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

This commit is contained in:
Mark Otto
2016-02-03 19:23:29 -08:00
32 changed files with 351 additions and 277 deletions
-10
View File
@@ -1,13 +1,3 @@
-
browser: >
Microsoft Edge
summary: >
Edge renders an SVG `<img>` with `max-width:100%;` too small
upstream_bug: >
IE#2274240
origin: >
Bootstrap#16915
-
browser: >
Internet Explorer 11 & Microsoft Edge
+1 -1
View File
@@ -271,7 +271,7 @@ The `.form-group` class is the easiest way to add some structure to forms. Its o
### Inline forms
Use the `.form-inline` class to to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently:
Use the `.form-inline` class to display a series of labels, form controls, and buttons on a single horizontal row. Form controls within inline forms behave differently:
- Controls are `display: inline-block` to provide alignment control via `vertical-align` and `margin`.
- Controls receive `width: auto` to override the Bootstrap default `width: 100%`.
+1 -1
View File
@@ -268,7 +268,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
<td>offsets</td>
<td>string</td>
<td>'0 0'</td>
<td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#constraints">offset docs</a>.</td>
<td>Offset of the popover relative to its target. For more information refer to Tether's <a href="http://github.hubspot.com/tether/#offset">offset docs</a>.</td>
</tr>
</tbody>
</table>
+7 -12
View File
@@ -3,7 +3,7 @@
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
/*! normalize.css commit fe56763 | MIT License | github.com/necolas/normalize.css */
html {
font-family: sans-serif;
-webkit-text-size-adjust: 100%;
@@ -21,7 +21,6 @@ figcaption,
figure,
footer,
header,
hgroup,
main,
menu,
nav,
@@ -188,8 +187,6 @@ input[type="number"]::-webkit-outer-spin-button {
}
input[type="search"] {
-webkit-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
@@ -230,7 +227,9 @@ th {
@media print {
*,
*::before,
*::after {
*::after,
*::first-letter,
*::first-line {
text-shadow: none !important;
-webkit-box-shadow: none !important;
box-shadow: none !important;
@@ -255,9 +254,6 @@ th {
img {
page-break-inside: avoid;
}
img {
max-width: 100% !important;
}
p,
h2,
h3 {
@@ -489,8 +485,6 @@ legend {
}
input[type="search"] {
-webkit-box-sizing: inherit;
box-sizing: inherit;
-webkit-appearance: none;
}
@@ -3156,6 +3150,7 @@ input[type="button"].btn-block {
.input-group-addon {
padding: .375rem .75rem;
margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
line-height: 1.5;
@@ -5090,7 +5085,7 @@ button.close {
letter-spacing: normal;
word-break: normal;
word-spacing: normal;
word-wrap: normal;
word-wrap: break-word;
white-space: normal;
opacity: 0;
@@ -5191,7 +5186,7 @@ button.close {
letter-spacing: normal;
word-break: normal;
word-spacing: normal;
word-wrap: normal;
word-wrap: break-word;
white-space: normal;
background-color: #fff;
-webkit-background-clip: padding-box;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -2421,7 +2421,7 @@ var ScrollSpy = (function ($) {
$link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE);
$link.addClass(ClassName.ACTIVE);
} else {
// todo (fat) this is kinda sus
// todo (fat) this is kinda sus...
// recursively add actives to tested nav-links
$link.parents(Selector.LI).find(Selector.NAV_LINKS).addClass(ClassName.ACTIVE);
}
+1 -1
View File
@@ -258,7 +258,7 @@
$link.closest(Selector.DROPDOWN).find(Selector.DROPDOWN_TOGGLE).addClass(ClassName.ACTIVE);
$link.addClass(ClassName.ACTIVE);
} else {
// todo (fat) this is kinda sus
// todo (fat) this is kinda sus...
// recursively add actives to tested nav-links
$link.parents(Selector.LI).find(Selector.NAV_LINKS).addClass(ClassName.ACTIVE);
}