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
11,063 Commits 108 Branches 89 Tags 553 MiB
0ca3fa42e8
Commit Graph

11063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Rebert
68fef8c247 Merge pull request #15867 from twbs/sauce-ios 
Use OS X 10.10 for Sauce iPhone simulator
 2015-02-22 19:33:14 -08:00
Chris Rebert
9bdaf03607 Use OS X 10.10 for Sauce iPhone simulator 
[skip validator]
 2015-02-22 19:01:36 -08:00
Chris Rebert
de31b61e42 Merge pull request #15866 from twbs/bump-sauce 
Bump grunt-saucelabs to ~8.6.0
 2015-02-22 19:00:00 -08:00
Chris Rebert
d8ffd57b93 update shrinkwrap 
[skip validator]
 2015-02-22 18:47:00 -08:00
Chris Rebert
65d209e257 bump grunt-saucelabs to ~8.6.0 2015-02-22 18:42:23 -08:00
Chris Rebert
33d49f6324 Merge pull request #15862 from dante2008/contri-doc-typo 
Fix a typo in the contributing doc.
 2015-02-21 21:28:27 -08:00
dante2008
df2ea49c0a Fix a typo in contributing doc. 2015-02-22 13:59:15 +09:00
Patrick H. Lauke
16a4a44a34 Merge pull request #15861 from patrickhlauke/id-fixup 
Fix copy/pasta'd id on accessibility skiplink callout
 2015-02-21 15:03:31 +00:00
Patrick H. Lauke
36d6af9bcd Fix copy/pasta'd id on accessibility skiplink callout 2015-02-21 15:02:40 +00:00
Patrick H. Lauke
1194f0d481 Merge pull request #15860 from patrickhlauke/url-fixup 
Typo in URL
 2015-02-21 14:05:01 +00:00
Patrick H. Lauke
b9504feb80 Typo in URL 2015-02-21 14:00:04 +00:00
Bootstrap's Grunt bot
02f8cf9d0e automatic grunt dist 2015-02-21 04:21:05 +00:00
Kevin Kirsche
b4a5f89ab3 Fix #15652: Set position: relative on .{radio,checkbox}-inline 
Closes #15656 by merging it.
 2015-02-20 20:10:04 -08:00
Quy Ton
074419298e Fix capitalization/singular of comments in helper class docs 
Closes #15839 by merging a tweaked version of it.
 2015-02-20 20:02:20 -08:00
Chris Rebert
690abbcc0c Merge pull request #15857 from jonchretien/fix-typos-in-docs 
fixed a few typos in the docs
 2015-02-20 18:26:04 -08:00
Jon Chretien
7080e895d8 fixed a few typos in the docs 2015-02-20 17:07:14 -05:00
XhmikosR
89951a6608 Merge pull request #15851 from twbs/deps 
Bump devDependencies
 2015-02-20 22:24:52 +02:00
XhmikosR
e6dbaea97e Run grunt. 2015-02-20 11:35:45 +02:00
XhmikosR
b8a0ea1224 Update dependencies. 2015-02-20 11:35:39 +02:00
Kevin Kirsche
504435e0b0 Fix #15712: Add example of how to use grid system within a modal 
Closes #15725 by merging a tweaked version of it.
 2015-02-19 16:14:06 -08:00
Chris Rebert
e9afc74b01 Dropdown docs: Tweak .dropup copy 2015-02-19 16:01:04 -08:00
Chris Rebert
89455afe97 Affix docs: add MDN link for position: sticky 2015-02-19 15:55:33 -08:00
Chris Rebert
3748e44b2e Merge pull request #15773 from kkirsche/patch-16 
Fix #15766: Clarify Affix plugin docs
 2015-02-19 15:53:49 -08:00
Bootstrap's Grunt bot
9677d6685a automatic grunt dist 2015-02-19 23:51:16 +00:00
Chris Rebert
2549b808a1 Merge pull request #15699 from kkirsche/patch-8 
Fix #15691: .form-control-static changes height when empty
 2015-02-19 15:42:29 -08:00
