rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
11,804 Commits 108 Branches 89 Tags 547 MiB
53a3ff74ca
Commit Graph

11804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
XhmikosR
be9d1f436e Specify the files to include in the npm package. 2015-02-16 21:36:41 -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
cdd287da0d Exempt Closure part of Gruntfile from requireCamelCaseOrUpperCaseIdentifiers 
This allows `grunt jscs:grunt` to succeed.
 2015-02-16 17:38:54 -08:00
Chris Rebert
1daca5ac5c Gruntfile: make JSCS happier 2015-02-16 17:18:16 -08:00
Chris Rebert
c12c439171 bump grunt-sass to ~0.18.0 2015-02-16 17:12:22 -08:00
Chris Rebert
6b61bf4762 bump grunt-jscs to ~1.5.0 2015-02-16 17:08:27 -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
Chris Rebert
763f8293da .text-hide docs: trivial indentation fix 2015-02-12 10:41:16 -08:00
Chris Rebert
0fe6ff9fca browser-device-support.html: tweak indentation 2015-02-12 10:40:00 -08:00
Chris Rebert
19a6406ec4 fix indentation of highlighted code in Modal docs 2015-02-12 10:36:15 -08:00
Bootstrap's Grunt bot
6379674f35 automatic grunt dist 2015-02-12 06:41:05 +00:00
Chris Rebert
5f5b148e49 Fix oneskyapp translation links 
Closes #15754
[skip sauce]
 2015-02-11 16:25:51 -08:00
Chris Rebert
51b00ce737 Merge pull request #15788 from gianpaj/patch-1 
Fix link to French translation
 2015-02-11 16:24:02 -08:00
F A T
a5580360ba Merge pull request #93 from twbs/fat-removeAffix 
kill affix
 2015-02-11 11:41:26 -08:00
fat
1e9e3316b6 kill affix 2015-02-11 11:40:57 -08:00
F A T
d71ccaefbc Merge pull request #92 from twbs/fat-removeGz 
remove gz
 2015-02-11 11:37:55 -08:00
fat
2eba4458fa remove gz 2015-02-11 11:37:38 -08:00
F A T
f483640378 Merge pull request #57 from twbs/fat-closure 
Bootstrap onto closure v2
 2015-02-11 11:36:16 -08:00
fat
834220ea20 bootstrap onto closure 2015-02-11 11:29:43 -08:00
Gianfranco Palumbo
5af5d6fa7b Fix link to French translation 2015-02-11 00:23:54 +00:00
Chris Rebert
c8b0f59fbd Merge pull request #15784 from twbs/bump-grunt-html 
Bump grunt-html to ~3.0.0
 2015-02-10 13:05:43 -08:00
Chris Rebert
de90cd7a80 update shrinkwrap 2015-02-10 12:57:39 -08:00
Chris Rebert
0013483d94 bump grunt-html to ~3.0.0 2015-02-10 12:57:00 -08:00
Kevin Kirsche
d78d9dc5d9 Remove separate area for dropup's 
Condense the dropup example
 2015-02-10 08:57:56 -05:00
XhmikosR
81115cd089 Run grunt. 2015-02-10 10:50:57 +02:00