0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-05 17:24:20 +01:00
Commit Graph

14392 Commits

Author SHA1 Message Date
Mark Otto
2ac922c78f grunt 2016-02-03 19:45:19 -08:00
Mark Otto
ba37c37615 Redo line-height globally
- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
2016-02-03 19:45:13 -08:00
Mark Otto
102a20f5b3 center the nav 2016-02-03 19:29:15 -08:00
Mark Otto
0e70c6a37f Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2016-02-03 19:23:29 -08:00
Chris Rebert
19be536083 Merge pull request #19072 from twbs/bump-shrinkwrap
Update shrinkwrap
2016-02-02 22:49:48 -08:00
Chris Rebert
da0d1721d2 update shrinkwrap 2016-02-02 22:41:58 -08:00
cndpzc
6384789f95 Fix typo in forms.md
Closes #19049
2016-01-28 20:45:59 -08:00
Chris Rebert
8989820a5f Merge pull request #19035 from twbs/rapid-progress
Travis CI: Disable npm's progress bar for speedier install
2016-01-26 23:01:07 -08:00
XhmikosR
4121fcd3e2 Merge pull request #19018 from twbs/v4-dev-xmr-print-styles
Update print styles to v5.3.0 of html5 boilerplate.
2016-01-27 06:51:45 +02:00
Chris Rebert
a8b66e17b0 Travis CI: Disable npm's progress bar for speedier install
See https://github.com/npm/npm/issues/11283
2016-01-26 17:35:04 -08:00
Chris Rebert
aa62428cdf Add docs for custom file input's text and $custom-file-text
[skip sauce]
2016-01-26 13:19:19 -08:00
Chris Rebert
701b467994 Remove Wall of Browser Bugs entry for #16915
https://connect.microsoft.com/IE/feedback/details/2274240/edge-edge-renders-an-svg-img-with-max-width-100-too-small
is fixed as of Edge 25.10586.0.0 (or possibly earlier).
Confirmed in https://github.com/twbs/bootstrap/issues/16915#issuecomment-175210482
Reverts #19010

[skip sauce]
2016-01-26 12:38:27 -08:00
Chris Rebert
f2d77b674c scrollspy.js: Avoid gratuitous non-ASCII for consistency+compatibility
Fixes #19028

[skip sauce]
[skip validator]
2016-01-26 11:58:40 -08:00
XhmikosR
e672d60646 Update print styles to v5.3.0 of html5 boilerplate. 2016-01-26 21:37:44 +02:00
XhmikosR
f0ebb4c150 Missed bundle i. 2016-01-26 06:04:01 +02:00
XhmikosR
ac8fad862c Bump jekyll-sitemap.
[skip sauce]
[skip validator]
2016-01-25 21:01:28 +02:00
XhmikosR
c9c413c7a3 Missed shrinkwrap.
[skip sauce]
2016-01-25 09:32:22 +02:00
XhmikosR
2825bf496b Run grunt.
[ci skip]
2016-01-25 09:30:34 +02:00
XhmikosR
b952d14c53 Bump grunt-jscs. 2016-01-25 09:17:39 +02:00
XhmikosR
6ef37f112f Update gems to the latest versions. 2016-01-25 09:15:37 +02:00
mkroeders
a62f70b420 Allow a <label> for .input-group-addon by zeroing out margin-bottom
When using a <label> as an .input-group-addon, there will be a default margin-bottom of .5rem via Reboot.
This will lead to undesirable whitespace below the label and the <input> will become taller than needed. By removing the margin, it will play nice with <label> elements.

