Mark Otto
6315043b1c
Merge branch 'master' into docs_derp
2013-12-18 11:41:48 -08:00
Mark Otto
d15218a09c
Fixes #11899 : Ensure proper margins and .small/small usage for heading tags (e.g., .h1-.h6)
2013-12-18 09:49:05 -08:00
Mark Otto
0d0b5c7ddb
add inline note about navbar sizing
2013-12-18 09:48:04 -08:00
Mark Otto
c1f68dd4d4
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-18 09:42:45 -08:00
Mark Otto
8142493b42
fixes #11925 : cover template for firefox
2013-12-18 09:42:37 -08:00
Mark Otto
b93d6dfbdf
tweaks
2013-12-18 09:42:13 -08:00
Chris Rebert
671fb7020b
Merge pull request #11923 from wangsai/fix-id
...
fix href of "Browser and device support"
2013-12-18 01:05:48 -08:00
wangsai
98ef4284f0
fix href of "Browser and device support"
2013-12-18 16:57:55 +08:00
Mark Otto
91fdd89100
Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btn
...
Fix handling of .btn-group placed inside .input-group-btn
2013-12-17 22:49:55 -08:00
Chris Rebert
36e3311b3e
Merge pull request #11916 from ZDroid/fix-iversions
...
Downgrade Safari and OS X
2013-12-17 11:46:54 -08:00
Zlatan Vasović
575f29cee1
Downgrade Safari and OS X
2013-12-17 20:39:32 +01:00
Chris Rebert
dcfe710fa4
enable failHard grunt-html-validation option; fixes #11876
2013-12-17 01:35:16 -08:00
Chris Rebert
af1afb10bd
upgrade to grunt-html-validation v0.1.11
2013-12-17 01:29:19 -08:00
Sebastian Podjasek
ae640d4f1c
Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)
2013-12-16 22:56:28 +01:00
Chris Rebert
94635eb972
Merge pull request #11893 from twbs/separate-browsers-file
...
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:43:21 -08:00
Chris Rebert
0f72123c43
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16 00:42:45 -08:00
Mark Otto
b6b2c90a7d
Merge branch 'master' into docs_derp
2013-12-16 00:39:50 -08:00
Chris Rebert
2ae39d7166
Merge pull request #11891 from twbs/cache-jekyll-bundle
...
use S3-cached Jekyll install to further speed up the Travis build
2013-12-16 00:02:42 -08:00
Chris Rebert
498f00a244
use S3-cached Jekyll install
2013-12-15 23:52:44 -08:00
Mark Otto
ec261a83a5
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 22:10:05 -08:00
Mark Otto
ca14b9652c
inform the people that fixed positioning ain't all it's cracked up to be /cc #11888
2013-12-15 22:09:45 -08:00
Mark Otto
05b0a74d9a
Merge pull request #11887 from twbs/minor-panels-refactor
...
minor refactoring of 4ee93c9f85
2013-12-15 22:04:57 -08:00
Chris Rebert
6bb73df50e
Merge pull request #11890 from twbs/generic-caching
...
make S3 caching significantly more generic
2013-12-15 21:26:52 -08:00
Chris Rebert
95c72b573e
make S3 caching significantly more generic
2013-12-15 21:12:33 -08:00
Chris Rebert
637b20f6d5
minor refactoring of 4ee93c9f85
2013-12-15 20:56:23 -08:00
Chris Rebert
75db355073
Merge pull request #11886 from twbs/html-validator-config
...
explicitly set more HTML5 validator options
2013-12-15 19:45:34 -08:00
Chris Rebert
43c3d785ef
explicitly set more HTML5 validator options
2013-12-15 19:42:47 -08:00
Chris Rebert
94bdea0054
use unique IDs for input feedback examples so HTML validates
2013-12-15 19:15:26 -08:00
Chris Rebert
f8cee54f4b
use unique IDs for modal labels in doc examples so HTML validates
2013-12-15 19:07:26 -08:00
Chris Rebert
4db1d69e98
simplify JS snippet slightly
2013-12-15 19:00:37 -08:00
Chris Rebert
a2f7c3015e
fix typo in docs
2013-12-15 18:45:56 -08:00
Chris Rebert
023731b4c7
fix var name in example to follow JS conventions
2013-12-15 18:19:10 -08:00
Chris Rebert
be508e043c
copyediting
2013-12-15 18:13:50 -08:00
Mark Otto
4ee93c9f85
Fixes #10492 again, this time for last row's corners on striped tables
2013-12-15 17:22:55 -08:00
Mark Otto
2979e4bcea
Add new form feedback states, clean up existing form styles
...
New stuff:
* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836 .
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.
Clean up:
* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
2013-12-15 17:15:09 -08:00
Mark Otto
d9345ff7d5
Fixes #11266 : Apply a pixel-based line-height to date inputs for iOS 7
2013-12-15 15:27:46 -08:00
Mark Otto
4f22670c6e
formatting and comment
2013-12-15 15:24:52 -08:00
Mark Otto
d1f15baa71
Merge branch 'master' into pr/11817
...
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
2013-12-15 15:07:38 -08:00
Mark Otto
b04a1de9b0
Fixes #11402 : Updated fix for select.form-control width in inline-forms
2013-12-15 14:52:49 -08:00
Mark Otto
24eee65c25
grunt
2013-12-15 14:32:14 -08:00
Mark Otto
6bc7126643
Merge pull request #11494 from blowsie/patch-2
...
Fixed single dropdown-toggle in btn-group-veritcal not being rounded
2013-12-15 14:28:49 -08:00
Mark Otto
393d523cdb
Fixes #11660 : Depcreate small and .small in blockquote in favor of footer
2013-12-15 14:23:55 -08:00
Mark Otto
9023c087db
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 14:14:32 -08:00
Mark Otto
f5c13a3e1b
revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage
2013-12-15 14:14:09 -08:00
Mark Otto
f6fe62cdf7
run grunt on modal scrolling change
2013-12-15 14:13:25 -08:00
Mark Otto
122245fe87
Merge branch 'master' into pr/11676
...
Conflicts:
less/modals.less
2013-12-15 14:10:48 -08:00
Mark Otto
55f6beb427
Merge branch 'master' into pr/11776
...
Conflicts:
package.json
2013-12-15 14:09:50 -08:00
Mark Otto
e7a56df5a2
Merge pull request #11732 from dak/include-dev-fonts-in-bower
...
Don't exclude fonts from bower installs
2013-12-15 14:07:17 -08:00
Mark Otto
56eecf97ac
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-15 13:53:41 -08:00
Mark Otto
ee80b5e1d4
typo
2013-12-15 13:52:56 -08:00