Kevin Kirsche
0ee7602284 [Fixes #15691] .form-control-static changes height when empty 
[Fixes #15691] .form-control-static changes height when empty by setting the minimum height to the size it is when text is in the `.form-control-static`

JSFiddle: http://jsfiddle.net/4pdo4yzo/

Compute the minimum height

@line-height-computed = ~20px
@font-size-base = 14px

This should come to approx. 34px

Add min-height to from-group-* per @cvrebert

I had this wrong. The minimum height would depend on the font-size of that specific group, thus we need to declare it once for font-size-small and once also for font-size-large
 2015-02-19 18:02:51 -05:00
Kevin Kirsche
744c3646f5 [Fixes #15766] Need Clearer Affix plugin documentation 
[Fixes #15766] Need Clearer Affix plugin documentation

Remove trailing whitespace

Update the documentation
 2015-02-19 16:38:03 -05:00
Luca Mussi
90e7fc418b Added package.js for Meteor integration 
Closes #15716 by merging it.
 2015-02-19 13:11:58 -08:00
Chris Rebert
d0ec850812 Merge pull request #15846 from twbs/doc-15832 
Add Wall of Browser Bugs entries for #15832
 2015-02-19 12:57:33 -08:00
Chris Rebert
9596a51f54 Add Wall of Browser Bugs entries for #15832 
[skip sauce]
 2015-02-19 12:53:00 -08:00
Chris Rebert
0b10c6b060 Merge pull request #15662 from kkirsche/patch-5 
Fix issue #15597 — Mention dropup variation in dropdown docs
 2015-02-19 11:29:24 -08:00
Bootstrap's Grunt bot
ed627ebcfb automatic grunt dist 2015-02-19 04:21:09 +00:00
Bootstrap's Grunt bot
6e0009e18d automatic grunt dist 2015-02-17 19:41:00 +00:00
Mark Otto
a7a6e7f8d6 Merge pull request #15703 from kkirsche/patch-9 
[Fix Issue #15683] `readonly` input should not have a not-allowed cursor
 2015-02-17 11:31:36 -08:00
Kevin Kirsche
02195d366b [Fixes #15825] .initialism class should use mixin 
[Fixes #15825] .initialism class should use text-uppercase() LESS mixin.
 2015-02-17 10:48:12 -05:00
Chris Rebert
0d7b85ece7 Merge pull request #15822 from vsn4ik/upd_npmjs_link 
Use https://www.npmjs.com (new site).
 2015-02-17 00:19:47 -08:00
vsn4ik
1bb3ef3e0b Use https://www.npmjs.com (new site). 2015-02-17 10:01:58 +03:00
Chris Rebert
40961659ac .gitattributes: treat source maps as binary files 2015-02-16 22:27:31 -08:00
Chris Rebert
75b311552e Merge pull request #15778 from twbs/node-012 
Travis: test against node.js 0.12.
 2015-02-16 21:29:50 -08:00
XhmikosR
b9aad573f9 Travis: test against node.js 0.12. 2015-02-16 21:09:32 -08:00
Chris Rebert
fd7c69b30f Merge pull request #15765 from twbs/docs.min.js 
Cleanup usage of & add notes about docs.min.js in examples
 2015-02-16 19:29:58 -08:00
Chris Rebert
a2c7233ac0 Use just holder.js instead of docs.min.js in examples when possible 
And add explanatory comments to the Carousel & Dashboard examples regarding holder.js

[skip sauce]
 2015-02-16 19:17:01 -08:00
Chris Rebert
d13e879042 Remove docs.min.js from Blog & Cover examples since it's unnecessary. 2015-02-16 11:40:42 +02:00
XhmikosR
7a4fadb7b8 Fix carousel example images after c08bf4ba8b. 
The revert was incomplete.
 2015-02-16 11:39:14 +02:00
XhmikosR
4131af8a67 Travis CI: Bump Rouge gem to 1.8.0. 2015-02-16 11:10:28 +02:00
XhmikosR
f60067f859 Merge pull request #15809 from twbs/packages.json-files 
Specify the files to include in the npm package.
 2015-02-16 10:58:48 +02:00
XhmikosR
101cf6b1c0 Specify the files to include in the npm package. 2015-02-15 11:43:36 +02:00
XhmikosR
3b783bd0b5 package.json: change the engine version to >= 0.10.1. 2015-02-14 14:32:16 +02:00
Mark Otto
d4ff583428 Merge pull request #15805 from aroben/patch-1 
Include dist/ files in language stats on GitHub
 2015-02-13 13:36:37 -08:00
Adam Roben
4fc6317b40 Include dist/ files in language stats on GitHub 
GitHub considers Bootstrap files to be vendored files, and excludes them from
repository language statistics. This makes sense for most repositories, where
Bootstrap is indeed third-party code. This repository is the exception; it's
first-party code here, so should count toward the language statistics.
 2015-02-13 16:30:07 -05:00