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

7813 Commits

Author SHA1 Message Date
Mark Otto
cc1f95652b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 11:41:02 -08:00
Mark Otto
775c29fef6 Fixes #11764: Add meta data to docs for description, keywords, and authors 2013-12-07 11:40:08 -08:00
Mark Otto
94a5413ec7 Merge pull request #11757 from ZDroid/darken-toggle
Darken navbar toggle icon bar to meet WCAG
2013-12-07 11:34:03 -08:00
Mark Otto
4032dd0f26 grunt 2013-12-07 11:32:39 -08:00
Mark Otto
73da46c8bb Fixes #11760: Remove mailing list links from readme and about pages
Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.
2013-12-07 11:22:38 -08:00
Mark Otto
4b84acb9a4 Merge pull request #11765 from ZDroid/docs-min-js
Load minified Bootstrap JS code
2013-12-07 11:09:43 -08:00
Zlatan Vasović
8087f95ca4 Load minified Bootstrap JS code 2013-12-07 10:27:28 +01:00
Mark Otto
b441632db1 Merge pull request #11761 from twbs/jscs
add JavaScript Code Style checker integration
2013-12-06 19:33:53 -08:00
XhmikosR
2fc2fe75bd Lint docs-assets/js/application.js and docs-assets/js/customizer.js. 2013-12-07 05:05:13 +02:00
XhmikosR
f4087df47e Remove incompatible properties. 2013-12-07 04:52:20 +02:00
Chris Rebert
c1dae1e13c integrate JSCS 2013-12-06 17:26:07 -08:00
Chris Rebert
351f86e1db fix some JS to pass jscs 2013-12-06 17:23:45 -08:00
Chris Rebert
4be126e014 Merge pull request #11745 from XhmikosR/function-spaces
Be consistent with function () spaces
2013-12-06 16:43:09 -08:00
Chris Rebert
650279f703 Merge pull request #11758 from ZDroid/rm-brstck-bower
Drop browserstack.json from bower.json ignore
2013-12-06 13:45:58 -08:00
Zlatan Vasović
c78f3b2712 Drop browserstack.json from bower.json ignore 2013-12-06 22:45:17 +01:00
Zlatan Vasović
78b43d4c99 Darken icon bar to meet WCAG 2013-12-06 22:34:29 +01:00
Mark Otto
01a1c41d49 Merge pull request #11755 from twbs/track-customize-js
track customize.js so that customizer works on GitHub Pages site
2013-12-06 13:21:00 -08:00
Chris Rebert
c545312bd6 need customize.js to be tracked for it to work on GitHub Pages
follow-up to #11738
2013-12-06 11:35:58 -08:00
Chris Rebert
2e9cde6fd9 grunt 2013-12-06 11:33:18 -08:00
Mark Otto
dc34c8a206 Merge pull request #11738 from XhmikosR/min-assets
Minify docs-assets too.
2013-12-06 11:27:19 -08:00
Chris Rebert
e90e602b53 Merge pull request #11742 from vincentchan/master
Added link to Bootstrap in French (in about.html)
2013-12-06 09:44:15 -08:00
Chris Rebert
5e8db4ad11 Merge pull request #11740 from XhmikosR/trailing-spaces
Remove trailing spaces
2013-12-06 09:42:39 -08:00
Luke Noel-Storr
b92bee99ef reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose)
fixes issue twbs/bootstrap#11728
2013-12-06 14:11:58 +00:00
Bohdan Ganicky
9ce7e5620c Updated .scale() mixin so that it accepts optional vertical scale factor parameter. 2013-12-06 14:09:55 +01:00
XhmikosR
5e2ef69e1c Use a space before functions' bracket consistently. 2013-12-06 12:43:48 +02:00
XhmikosR
4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02:00
Vincent Chan
b9ae594ca4 Adding Bootstrap in French 2013-12-06 18:33:20 +08:00
XhmikosR
68a6e57b15 bower.json: remove trailing spaces. 2013-12-06 11:32:57 +02:00
XhmikosR
3de4f23ea2 Minify docs-assets too. 2013-12-06 11:25:29 +02:00
Chris Rebert
7b06538c91 Merge pull request #11723 from stof/patch-1
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 16:53:15 -08:00
Chris Rebert
3b75d64767 Merge pull request #11733 from KostyaTretyak/edit
Fixed some errors in the documentation
2013-12-05 16:50:03 -08:00
kostyatretyak
dde53a56e0 This is error? 2013-12-06 02:28:42 +02:00
Derek Kent
b8b250a5d2 Don't exclude fonts from bower installs
Excluding fonts/ from bower installs causes glyphicons to be
unavailable to projects using development Bootstrap LESS files.
2013-12-05 19:05:32 -05:00
kostyatretyak
4ec13704d2 Fixed another small error 2013-12-06 02:03:35 +02:00
kostyatretyak
3ae7e0afe9 Merge branch 'master' of https://github.com/twbs/bootstrap into edit 2013-12-06 01:36:53 +02:00
Christophe Coevoet
813a4fafb6 Added the removal of tab-content and tab-pane in the migration guide 2013-12-05 17:45:22 +01:00
Mark Otto
6d03173a1a Merge pull request #11718 from KostyaTretyak/once
Added link to Ukrainian translation website (in about.html)
2013-12-05 08:09:10 -08:00
Lukáš Doležal
6e9efb2024 Use document scroll height instead of offset height to support body with absolute height 2013-12-05 16:28:31 +01:00
kostyatretyak
c7e45fa4a7 Added links to Ukrainian translation website 2013-12-05 12:33:55 +02:00
Mark Otto
aac4f0189e one last grunt 2013-12-04 22:54:03 -08:00
Mark Otto
0a5aa8e0a3 Merge pull request #11714 from ZDroid/redundant-comment
Remove redundant, duplicate comment
2013-12-04 22:52:12 -08:00
Zlatan Vasović
01afe84b31 Remove redundant, duplicate comment 2013-12-05 07:43:50 +01:00
Mark Otto
b18d3fb80f Merge branch 'master' of github.com:twbs/bootstrap 2013-12-04 22:34:25 -08:00
Mark Otto
45930acdf7 Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.
Also addresses #10371, #10395, and #10465.
2013-12-04 22:32:56 -08:00
Mark Otto
42bee1ddd5 Merge pull request #11671 from XhmikosR/updates
Update 3rd party asset libraries
2013-12-04 21:58:00 -08:00
Mark Otto
cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
2013-12-04 21:23:09 -08:00
Mark Otto
8c5dc542a5 grunt 2013-12-04 21:22:24 -08:00
Mark Otto
a45d839874 Fixes #11712: Better support for .table-responsive within .panel's 2013-12-04 21:13:33 -08:00
Mark Otto
66f9c7d6d5 Fixes #11436: mention in docs that .container isn't nestable; update docs to mention width, not max-width 2013-12-04 21:10:13 -08:00
Mark Otto
dd28ecd0d5 Merge pull request #11710 from JoahG/bootstrap-thumb
Updates Jumbotron thumbnail
2013-12-04 20:45:57 -08:00