30deb5697c
grunt
2014-03-09 22:06:14 -07:00
76883ff9b4
Copy change
2014-03-09 22:06:12 -07:00
ccb17f110d
Merge branch 'master' into fix-8869
2014-03-09 22:01:38 -07:00
b1f71e5292
fix grammar in comment in forms.less
2014-03-09 21:35:48 -07:00
a15c24410b
Fixes #12759
...
Ensures proper sizing and alignment of input groups within inline and
navbar forms.
* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
2014-03-09 21:25:51 -07:00
b4d66b7f6b
Fixes #12738
...
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
2014-03-09 20:45:32 -07:00
1a5fb4ef24
Fixes #12843 : Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form
2014-03-09 17:22:52 -07:00
2f955907f9
Fixes #12669 : Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs
2014-03-09 17:12:39 -07:00
37b342b18a
Merge pull request #12993 from twbs/mixin-table-of-contents
...
Mixin table of contents
2014-03-09 16:56:00 -07:00
b69e4d636a
Reorganize mixins and G R U N T
2014-03-09 16:50:30 -07:00
0b415c6099
Merge branch 'master' into mixin-table-of-contents
...
* master:
Fix bad grunt merge and then G R U N T
Reorder the Gruntfile a bit
Fixes #12892 : Link to one of the SO articles on Bootstrap modals and YouTube
Remove unneeded quotes.
Rename generateRawFilesJs to generateRawFiles
Remove redundant parens
Conflicts:
docs/assets/js/raw-files.min.js
test-infra/npm-shrinkwrap.canonical.json
2014-03-09 16:40:40 -07:00
71e9902d9a
Adjusts some section titles to be more explicit.
...
FIXES #12992
2014-03-09 16:25:27 -07:00
4bf0645060
Merge pull request #12977 from ZDroid/var
...
Rename generateRawFilesJs to generateRawFiles
2014-03-10 01:16:30 +02:00
40ce6ca431
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-09 16:16:02 -07:00
4883605624
Fix bad grunt merge and then G R U N T
2014-03-09 16:15:53 -07:00
5f0c0c9ed1
Merge pull request #12975 from ZDroid/parens
...
Remove redundant parens
2014-03-10 01:15:52 +02:00
fc74ee5f67
Changes compiled assets after changing mixins.less
2014-03-09 16:15:35 -07:00
aedee95dbf
Adds basic table of contents for mixins.less. You know for the kids.
2014-03-09 16:13:37 -07:00
b263a0197b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
Gruntfile.js
2014-03-09 16:11:04 -07:00
2f7b04a192
Reorder the Gruntfile a bit
2014-03-09 16:09:36 -07:00
68b3e3f3be
Merge pull request #12986 from twbs/unneeded-quotes
...
Remove unneeded quotes.
2014-03-10 01:07:14 +02:00
aacafb2d5c
Fixes #12892 : Link to one of the SO articles on Bootstrap modals and YouTube
2014-03-09 16:03:46 -07:00
15d4494038
Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert
2014-03-09 15:32:36 -07:00
4d870af2aa
Fixes #12487 : Document required use of position relative for scrollspy
2014-03-09 15:19:26 -07:00
ce634a0ba7
Document shitty situation of multiple .navbar-right classes in #12951
2014-03-09 14:49:52 -07:00
f3dcd4dba4
Merge branch 'master' of github.com:twbs/bootstrap
2014-03-09 14:39:52 -07:00
9920251ca8
Document #12476 bug in the wall of bugs
2014-03-09 14:17:18 -07:00
bc7e6a3f20
Merge pull request #12989 from twbs/bower_ignore
...
Don't ignore every dot file in Bower
2014-03-09 13:52:24 -07:00
27da9728bc
grunt
2014-03-09 13:50:55 -07:00
29f23576ee
Merge pull request #12679 from twbs/sr-only-focusable
...
add .sr-only-focusable
2014-03-09 12:39:29 -07:00
d8bc65b9d0
Merge branch 'master' into sr-only-focusable
2014-03-09 12:32:13 -07:00
1caeca3e01
Don't ignore every dot file in Bower
2014-03-09 12:31:42 -07:00
9d027d2bee
Remove unneeded quotes.
2014-03-09 11:10:52 +02:00
5e6d16ef4d
grunt
2014-03-08 21:05:23 -08:00
54b35d00a4
document position relative firefox bug; cleanup some stuff in the browser bugs page
2014-03-08 20:53:16 -08:00
ef5d8e98e2
Merge branch 'master' into sr-only-focusable
...
Conflicts:
dist/css/bootstrap.css
2014-03-08 20:34:29 -08:00
e4d13e238d
Merge pull request #12983 from twbs/fat-9836
...
fixes #9836
2014-03-08 20:10:04 -08:00
b8ab0c66ac
grunt
2014-03-08 20:03:31 -08:00
4d96e69a55
fixes #9836
2014-03-08 19:45:38 -08:00
90eb52495b
Merge pull request #12982 from twbs/fat-9342
...
fix #9342
2014-03-08 19:38:17 -08:00
74aab91671
grunt
2014-03-08 19:32:40 -08:00
e9cced72fd
fix #9342
2014-03-08 19:20:47 -08:00
4b6e1b6754
grunt dist
2014-03-08 17:40:58 -08:00
7c3881086f
Fix comment
2014-03-08 17:11:48 -08:00
bcfb27b962
grunt
2014-03-08 16:11:24 -08:00
7c9a58f3d9
Merge pull request #12976 from ZDroid/comment
...
Update .hide-text() comment
2014-03-08 15:36:07 -08:00
03701b8d4b
Fixes #12966 : Ensure icon font vars are loaded into Customizer
2014-03-08 15:32:24 -08:00
67c747a109
grunt
2014-03-08 15:30:18 -08:00
c7984d41ca
Merge pull request #12980 from ZDroid/config-yml-quotes
...
Remove redundant _config.yml quotes
2014-03-08 15:08:36 -08:00
dd9946e919
Remove redundant _config.yml quotes
2014-03-08 23:03:28 +01:00
Mark Otto