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

12299 Commits

Author SHA1 Message Date
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
Mark Otto
95771f9658 clean up vars file a smidge 2015-04-29 11:48:58 -07:00
Mark Otto
a999a0aff2 remove some callouts on buttons by rewriting things a bit 2015-04-29 11:44:19 -07:00
Mark Otto
52133e41c5 grunt 2015-04-29 11:42:53 -07:00
Mark Otto
19d8585bfa clean up sidebar styles 2015-04-29 11:42:50 -07:00
Mark Otto
47dfdc2880 darker secondary button border color 2015-04-29 11:42:38 -07:00
Mark Otto
a399d19dd3 add comments 2015-04-29 11:32:49 -07:00
Mark Otto
35f45bafed Merge pull request #113 from twbs/at-root-group
Wrap `@viewport` with `@at-root` for nested import support
2015-04-29 11:30:09 -07:00
Mark Otto
9e1c4f0557 Merge pull request #111 from twbs/flex
$enable-flex
2015-04-29 11:28:26 -07:00
XhmikosR
07e76a571d Redo changes needed to hide Copy button. 2015-04-29 08:56:33 +03:00
XhmikosR
438cae9d90 Revert "Update ZeroClipboard and remove Copy buttons when Flash is unavailable"
This reverts commit 229e888929.

ZeroClipboard v2.x drops IE < 9 support.
2015-04-29 08:55:29 +03:00
XhmikosR
16a44c208d Fix dab6a4f0e3. 2015-04-29 08:54:32 +03:00
XhmikosR
3b8e84dc87 Merge pull request #16384 from twbs/cleancss-workaround
dropdowns.less: Add space before IE8 workaround.
2015-04-29 08:49:30 +03:00
Zac Echola
fa2cdd44bc Adds documentation for buttons in link groups
Mostly a duplication of the *Linked items* section, but for buttons.
Includes a note not to use the standard btn classes.
2015-04-28 10:58:42 -05:00
Zac Echola
407e8dc9d8 Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons 2015-04-28 09:45:16 -05:00
XhmikosR
5ca44f94ac Run grunt. 2015-04-28 14:24:37 +03:00
XhmikosR
27ada0f5e2 dropdowns.less: Add space before IE8 workaround.
This in turn works around an issue with clean-css (fixed in 3.2.6). So this basically is just a consistency change.
2015-04-28 14:24:33 +03:00
Bootstrap's Grunt bot
e6438592e9 automatic grunt dist
[ci skip]
2015-04-28 09:20:25 +00:00
XhmikosR
2bc9d70069 Update clean-css to v3.2.6. 2015-04-28 12:12:05 +03:00
XhmikosR
86400070b5 Bump copyright year.
[ci skip]
2015-04-28 11:40:42 +03:00
Bootstrap's Grunt bot
a9137bd621 automatic grunt dist
[ci skip]
2015-04-28 08:19:19 +00:00
XhmikosR
fae8c5d0dc Add package.js in Grunt tasks. 2015-04-28 11:03:37 +03:00
XhmikosR
3e7ca3bbc8 Minor lint tweaks. 2015-04-28 11:03:37 +03:00
Chris Rebert
4e027718a8 Merge pull request #16382 from twbs/bump-sauce
Bump grunt-saucelabs to v8.6.1
2015-04-28 00:56:28 -07:00
Chris Rebert
1eb8c16f49 Bump grunt-saucelabs to v8.6.1 2015-04-28 00:38:47 -07:00
Chris Rebert
8c2d726e17 update shrinkwrap 2015-04-28 00:38:21 -07:00
Braden M. Kelley
4b269037cb Multiple tooltip triggers don't play well together
Fixes issue #16008
2015-04-27 23:03:56 -07:00
Mark Otto
421eacb1b1 Merge pull request #16381 from twbs/docs_anchors
Scope anchorjs to immediate children
2015-04-27 22:25:59 -07:00
Mark Otto
dab6a4f0e3 scope anchorjs to immediate children, fixes #16129 2015-04-27 14:16:27 -07:00
Mark Otto
d9d351e2fe more flex grid stuff 2015-04-27 14:11:07 -07:00
Gleb Mazovetskiy
b832c3cb97 Wrap @viewport with @at-root for nested import
See https://github.com/twbs/bootstrap-sass/pull/805
2015-04-27 20:15:17 +01:00
Bootstrap's Grunt bot
d87b7a037b automatic grunt dist
[ci skip]
2015-04-27 18:30:49 +00:00
F A T
aa479892d5 Merge pull request #16152 from jarthod/tooltip-placement-viewport-fix
Tooltip/popover: Fix auto placement to use viewport
2015-04-27 11:28:54 -07:00
Chris Rebert
cc8567d784 Merge pull request #16379 from twbs/bower-json
More bower.json fixes
2015-04-27 10:52:18 -07:00
Chris Rebert
f1e1411536 bower.json: Add license field
[ci skip]
2015-04-27 10:49:55 -07:00
Chris Rebert
52d8a0c78e bower.json: rm moot version field
Per a325da3d79
2015-04-27 10:44:09 -07:00
Chris Rebert
63f989849d Merge pull request #16378 from twbs/bower-moduleType
bower.json: set `moduleType` to `globals`
2015-04-27 10:39:53 -07:00
Chris Rebert
23445e0cb2 bower.json: set moduleType to globals
Per 632ff90a2c (commitcomment-10914138)
[ci skip]
2015-04-27 10:39:16 -07:00
Mark Otto
15692d5e5b flex variation for media 2015-04-27 01:50:38 -07:00
Mark Otto
391b62f968 stub out flexbox variation for input group 2015-04-27 01:43:30 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Chris Rebert
cdb37dce3a Set box-sizing: border-box on .container-viewport in #16142 testcase
Otherwise, the test doesn't properly fail when the fix is reverted.
2015-04-27 01:23:39 -07:00
Bootstrap's Grunt bot
71597a4424 automatic grunt dist
[ci skip]
2015-04-27 08:20:49 +00:00
Adrien
37a10d37c1 Compare tooltip right offset to viewport right offset (and not width)
Closes #16142 by merging it.
2015-04-27 01:13:16 -07:00
Mark Otto
b9ed61854c grunt 2015-04-27 00:51:34 -07:00
Mark Otto
847b7bc71e fix up file example 2015-04-27 00:51:31 -07:00
Martin Bean
9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
Mark Otto
aee20f7ffc docs note 2015-04-26 07:49:11 -07:00