Closes #19012
2016-01-23 22:18:43 -08:00
Chris Rebert
d54d9d3f7a Merge pull request #19001 from twbs/bump-normalize
Bump Normalize so we can remove Reboot's input[type=search] box-sizing override
2016-01-23 22:11:27 -08:00
Chris Rebert
3a20ae2b5e Merge pull request #19016 from TwistedHardware/v4-dev
Popover docs: Fix section link to Tether.js docs
[skip sauce]
2016-01-23 22:09:32 -08:00
Abdullah Alrasheed
497d28843e DOCS - Fix a link in popover for v4 2016-01-24 13:31:27 +08:00
Mark Otto
e672c15b6d Merge pull request #19002 from twbs/blockquote-border-width
Add $blockquote-border-width variable
2016-01-23 20:42:23 -08:00
Mark Otto
fa0e68e486 Merge pull request #19000 from twbs/print-img-max-width-100-hell
Remove print-specific img max-width:100%; style so that Google Maps etc. print correctly
2016-01-23 20:37:36 -08:00
Mark Otto
2fe6c6c88b Merge pull request #18927 from twbs/fix-16871
Apply word-wrap:break-word to Tooltips and Popovers
2016-01-23 20:36:59 -08:00
Mark Otto
40525eaa4d grunt 2016-01-23 20:32:59 -08:00
Chris Rebert
a26b4bb78b Merge pull request #19011 from twbs/scss-lint
Bump SCSS-Lint, and `bundle update`
2016-01-23 03:11:13 -08:00
Chris Rebert
7e2e31e964 scss/_forms.scss: Remove now-unnecessary SCSS-Lint exemption
[skip sauce]
2016-01-23 03:06:21 -08:00
Chris Rebert
bc4d5d1ab9 bundle update
[skip sauce]
2016-01-23 03:04:31 -08:00
Chris Rebert
7f9bd451f5 Bump SCSS-Lint to 0.44.0 2016-01-23 03:04:11 -08:00
Chris Rebert
903503bd47 Merge pull request #19010 from twbs/edge-bug-2274240
Add Wall of Browser Bugs entry for #16915
2016-01-23 02:54:02 -08:00
Chris Rebert
e381b83233 Add Wall of Browser Bugs entry for #16915
https://connect.microsoft.com/IE/feedback/details/2274240/edge-edge-renders-an-svg-img-with-max-width-100-too-small
[skip sauce]
2016-01-23 02:49:08 -08:00
Chris Rebert
739b51f264 Reboot: Remove now-unnecessary input[type="search"] box-sizing override
Revert "fixes #17379: override search input box-sizing to match our global overrides"

This reverts commits 468a9d9359 & 57998dc274.

https://github.com/necolas/normalize.css/pull/496 has made this override unnecessary.

[skip sauce]
2016-01-21 14:50:06 -08:00
Chris Rebert
beeafc2808 Bump Normalize to fe567632af
So as to pull in https://github.com/necolas/normalize.css/pull/496
2016-01-21 14:28:41 -08:00
Chris Rebert
8820c563d2 Remove print-specific img max-width:100%; style so that Google Maps and other widgets print correctly
See https://github.com/h5bp/html5-boilerplate/issues/1741
X-Ref: #1506
2016-01-21 14:18:54 -08:00
Chris Rebert
bd8c03bfc6 Merge pull request #18986 from xcatliu/v4-dev-fix-assets-img-sass
Add prefix to docs/index.html assets/img/sass.png
2016-01-20 23:00:57 -08:00
xcatliu
fe18aa8cb5 Add prefix to footer.html search.json 2016-01-21 13:29:51 +08:00
xcatliu
f8bde6ef50 Add prefix to docs/index.html assets/img/sass.png 2016-01-21 13:16:35 +08:00
David Beitey
c9f5f13fd9 Clean up printing documentation
Replace inline HTML with markdown, rewording, and cleanup.
Closes #18984
2016-01-20 18:30:28 -08:00
Chris Rebert
69523b1e04 Restore workarounds for #12078 printing bug that were lost in 86af1f3
Refs #18984
[skip sauce]
2016-01-20 18:25:57 -08:00
Chris Rebert
fc7ee66630 Docs: Tweak #18982
[skip sauce]
2016-01-20 17:50:08 -08:00
Chris Rebert
2a0c80758b Merge pull request #18982 from davidjb/patch-4
Document .small and .mark classes
2016-01-20 17:42:37 -08:00
David Beitey
a5f4046d38 Document .small and .mark classes
These are available in _type.scss but not documented.  These classes are useful for styling without adding semantics.
2016-01-21 10:28:05 +10:00
Chris Rebert
a38e8a640e Merge pull request #18945 from twbs/edge-bug-2263132
Add Wall of Browser Bugs entry for #18228
2016-01-20 02:10:27 -08:00
Chris Rebert
332c39b690 Add Wall of Browser Bugs entry for #18228
See https://connect.microsoft.com/IE/feedback/details/2263132/edge-ie11-subpixel-problem-with-transparent-borders
Refs #18228
[skip sauce]
2016-01-20 02:06:02 -08:00
Chris Rebert
437aae40c1 Merge pull request #18938 from ruedap/fix-typo
Fix typo in docs/assets/scss/docs.scss
[ci skip]
2016-01-19 03:31:25 -08:00
ruedap
d79cd56289 Fix typo in docs/assets/scss/docs.scss 2016-01-19 19:49:16 +09:00
Chris Rebert
f15da060ce Also filed a Radar for #17497
See http://openradar.appspot.com/24235301
Refs #17497
[skip sauce]
2016-01-19 00:24:26 -08:00