rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Code Issues Actions Packages Releases Activity
10,481 Commits 108 Branches 89 Tags 553 MiB
7e27e749d1
Commit Graph

10481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heinrich Fenkart
94b544c229 grunt 2014-10-29 04:44:52 +01:00
Heinrich Fenkart
36e3d07c12 Merge pull request #14686 from twbs/collapsed-class-manual-invocation 
Handle `collapsed` class on triggers even when manually invoked
 2014-10-29 04:42:38 +01:00
Heinrich Fenkart
ed3a65f084 Handle collapsed class on triggers even when manually invoked 
Fixes #13636.
 2014-10-29 04:34:05 +01:00
Heinrich Fenkart
a7f58a8356 grunt 2014-10-29 04:30:31 +01:00
Heinrich Fenkart
e851b8685a Merge pull request #14457 from hnrch02/button-set-val-after-event-loop 
Change value of stateful button after event loop
 2014-10-29 04:28:22 +01:00
Chris Rebert
2aac61ed17 Merge pull request #14901 from twbs/translate3d-ios-bug 
Add `transform: translate3d(0, 0, 0)` iOS Safari bug to the Wall
 2014-10-28 18:01:20 -07:00
Chris Rebert
a7fd40950b Add transform: translate3d(0, 0, 0) iOS Safari bug to the Wall 
Closes #14603 (again)
[skip sauce]
 2014-10-28 17:54:59 -07:00
Mark Otto
4f6aeaa634 Add labels explanation to readme 2014-10-28 17:41:25 -07:00
Mark Otto
2758cfecd8 Merge pull request #14885 from twbs/remove-baseurl 
Remove `baseurl` as it doesn't serve any real purpose.
 2014-10-28 17:21:04 -07:00
Chris Rebert
ca63e387b9 Merge pull request #14899 from twbs/a-href-s 
add missing hrefs to <a>s in docs+examples
 2014-10-28 17:05:52 -07:00
Chris Rebert
d87a636ff9 add missing href="#" to .btn-group-justified example 
[skip sauce]
 2014-10-28 16:10:43 -07:00
Chris Rebert
3eec86e2e5 add missing hrefs to <a>s in docs+examples 2014-10-28 16:05:32 -07:00
Chris Rebert
780c9b05fe reads more smoothly 
For @XhmikosR
 2014-10-28 13:11:35 -07:00
Chris Rebert
5589a82e80 update shrinkwrap 2014-10-28 11:35:21 -07:00
Chris Rebert
223d9b4b6b Merge branch 'master' into jonschlinkert/master 2014-10-28 11:10:51 -07:00
Mark Otto
bf3be5a456 swap cursor not-allow for default, and use a variable for all disabled elements 2014-10-27 20:45:46 -07:00
Mark Otto
a5497da5be grunt 2014-10-27 20:37:17 -07:00
Mark Otto
892f6e35b8 Merge branch 'master' of github.com:twbs/bootstrap 2014-10-27 20:30:02 -07:00
Chris Rebert
de62dcaf53 Merge pull request #14886 from twbs/customizer-clearfix 
Customizer: add clearfixes to rows and simplify .bs-customizer-input to .col-xs-4
 2014-10-27 16:36:03 -07:00
Chris Rebert
5e1af10ecb Merge pull request #14888 from twbs/fix-14851 
Increase timeouts in tooltip unit tests to avoid spurious Sauce failures
 2014-10-27 16:29:31 -07:00
Chris Rebert
22e1f94b52 Increase timeouts in tooltip unit tests to avoid spurious Sauce failures 
Fixes #14851
 2014-10-27 15:53:43 -07:00
Chris Rebert
ea86605203 Merge pull request #14887 from twbs/ios-8-sauce 
Update Sauce iOS Safari test to iOS 8.0
[skip validator]
 2014-10-27 15:41:08 -07:00
Mark Otto
0723060b89 Merge branch 'master' of github.com:twbs/bootstrap 2014-10-27 15:36:26 -07:00
Chris Rebert
0b9f69b9c8 Update Sauce iOS Safari test to iOS 8.0 
[skip validator]
 2014-10-27 15:26:55 -07:00
