bfd8f8c83a
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-07 12:18:52 -08:00
b1215d1b2e
Fixes #11193 : Add kbd element styles to indicate user input via keyboard
2013-12-07 12:18:13 -08:00
a691d54436
Merge pull request #11675 from GraceNut/feature/text-justify
...
Added text-justify class to type.less
2013-12-07 11:58:31 -08:00
fe58357df1
Fixes #10884 : Adds .info variant to contextual table classes
2013-12-07 11:56:35 -08:00
c07632e4e8
Reorder button and table variants for consistent order
2013-12-07 11:47:37 -08:00
107b334d34
Fixes #11766 : Use color var for background on badges in buttons to restore proper background to default button badge
2013-12-07 11:45:11 -08:00
2b4fa90902
grunt dist
2013-12-07 11:44:32 -08:00
cc1f95652b
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-07 11:41:02 -08:00
775c29fef6
Fixes #11764 : Add meta data to docs for description, keywords, and authors
2013-12-07 11:40:08 -08:00
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
4032dd0f26
grunt
2013-12-07 11:32:39 -08:00
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
4b84acb9a4
Merge pull request #11765 from ZDroid/docs-min-js
...
Load minified Bootstrap JS code
2013-12-07 11:09:43 -08:00
8087f95ca4
Load minified Bootstrap JS code
2013-12-07 10:27:28 +01:00
b441632db1
Merge pull request #11761 from twbs/jscs
...
add JavaScript Code Style checker integration
2013-12-06 19:33:53 -08:00
2fc2fe75bd
Lint docs-assets/js/application.js and docs-assets/js/customizer.js.
2013-12-07 05:05:13 +02:00
f4087df47e
Remove incompatible properties.
2013-12-07 04:52:20 +02:00
c1dae1e13c
integrate JSCS
2013-12-06 17:26:07 -08:00
351f86e1db
fix some JS to pass jscs
2013-12-06 17:23:45 -08:00
4be126e014
Merge pull request #11745 from XhmikosR/function-spaces
...
Be consistent with function () spaces
2013-12-06 16:43:09 -08:00
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
c78f3b2712
Drop browserstack.json from bower.json ignore
2013-12-06 22:45:17 +01:00
78b43d4c99
Darken icon bar to meet WCAG
2013-12-06 22:34:29 +01:00
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
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
2e9cde6fd9
grunt
2013-12-06 11:33:18 -08:00
dc34c8a206
Merge pull request #11738 from XhmikosR/min-assets
...
Minify docs-assets too.
2013-12-06 11:27:19 -08:00
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
5e8db4ad11
Merge pull request #11740 from XhmikosR/trailing-spaces
...
Remove trailing spaces
2013-12-06 09:42:39 -08:00
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
9ce7e5620c
Updated .scale() mixin so that it accepts optional vertical scale factor parameter.
2013-12-06 14:09:55 +01:00
5e2ef69e1c
Use a space before functions' bracket consistently.
2013-12-06 12:43:48 +02:00
4aad52797c
Use a space after function consistently.
2013-12-06 12:43:48 +02:00
b9ae594ca4
Adding Bootstrap in French
2013-12-06 18:33:20 +08:00
68a6e57b15
bower.json: remove trailing spaces.
2013-12-06 11:32:57 +02:00
3de4f23ea2
Minify docs-assets too.
2013-12-06 11:25:29 +02:00
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
3b75d64767
Merge pull request #11733 from KostyaTretyak/edit
...
Fixed some errors in the documentation
2013-12-05 16:50:03 -08:00
dde53a56e0
This is error?
2013-12-06 02:28:42 +02:00
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
4ec13704d2
Fixed another small error
2013-12-06 02:03:35 +02:00
3ae7e0afe9
Merge branch 'master' of https://github.com/twbs/bootstrap into edit
2013-12-06 01:36:53 +02:00
1bac76af28
Merge branch 'master' into gh-pages
2013-12-05 08:56:33 -08:00
813a4fafb6
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05 17:45:22 +01:00
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
6e9efb2024
Use document scroll height instead of offset height to support body with absolute height
2013-12-05 16:28:31 +01:00
c7e45fa4a7
Added links to Ukrainian translation website
2013-12-05 12:33:55 +02:00
aac4f0189e
one last grunt
2013-12-04 22:54:03 -08:00
0a5aa8e0a3
Merge pull request #11714 from ZDroid/redundant-comment
...
Remove redundant, duplicate comment
2013-12-04 22:52:12 -08:00
01afe84b31
Remove redundant, duplicate comment
2013-12-05 07:43:50 +01:00
Mark Otto