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

9770 Commits

Author SHA1 Message Date
Chris Rebert
fde088751a regenerate docs.min.js
[skip sauce]
2014-06-26 12:21:45 -07:00
Chris Rebert
2f7d5fd26b docs: minor correction to the focus-triggered popover demo explanation 2014-06-26 12:21:45 -07:00
Chris Rebert
0bc2edd191 add docs JS to activate popover demos; fixes #13937 2014-06-26 12:21:33 -07:00
Chris Rebert
83d9165287 Merge pull request #13946 from rufo/patch-1
Fixed apostrophe typo on home page
2014-06-26 12:12:37 -07:00
Rufo Sanchez
1939d017c5 Fixed crazy-making typo on home page
...at least if you're a writing nerd :P "Bootstrap ships with vanilla CSS, but *its* source code..."
2014-06-26 15:09:59 -04:00
Mark Otto
d79082aac8 Merge pull request #13939 from twbs/tree-shaking
Remove apparent dead code from docs JS
2014-06-26 11:46:45 -07:00
Chris Rebert
248af0e293 Merge pull request #13942 from twbs/docs-grunt-13938
Fix link to compiling info.
2014-06-26 11:38:41 -07:00
XhmikosR
10ea20515c Fix link to compiling info. Fixes #13938.
[skip sauce]
2014-06-26 11:37:08 -07:00
Chris Rebert
c0b3f18c0c rm apparent dead code from docs JS
.bs-docs-navbar class doesn't seem to be used anywhere at all
2014-06-26 10:53:58 -07:00
Chris Rebert
43ecc8726b add comment explaining which demos this JS is for 2014-06-26 10:52:12 -07:00
Chris Rebert
43b7a942bc fix class names in popover live examples in docs 2014-06-26 10:51:07 -07:00
Mark Otto
c068162161 maxcdn urls 2014-06-26 09:36:48 -07:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Thierry Goettelmann
165c7889bd Change cursor from "default" to "not-allowed" if disabled 2014-06-26 16:31:37 +02:00
Thierry Goettelmann
76ca3677f5 Remove "pointer" cursor on disabled list-group-item 2014-06-26 15:50:20 +02:00
Mark Otto
1de2f68bdc Merge branch 'master' of github.com:twbs/bootstrap 2014-06-26 02:49:35 -07:00
Mark Otto
719ebd8239 grunt 2014-06-26 02:49:21 -07:00
Mark Otto
0e5ec1ab7a Merge pull request #13574 from twbs/reinstate-13470
Delete redundant Grunt info in README (Merge before shipping)
2014-06-26 00:06:02 -07:00
Mark Otto
4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
Mark Otto
b6e52d55ea Merge pull request #13905 from Jimtrim/patch-1
Update cover.css
2014-06-25 22:29:02 -07:00
Chris Rebert
5fb1c065eb Mozilla bug says the fix targeted v31 2014-06-25 18:04:49 -07:00
Mark Otto
4045740c54 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-06-25 16:57:22 -07:00
Mark Otto
e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
Thomas Coleman
fdacff2297 Fixed @gray-base value being once space short 2014-06-25 16:09:57 +01:00
Thomas Coleman
41f27fd813 Added @gray-base variable to make @gray-{shade} reference, also allows @gray-base to be modified with less#modifyVars and the vars to cascade 2014-06-25 15:00:41 +01:00
Andrei Railean
ac67bc857f removing redundant background declarations on TDs 2014-06-25 15:16:25 +10:00
Andrei Railean
71974e2f4d assign background to row of .table-striped
if background is not set on row, striping doesn't work properly in responsive tables where row and cells are set to  display: block.
2014-06-25 14:01:34 +10:00
Heinrich Fenkart
282f8fc04b Add a few more cases to the visual test tab page 2014-06-25 04:18:51 +02:00
Heinrich Fenkart
634ea59a25 Allow tabs to fade in if no initially active pane is present; fixes #13814 2014-06-25 04:18:51 +02:00
XhmikosR
4abb095783 Run grunt.
Revert a991cd572c.
2014-06-25 02:07:17 +03:00
XhmikosR
b93b7b1b6d Revert "Revert "Turn off clean-css' advanced optimizations.""
This reverts commit e31c2edf88.
2014-06-25 01:53:10 +03:00
Chris Rebert
a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
Chris Rebert
e31c2edf88 Revert "Turn off clean-css' advanced optimizations."
This reverts commit 25ca51319b.
2014-06-24 14:54:51 -07:00
Chris Rebert
49fe75d138 update shrinkwrap to get clean-css v2.2.3
Refs #13914
Refs https://github.com/GoalSmashers/clean-css/issues/302
2014-06-24 14:49:44 -07:00
Chris Rebert
1aaad6481c Merge pull request #13781 from twbs/saucier
Reenable additional Sauce browsers
2014-06-24 13:18:46 -07:00
Chris Rebert
532dffdd46 reenable Win7 IE8-9 in Sauce 2014-06-24 12:37:44 -07:00
Chris Rebert
6352c85a65 reenable OS X Chrome in Sauce 2014-06-24 12:37:44 -07:00
Chris Rebert
389210fca6 Merge pull request #13918 from twbs/sauce-with-retries
Enable retrying of timed-out Sauce tests
2014-06-24 12:36:18 -07:00
Mark Otto
dad6d4445c Merge pull request #13916 from glebm/variable-order
Move variable declaration before its use (for Sass)
2014-06-24 12:21:10 -07:00
Chris Rebert
6ec5b8cea8 retry each test up to 3 times in the event of timeout
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
2014-06-24 12:17:38 -07:00
Chris Rebert
df1aee56df upgrade grunt-saucelabs to ~8.1.0
update shrinkwrap too
2014-06-24 12:17:24 -07:00
Gleb Mazovetskiy
8ad583063b Move variable declaration before its use for Sass
In Sass, variable must be declared before it is used.
This also removes Miscellaneous section, because horizontal line color
and form / list paddings are Typography.
2014-06-24 18:30:24 +02:00
Chris Rebert
c975f42e04 Merge pull request #13913 from hnrch02/webkit-keyframes
Partly revert cb7eb674ac
2014-06-24 09:12:27 -07:00
XhmikosR
15c63fa137 Run grunt. 2014-06-24 19:01:40 +03:00
XhmikosR
25ca51319b Turn off clean-css' advanced optimizations.
Works around #13914.

We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:

dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
2014-06-24 19:01:40 +03:00
XhmikosR
dc7da296e4 Update dependencies. 2014-06-24 18:58:38 +03:00
Heinrich Fenkart
e9ac7c1e1c Partly revert cb7eb674ac
Fixes #13911
2014-06-24 17:08:16 +02:00
fat
6b6476fcd9 add "focus" to focused btns with button plugin 2014-06-23 23:39:54 -07:00
fat
a0e98adebf Merge branch 'fix-13386' 2014-06-23 23:08:44 -07:00
fat
0aa01f63e3 Merge branch 'master' into fix-13386
Conflicts:
	js/carousel.js
2014-06-23 23:08:23 -07:00