Chris Rebert
96801605a4 tweak banner of autogenerated CommonJS module 2014-10-27 15:20:55 -07:00
Chris Rebert
a43d4767ba .bs-customizer-input => .col-xs-4 2014-10-27 15:02:21 -07:00
Chris Rebert
032a5ab72f add clearfix divs to customizer input rows 2014-10-27 15:00:30 -07:00
Chris Rebert
af70ac8ae1 Tweak parser to ignore empty Less section docstrings; fixes #14878 2014-10-27 13:50:45 -07:00
XhmikosR
3908235e0f Remove baseurl as it doesn't serve any real purpose. 2014-10-27 19:35:59 +02:00
Mark Otto
dcee894a8c grunt 2014-10-26 22:57:38 -07:00
Mark Otto
c672f9e079 Merge pull request #14881 from bhamodi/white-space-optimization 
Removed unnecessary new lines that were inconsistent with the current formatting style.
 2014-10-26 22:56:35 -07:00
Baraa
f0fd6df63a Removed unnecessary new lines that were inconsistent with current style. 2014-10-26 22:33:55 -07:00
Mark Otto
66bb0b4fc9 Merge branch 'master' into need-to-activate-animated-progressbar 2014-10-26 14:43:32 -07:00
Mark Otto
05c785bfae grunt 2014-10-26 14:42:06 -07:00
Mark Otto
657ff31c74 Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar 
Conflicts:
	docs/_includes/components/progress-bars.html
	docs/assets/js/src/application.js
 2014-10-26 14:17:14 -07:00
XhmikosR
554568a184 Merge pull request #14876 from twbs/fix-14875 
bs-commonjs-generator.js: always use forward slashes in the require path.
 2014-10-26 22:13:54 +02:00
Heinrich Fenkart
66e140db82 Docs: progress bars' animation now needs to be manually toggled 
Refs #14409
 2014-10-26 20:43:41 +01:00
Julian Thilo
d40288b0c0 Merge pull request #14880 from danieljuhl/patch-2 
Added link to danish translation of docs
 2014-10-26 15:45:26 +01:00
Daniel Juhl
b171451d77 Added link to danish translation of docs 2014-10-26 15:04:37 +01:00
jonschlinkert
3e9b461766 Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable). 
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html)
  - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark)
  - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
 2014-10-26 06:38:10 -04:00
XhmikosR
37facee922 bs-commonjs-generator.js: always use forward slashes in the require path. 
Since `path.resolve` is using backslashes on Windows, we ended up with different files. Just replace those with forward slashes.
 2014-10-26 09:35:14 +02:00
XhmikosR
bab3679d10 Losslessly compress apple-touch-icon.png. 
6314 -> 6140 bytes

[ci skip]
 2014-10-26 08:08:33 +02:00
Mark Otto
743aaf6100 fix clipboard button and examples 2014-10-25 22:39:01 -07:00
Heinrich Fenkart
97b4364452 Docs: progress bars' animation now needs to be manually toggled 
Refs #14409
 2014-10-26 06:17:05 +01:00
Mark Otto
5eb08f5d8d Merge pull request #14748 from twbs/apple-touch-icon 
Docs: Use a 180x180 apple-touch-icon-precomposed.png.
 2014-10-25 21:02:08 -07:00
Heinrich Fenkart
007fbdb66d Remove faulty unit test from 9740d8b 
This would only work with transitions but since we disable them for unit tests, this delivers unreliably results.
 2014-10-26 04:56:52 +01:00
Mark Otto
af2fe1d76b new icon 2014-10-25 20:49:10 -07:00
Heinrich Fenkart
5da85f8e8b Follow-up to 9740d8b: fix small typo 2014-10-26 04:41:47 +01:00
Heinrich Fenkart
2cbb1d9374 grunt 2014-10-26 04:39:49 +01:00
Phil Hughes
9740d8bb69 Fix tooltip occasionally not hiding when using a hide delay 
Fixes #14375.
Closes #14519 by merging it.
 2014-10-26 04:38:18 +01:00