0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

11975 Commits

Author SHA1 Message Date
Mark Otto
9b1d5adf3f change holder from blue to gray 2015-05-28 14:07:45 -07:00
Mark Otto
74d17ab7a0 rewrite much of cards and the docs 2015-05-28 14:07:34 -07:00
Mark Otto
e07cebc90e add flexbox variation for .card-group 2015-05-28 10:37:12 -07:00
Mark Otto
6e3d4331db new card sizing maybe 2015-05-27 19:00:11 -07:00
Mark Otto
4bc58b9a5a when using flexbox, don't add a clearfix
doing so fubars the grid column rounding (in safari at least) and causes layout problems
2015-05-27 17:37:22 -07:00
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
Mark Otto
bd971c49b0 stub out flexbox layout docs 2015-05-22 23:20:21 -07:00
Mark Otto
a335e54573 remove tabindex=-1 as it was causing a weird select state in latest safari on yosemite when clicking anywhere in the negative space of the header 2015-05-22 22:48:12 -07:00
Mark Otto
4238e2057f grunt 2015-05-22 22:34:04 -07:00
Mark Otto
e84bc04e20 button alignment in nav 2015-05-22 22:33:58 -07:00
Mark Otto
ddafee6ece disable flex to start 2015-05-22 22:33:45 -07:00
Chris Rebert
3fe894ba36 Merge pull request #120 from twbs/really-fix-dist-css
Really fix dist-css
2015-05-15 15:12:15 -07:00
Chris Rebert
82c9038f20 Unquote to avoid NUL chars in the output CSS 2015-05-15 12:17:13 -07:00
Chris Rebert
62da5947a8 Permanent proper fix for dist-css
Bump mq4-hover-shim to ^0.2.0

Revert "fix dist css"
This reverts commit b12d4bfa9a.
2015-05-15 12:12:29 -07:00
Mark Otto
33a578070b Merge pull request #119 from twbs/fat-fix-dist-css
fix dist css
2015-05-14 13:16:33 -07:00
fat
b12d4bfa9a fix dist css 2015-05-14 13:13:33 -07:00
fat
dbaffd43c0 Merge pull request #116 from twbs/fat-es6Alert
es6 - wip
2015-05-13 15:01:39 -07:00
fat
6b2b0ed32f al tests passing, dist rebuilt, w/typechecker 2015-05-13 14:52:46 -07:00
fat
eaab1def7a add simple type checker implementation 2015-05-13 14:46:50 -07:00
fat
c2ced2292a fix up tests 2015-05-13 13:46:08 -07:00
fat
b0d142334f fix #15301 2015-05-13 13:43:56 -07:00
fat
7ef0e52fd0 add "focus" option for turning off modal focusing #16050 2015-05-13 13:22:26 -07:00
fat
da495ee24c address https://github.com/twbs/bootstrap/pull/16135 2015-05-13 13:15:11 -07:00
fat
f8b2569ec8 implement global dispose method 2015-05-13 12:48:34 -07:00
fat
dafdd180cd add umd module support in dist 2015-05-13 10:13:34 -07:00
fat
6b251582d6 update attachment -> placement 2015-05-12 16:54:21 -07:00
fat
ab1578465a grunt test-js, grunt dist-js now working 2015-05-12 16:52:54 -07:00
fat
a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat
3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
fat
8eee78ca15 tab es6 2015-05-11 12:29:06 -07:00
fat
2d91494d96 scrollspy es6 2015-05-11 12:05:35 -07:00
fat
ca9c850ebb add getters for Version and Default where applicable
add modal my gawd
2015-05-10 19:45:38 -07:00
fat
bbb97a8660 add dropdown 2015-05-10 13:47:11 -07:00
fat
8bab38bb71 add collapse 2015-05-09 23:04:58 -07:00
fat
1b183e2ff7 carousel -> es6 2015-05-07 22:26:40 -07:00
fat
6605051882 button -> es6 2015-05-07 17:14:38 -07:00
fat
c3a79b1a8c change the export pattern to protect against leaking globals 2015-05-07 16:34:28 -07:00
fat
0724bd91ff es6 alert :| 2015-05-07 12:57:31 -07:00
fat
06b1d49808 Merge pull request #115 from twbs/fat-revertJS
remove closureness from plugins
2015-05-06 13:45:48 -07:00
fat
d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
Chris Rebert
ee33891e42 Merge pull request #60 from twbs/libsass-185
Remove libsass @media nesting bug workaround
2015-05-06 13:29:02 -07:00
Chris Rebert
09fb80568a Merge pull request #114 from twbs/grunt-sass-1
Bump grunt-sass to ^1.0.0
2015-05-06 13:17:17 -07:00
Chris Rebert
1e85e0f891 Bump grunt-sass to ^1.0.0 2015-05-06 13:08:39 -07:00
Mark Otto
68bcb89291 Update buttons.md 2015-04-30 14:39:57 -07:00
Mark Otto
8174f6c409 update buttons role copy
/cc @cvrebert @patrickhlauke
2015-04-30 11:40:54 -07:00
Mark Otto
b8fa32edd2 le grunt 2015-04-29 12:02:02 -07:00
Mark Otto
d31ec33908 Fix no-label checkboxes/radios
Because we use `position: absolute` on our inputs, when there’s no
label the `.checkbox` ends up having no computed height. To avoid
rendering errors when there’s no label text, we reset the `position` to
`static` for normal rendering.
2015-04-29 12:01:57 -07:00
Mark Otto
ed89be1f44 Remove $line-height-computed
We have it set to `1` right now just to avoid compilation errors, but
it’s been replaced everywhere with our new spacer classes anywho. We’ll
likely want to remap that var to custom component vars though (e.g.,
`$pagination-margin` instead of `$spacer-y`).
2015-04-29 12:00:11 -07:00
Mark Otto
7db7e59682 spacing 2015-04-29 11:49:41 -07:00
Mark Otto
b849be2edc rename media query var to match /cc @cvrebert 2015-04-29 11:49:25 -07:00