2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

Merge branch 'master' into v4

Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
This commit is contained in:
Mark Otto
2015-01-19 14:48:12 -08:00
45 changed files with 553 additions and 904 deletions
+13 -13
View File
@@ -98,16 +98,6 @@
origin: >
Bootstrap#12078
-
browser: >
Chrome
summary: >
`<input type="password">` sporadically causes bad widths on floated elements.
upstream_bug: >
Chromium#377346
origin: >
Bootstrap#13892
-
browser: >
Chrome
@@ -118,6 +108,16 @@
origin: >
Bootstrap#14409
-
browser: >
Chrome (Windows & Linux)
summary: >
Animation glitch when returning to inactive tab after animations occurred while tab was hidden.
upstream_bug: >
Chromium#449180
origin: >
Bootstrap#15298
-
browser: >
Safari (OS X)
@@ -156,7 +156,7 @@
summary: >
Small font size when printing webpage with fixed-width `.container`.
upstream_bug: >
WebKit#138192
WebKit#138192, Safari#19435018
origin: >
Bootstrap#14868
@@ -166,7 +166,7 @@
summary: >
Alpha linear-gradient has dark line at its edge.
upstream_bug: >
WebKit#139803
WebKit#139803, Safari#19434933
origin: >
Bootstrap#15205
@@ -196,6 +196,6 @@
summary: >
`display: block` causes text of temporal `<input>`s to become vertically misaligned
upstream_bug: >
WebKit#139848
WebKit#139848, Safari#19434878
origin: >
Bootstrap#11266, Bootstrap#13098