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

11685 Commits

Author SHA1 Message Date
Chris Rebert
6866b1733a Merge pull request #16255 from twbs/patch-bumps
Bump patch versions of grunt-html, grunt-contrib-jshint
2015-04-07 17:46:12 -07:00
Chris Rebert
75ff46ca75 Bump patch versions of grunt-html, grunt-contrib-jshint 2015-04-07 17:38:17 -07:00
Chris Rebert
b5416184e1 Bump markdown-it to ^4.1.0
[skip sauce]
[skip validator]
2015-04-07 17:34:44 -07:00
Chris Rebert
180c86229f Merge pull request #16254 from twbs/ios-8.2
Sauce tests: upgrade iOS to v8.2
2015-04-07 17:20:59 -07:00
Chris Rebert
ffe646bb08 Sauce tests: upgrade iOS to v8.2
[skip validator]
2015-04-07 13:00:52 -07:00
Chris Rebert
2dfdab6ec4 Merge pull request #16252 from twbs/bump-uglify
Bump grunt-contrib-uglify to ~0.9.0
2015-04-07 12:49:20 -07:00
Chris Rebert
3094d8390c update shrinkwrap 2015-04-07 12:34:18 -07:00
Chris Rebert
86376e89cd Bump grunt-contrib-uglify to ~0.9.0 2015-04-07 12:33:29 -07:00
Chris Rebert
2e6511bb51 Merge pull request #16246 from twbs/bump-connect
Bump grunt-contrib-connect to ~0.10.1
2015-04-06 21:55:43 -07:00
Chris Rebert
e3695d6ea4 update shrinkwrap 2015-04-06 21:39:54 -07:00
Chris Rebert
d00c33c930 Bump grunt-contrib-connect to ~0.10.1 2015-04-06 21:38:32 -07:00
Chris Rebert
dbf025b4ab Merge pull request #16245 from twbs/bump-autoprefixer
Bump grunt-autoprefixer to ~3.0.0
2015-04-06 21:10:23 -07:00
Chris Rebert
3758d3964d Bump grunt-autoprefixer to ~3.0.0 2015-04-06 20:58:10 -07:00
Chris Rebert
387042e31e Merge pull request #16244 from twbs/bump-jscs
Bump grunt-jscs to ~1.6.0
2015-04-06 19:26:25 -07:00
Chris Rebert
b417251a23 update shrinkwrap
[skip sauce]
[skip validator]
2015-04-06 18:31:49 -07:00
Bootstrap's Grunt bot
7c3034dfb0 automatic grunt dist 2015-04-07 01:30:48 +00:00
Chris Rebert
9b696da16f Bump grunt-jscs to ~1.6.0 2015-04-06 18:29:53 -07:00
Chris Rebert
3b317e00c5 Merge pull request #16243 from twbs/bump-qunit
Bump grunt-contrib-qunit to ~0.7.0
2015-04-06 18:26:43 -07:00
Chris Rebert
bd33dcf9f1 update shrinkwrap
[skip sauce]
[skip validator]
2015-04-06 18:21:30 -07:00
Chris Rebert
25286393dd Bump grunt-contrib-qunit to ~0.7.0 2015-04-06 17:06:49 -07:00
Bootstrap's Grunt bot
f62c014cbc automatic grunt dist 2015-04-05 07:10:30 +00:00
Mark Otto
fe41ca34e5 Merge pull request #15978 from sqal/fix_pagination_border_on_hover
[Fixes #15976] Fix pagination link cut off border on hover
2015-04-05 00:03:32 -07:00
Mark Otto
4cae6634ca property order 2015-04-05 00:02:40 -07:00
Mark Otto
83d10bb5a7 Merge pull request #15945 from kkirsche/patch-9
[Fixes #15944] Add Z-Index to avoid border overlapping
2015-04-05 00:02:14 -07:00
Bootstrap's Grunt bot
e2d5e084b2 automatic grunt dist 2015-04-05 07:01:05 +00:00
Mark Otto
f93fba2bef Merge pull request #16234 from twbs/normalize_303
Normalize v3.0.3
2015-04-04 23:59:45 -07:00
Mark Otto
9f7d566a68 Merge pull request #16175 from twbs/fix_15830
Fix border-radius on list group items in collapsible panels
2015-04-04 23:59:22 -07:00
Mark Otto
510f56f334 Merge branch 'master' into fix_15830
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
2015-04-04 23:52:40 -07:00
Bootstrap's Grunt bot
9c41aee780 automatic grunt dist 2015-04-05 06:50:29 +00:00
Mark Otto
7735bfe388 Merge pull request #16224 from vsn4ik/fix_theme_disabled_btn
Fix theme.css .btn[disabled] styles.
2015-04-04 23:47:48 -07:00
Mark Otto
f2ee20f8d8 bring in normalize's v3.0.3 changes 2015-04-04 23:37:06 -07:00
vsn4ik
d6acfd3ef4 Fix theme.css .btn[disabled] styles. 2015-04-04 13:18:16 +03:00
Mark Otto
9c0bd37661 Merge pull request #16208 from StevenBlack/issue.15100
(#15100) Eliminate spurrious padding in .bs-docs-header
2015-04-04 01:55:50 -07:00
Bootstrap's Grunt bot
a250673afc automatic grunt dist 2015-04-04 08:40:29 +00:00
Mark Otto
6d2599be92 Merge pull request #16176 from twbs/input_group_sizing
Static form control sizing in input groups, again
2015-04-04 01:35:13 -07:00
Patrick H. Lauke
f76d1a0e87 Merge pull request #16222 from yuan3y/patch-1
fix dead link: reduced text cases
2015-04-03 15:21:47 +01:00
Yuan Yiyang
b6723cf0eb fix dead link: reduced text cases 2015-04-03 22:01:23 +08:00
Zac Echola
e46c998316 Adds button styles to .list-group-item
Includes buttons with anchor sytles and modifies buttons to match width
and text alignment.
2015-04-02 14:07:53 -05:00
Steven Black
d3cbf018a8 Eliminate spurrious padding in .bs-docs-header
I agree with all the comments here.

Rather than dicker with container nesting at this late juncture, near sunset for BS 3.0x, let's just fix and move on.  It's docs only.

This PR addresses issue #15100 and eliminates the unnecessary horizontal scrollbar that appears for width for width >=768px and <= 782px.

Tested on three different iOS devices and FireFox/Chrome on OSX and it's fine now.

The only difference is the text in .bs-docs-header is shifted left by 15-pixels, lines are 30 px longer so wrap less in some circumstances in some viewports.
2015-04-01 21:53:10 -04:00
Patrick H. Lauke
38f48d6471 Merge pull request #16194 from fyquah95/master
Remove stray spaces from modal/using-grid-system sample code
2015-04-01 10:54:26 +01:00
fyquah95
4d153b9125 indented javascript/modal/using-grid-system sample code from 4 spaces to 2 spaces 2015-04-01 17:43:32 +08:00
Adrien Jarthon
5921724d9c fixed IE incompatible CSS 2015-03-29 19:16:59 +02:00
Adrien Jarthon
df96c3e615 Added non-regression test & fixed existing one 2015-03-29 14:59:21 +02:00
Bootstrap's Grunt bot
bb6af65ca6 automatic grunt dist 2015-03-29 06:40:29 +00:00
Mark Otto
ce75f289f2 grunt 2015-03-28 23:33:11 -07:00
Mark Otto
27da9b290a Fixes #15536: Resize .control-label's font-size and account for border on static form control in form groups 2015-03-28 22:43:33 -07:00
Mark Otto
a2c69b8145 fixes #15830: properly reset border-radius on list items in collapsing panel groups 2015-03-28 21:37:40 -07:00
Bootstrap's Grunt bot
a922985788 automatic grunt dist 2015-03-29 04:10:35 +00:00
Mark Otto
e90d69c28c Merge pull request #15956 from twbs/input-group-sizes-glyphicon
Input group sizes: Properly position `.form-control-feedback`
2015-03-28 21:07:56 -07:00
Bootstrap's Grunt bot
e260661ab8 automatic grunt dist 2015-03-29 04:00:36 +00:00