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

11797 Commits

Author SHA1 Message Date
Mark Otto
74fbf61e30 custom holder theme 2015-01-20 21:12:25 -08:00
Chris Rebert
d5a2b27e16 Merge pull request #15503 from twbs/qunit
Update QUnit to v1.17.0.
2015-01-20 20:23:34 -08:00
Chris Rebert
1652efc3f6 tweak 'close reopened modal' unit test to work under new QUnit API 2015-01-20 20:18:33 -08:00
Chris Rebert
df73535a2d fix bug in tab show/shown relatedTarget unit test 2015-01-20 20:16:42 -08:00
Chris Rebert
b56d97f210 update JS unit tests to future-proof QUnit 1.16.0 API
[skip validator]
2015-01-20 19:57:51 -08:00
Chris Rebert
2e20e67dc1 Document sticky :hover on mobile browsers; fixes #12832 2015-01-20 19:22:20 -08:00
Mark Otto
97eb12561d large page titles 2015-01-20 18:50:07 -08:00
Mark Otto
4bed09aff8 grunt 2015-01-20 18:48:18 -08:00
Mark Otto
c5d4ab259e Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-01-20 17:05:53 -08:00
Mark Otto
474ea24fc3 fix docs homepage ad 2015-01-20 17:05:39 -08:00
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes
Fixes #15617.
2015-01-20 16:24:48 -08:00
Mark Otto
6ebf68296a Merge pull request #61 from twbs/clear-out-fonts
remove unused font files
2015-01-20 15:40:37 -08:00
Mark Otto
260378411d Update README.md 2015-01-20 15:40:32 -08:00
Chris Rebert
d9f437f4ec Merge pull request #15619 from twbs/markdown
Change markdown library
2015-01-20 13:25:24 -08:00
Chris Rebert
92b267f357 update shrinkwrap 2015-01-20 13:05:58 -08:00
Chris Rebert
30b74105dd remarkable -> markdown-it 2015-01-20 13:04:55 -08:00
Chris Rebert
136058b562 Merge pull request #15618 from twbs/update-sauce
update grunt-saucelabs to ~8.5.0
2015-01-20 13:04:17 -08:00
Chris Rebert
0b7f6b941a update shrinkwrap 2015-01-20 12:49:46 -08:00
Chris Rebert
429809c9cc update grunt-saucelabs to ~8.5.0 2015-01-20 12:49:08 -08:00
Mark Otto
33e32bffc8 new headers, ad placements, intro paragraphs on several pages, etc 2015-01-19 20:03:08 -08:00
Mark Otto
ff1d10affb fix scrollspy nav 2015-01-19 18:51:21 -08:00
Chris Rebert
8ecdda0b35 Merge pull request #52 from twbs/normalize-figure
Let Normalize.css normalize <figure>'s margin
2015-01-19 16:58:01 -08:00
Mark Otto
6f61201f87 fix broken brand logos 2015-01-19 16:18:38 -08:00
Mark Otto
2327a1d44d no need for additional subheading 2015-01-19 16:17:54 -08:00
Mark Otto
e2c6dd29d8 tons of docs helpers cleanup 2015-01-19 16:15:51 -08:00
Mark Otto
6ba05d95d5 properly reset button.close styles 2015-01-19 16:11:39 -08:00
Mark Otto
29c7a0f002 fix quick floats example 2015-01-19 16:11:29 -08:00
Mark Otto
dfdb99c989 fix broken breadcrumb divider 2015-01-19 16:08:48 -08:00
Mark Otto
21dc9b1f57 fix broken buttons 2015-01-19 16:03:41 -08:00
Mark Otto
e1dfe01c9f separate examples for inline radios and checkboxes 2015-01-19 16:01:28 -08:00
Mark Otto
43e45ce06c consolidate forms docs 2015-01-19 16:00:56 -08:00
Mark Otto
dba0e3c947 docs subheading tweaks 2015-01-19 15:53:21 -08:00
Mark Otto
3fe96e8f50 fix border color on inverse tables 2015-01-19 15:52:40 -08:00
Mark Otto
affd89122f better separation of docs sections with a light bottom border on h2s 2015-01-19 15:49:44 -08:00
Mark Otto
1633da2ce8 remove unnecessary docs sections for media queries page 2015-01-19 15:44:53 -08:00
Mark Otto
72bc9b97f0 fix homepage nav styles 2015-01-19 15:44:45 -08:00
Mark Otto
a72741ed62 nuke files 2015-01-19 15:25:53 -08:00
Mark Otto
d8c94029d3 move around files 2015-01-19 15:25:49 -08:00
Bootstrap's Grunt bot
c643a3d331 automatic grunt dist 2015-01-19 23:20:54 +00:00
Mark Otto
b6c0007f21 Merge pull request #15606 from tagliala/trim-whitespaces
Trim whitespaces
2015-01-19 15:13:16 -08:00
Mark Otto
faedb7fec4 grunt 2015-01-19 14:55:25 -08:00
Mark Otto
7440c38469 fix invalid css 2015-01-19 14:50:41 -08:00
Mark Otto
325748ff68 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
2015-01-19 14:48:12 -08:00
Geremia Taglialatela
e90f98dd0c Trim whitespaces 2015-01-19 21:26:01 +01:00
XhmikosR
a8139a0392 Update QUnit to v1.17.0. 2015-01-19 20:10:34 +02:00
XhmikosR
4fd01b7ac1 Merge pull request #15605 from twbs/deps
Update devDependencies.
2015-01-19 19:54:43 +02:00
XhmikosR
fbc220defd Update devDependencies. 2015-01-19 19:20:13 +02:00
Mark Otto
24aad4fe3a customizer typo 2015-01-19 09:19:09 -08:00
Mark Otto
bcf7dd38b5 Merge pull request #15604 from twbs/ship_v3.3.2
Ship v3.3.2
2015-01-19 09:03:09 -08:00
Mark Otto
fa47de717e grunt 2015-01-19 08:33:33 -08:00