]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Wed, 7 Aug 2013 00:46:40 +0000 (17:46 -0700)]
some copy editing
Mark Otto [Wed, 7 Aug 2013 00:40:33 +0000 (17:40 -0700)]
Merge branch '3.0.0-wip' into bs3_third_party_support_docs
Mark Otto [Wed, 7 Aug 2013 00:29:52 +0000 (17:29 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 7 Aug 2013 00:29:41 +0000 (17:29 -0700)]
Pull from GitHub downloads for latest v3-wip on homepage
/cc @cv
Mark Otto [Wed, 7 Aug 2013 00:28:02 +0000 (17:28 -0700)]
Fixes #8749: prevent navbar nav from overlapping navbar toggle
Mark Otto [Tue, 6 Aug 2013 23:45:16 +0000 (16:45 -0700)]
Merge pull request #9171 from twbs/bs3_winph8_ie10_bug_town_usa_omgwtfbbq
Fixes #9162: add mention of Windows Phone 8 and IE10 bugs with responsive foo
Mark Otto [Tue, 6 Aug 2013 23:39:18 +0000 (16:39 -0700)]
Fix #9174: pad bottom of navbar collapsed content and clear floated contents
Mark Otto [Tue, 6 Aug 2013 23:30:28 +0000 (16:30 -0700)]
add third party support section to the docs
Mark Otto [Tue, 6 Aug 2013 23:02:07 +0000 (16:02 -0700)]
grunt dist on previous commit
Mark Otto [Tue, 6 Aug 2013 22:52:06 +0000 (15:52 -0700)]
For @cvrebert
Mark Otto [Tue, 6 Aug 2013 22:41:50 +0000 (15:41 -0700)]
Merge pull request #8731 from nrw/patch-1
Format multiple badges in list-group-item
Mark Otto [Tue, 6 Aug 2013 22:21:26 +0000 (15:21 -0700)]
fixes #9162: add mention of Windows Phone 8 and IE10 bugs with responsive foo
Mark Otto [Tue, 6 Aug 2013 21:57:14 +0000 (14:57 -0700)]
grunt dist on spacing change
Chris Rebert [Tue, 6 Aug 2013 21:25:17 +0000 (14:25 -0700)]
Merge pull request #9169 from bwhitty/3.0.0-wip
Fix spacing after '=' in popover.js
Braden Whitten [Tue, 6 Aug 2013 21:02:57 +0000 (17:02 -0400)]
Fix spacing after '='
Just added a space after a function definition to tidy up the code.
Chris Rebert [Tue, 6 Aug 2013 21:01:10 +0000 (14:01 -0700)]
update phantomjs link
Chris Rebert [Tue, 6 Aug 2013 20:17:20 +0000 (13:17 -0700)]
Merge pull request #9165 from twbs/browserstack
Browserstack testing integration (rebased, squashed, tweaked)
Chris Rebert [Tue, 6 Aug 2013 07:39:35 +0000 (00:39 -0700)]
only run browserstack tests in Travis
Rohan Jain [Tue, 30 Jul 2013 16:41:17 +0000 (22:11 +0530)]
Integrate testing with browserstack
Chris Rebert [Tue, 6 Aug 2013 19:09:44 +0000 (12:09 -0700)]
Fix #9132, but in the correct branch
People, don't PR against `gh-pages` please!
Mark Otto [Tue, 6 Aug 2013 18:40:02 +0000 (11:40 -0700)]
fixes #9140: use correct var in tables
Mark Otto [Tue, 6 Aug 2013 18:18:53 +0000 (11:18 -0700)]
Fixes #9145: Fix tooltip opacity
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
Mark Otto [Tue, 6 Aug 2013 18:18:12 +0000 (11:18 -0700)]
Fixes #9150: Hide popover titles in IE8
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
Mark Otto [Tue, 6 Aug 2013 16:46:58 +0000 (09:46 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Chris Rebert [Tue, 6 Aug 2013 16:28:04 +0000 (09:28 -0700)]
Merge pull request #9157 from alienlebarge/3.0.0-wip
Add links to Recess, Uglify-js & PhantomJS in README
Cédric Aellen [Tue, 6 Aug 2013 13:06:25 +0000 (15:06 +0200)]
Link to phantomjs
Cédric Aellen [Tue, 6 Aug 2013 13:04:52 +0000 (15:04 +0200)]
link to Uglify-js repo
Cédric Aellen [Tue, 6 Aug 2013 12:57:34 +0000 (14:57 +0200)]
links to Recess repo
Mark Otto [Tue, 6 Aug 2013 03:55:30 +0000 (20:55 -0700)]
Scope tablet classes to tablets range only
Fixes #9128
Chris Rebert [Tue, 6 Aug 2013 03:32:07 +0000 (20:32 -0700)]
Merge pull request #9134 from neilhem/3.0.0-wip
remove repeated 'pagination' class in code example
Rakhat Jabagin [Tue, 6 Aug 2013 03:19:07 +0000 (09:19 +0600)]
remove repeated 'pagination' class in code example
Mark Otto [Tue, 6 Aug 2013 03:01:45 +0000 (20:01 -0700)]
Merge pull request #9123 from twbs/bs3_alerts_default_class
Update labels to include a base class (fixes #8752)
Mark Otto [Tue, 6 Aug 2013 03:00:23 +0000 (20:00 -0700)]
Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Tue, 6 Aug 2013 02:36:19 +0000 (19:36 -0700)]
Merge pull request #9130 from twbs/straight-up-wrong
Fix pixel values in Responsive Utilities docs to match the actual code
Chris Rebert [Tue, 6 Aug 2013 00:43:29 +0000 (17:43 -0700)]
Fix pixel values in Responsive Utilities docs to match the actual code
Mark Otto [Mon, 5 Aug 2013 23:16:58 +0000 (16:16 -0700)]
fixes #8647: remove focus outline on :focus of buttons in button groups
Mark Otto [Mon, 5 Aug 2013 23:15:43 +0000 (16:15 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 5 Aug 2013 23:15:36 +0000 (16:15 -0700)]
remove dupe border-box
Mark Otto [Mon, 5 Aug 2013 23:14:48 +0000 (16:14 -0700)]
Merge pull request #9124 from geedmo/3.0.0-wip
Fix Issue #8175 - .input-group-addon broken in Firefox
Mark Otto [Mon, 5 Aug 2013 23:03:10 +0000 (16:03 -0700)]
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
customize.html
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
geedmo [Mon, 5 Aug 2013 22:58:38 +0000 (19:58 -0300)]
Fix Issue #8175 - remove lh for input-lg|sm
geedmo [Mon, 5 Aug 2013 22:43:39 +0000 (19:43 -0300)]
Fix Issue #8175
Mark Otto [Mon, 5 Aug 2013 22:40:22 +0000 (15:40 -0700)]
Merge pull request #9121 from Flydiverny/alerts
Added padding variable for alerts and changed customize.html
Mark Otto [Mon, 5 Aug 2013 22:35:16 +0000 (15:35 -0700)]
Remove dupe hover background color
Mark Otto [Mon, 5 Aug 2013 22:30:28 +0000 (15:30 -0700)]
Update labels to include a base class
* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
Markus Maga [Mon, 5 Aug 2013 22:29:19 +0000 (00:29 +0200)]
Comma for clarification
Markus Maga [Mon, 5 Aug 2013 22:06:57 +0000 (00:06 +0200)]
Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore)
Mark Otto [Mon, 5 Aug 2013 21:45:00 +0000 (14:45 -0700)]
Fixes #8732: unfucks disabled fieldset form example with form groups
Mark Otto [Mon, 5 Aug 2013 21:20:46 +0000 (14:20 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 5 Aug 2013 21:19:32 +0000 (14:19 -0700)]
Enable scrollable responsive nav bar
Fixes #9007 in a hopefully decent way
Chris Rebert [Mon, 5 Aug 2013 20:13:54 +0000 (13:13 -0700)]
carousel.less: copyedit explanatory comment
Mark Otto [Mon, 5 Aug 2013 19:20:52 +0000 (12:20 -0700)]
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Mon, 5 Aug 2013 19:17:09 +0000 (12:17 -0700)]
Fixes #8150: add `.static-form-control` for vertical alignment of static form text
- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
Mark Otto [Mon, 5 Aug 2013 18:59:32 +0000 (11:59 -0700)]
Fixes #8872: widen the carousel indicators to prevent wrapping
Mark Otto [Mon, 5 Aug 2013 18:47:12 +0000 (11:47 -0700)]
Fixes #8795, a reoccurence of #1969
Mark Otto [Mon, 5 Aug 2013 18:30:59 +0000 (11:30 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 5 Aug 2013 18:30:50 +0000 (11:30 -0700)]
More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
Chris Rebert [Mon, 5 Aug 2013 17:50:23 +0000 (10:50 -0700)]
Merge pull request #9110 from chrisseaton/help-block-fix
Update css.html
Chris Seaton [Mon, 5 Aug 2013 17:48:51 +0000 (18:48 +0100)]
Update css.html
.help-block talks about being 'longer', but with .help-inline gone, it's not longer than anything and the comparison is confusing.
Mark Otto [Mon, 5 Aug 2013 16:10:52 +0000 (09:10 -0700)]
Fixes #8770: mobile-first (stacked by default) horizontal dls
Mark Otto [Mon, 5 Aug 2013 16:02:59 +0000 (09:02 -0700)]
Fixes #8786 (part 2): new default button styles
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
Mark Otto [Mon, 5 Aug 2013 15:52:22 +0000 (08:52 -0700)]
Fixes #8786 (part 1): darken hover states on buttons
Mark Otto [Mon, 5 Aug 2013 15:45:51 +0000 (08:45 -0700)]
Fixes #9049: switch order of gradient mixin params to avoid problems for upgraders
Mark Otto [Mon, 5 Aug 2013 15:33:15 +0000 (08:33 -0700)]
Fixes #9073: add note to homepage about download differences
Mark Otto [Mon, 5 Aug 2013 15:23:39 +0000 (08:23 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 5 Aug 2013 15:17:41 +0000 (08:17 -0700)]
more docs changes
Mark Otto [Mon, 5 Aug 2013 15:13:44 +0000 (08:13 -0700)]
update modals demo code
Mark Otto [Mon, 5 Aug 2013 15:11:13 +0000 (08:11 -0700)]
Clean up mixins, fix #9100 (no ms-keyframes)
- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
Mark Otto [Mon, 5 Aug 2013 15:01:33 +0000 (08:01 -0700)]
typo
Chris Rebert [Mon, 5 Aug 2013 10:02:34 +0000 (03:02 -0700)]
Merge pull request #9097 from trevorah/patch-1
fixed small typo
Andy Trevorah [Mon, 5 Aug 2013 09:50:31 +0000 (10:50 +0100)]
fixed small typo
its => belonging to it
it's => it is / it has
Chris Rebert [Mon, 5 Aug 2013 09:41:45 +0000 (02:41 -0700)]
Merge pull request #9091 from liuyl/docs
remove image description from docs
liuyl [Mon, 5 Aug 2013 09:01:44 +0000 (17:01 +0800)]
remove image description
Mark Otto [Mon, 5 Aug 2013 07:50:40 +0000 (00:50 -0700)]
fixes #8832 and #8823: remove max-width from .navbar-brand when not mobile
Mark Otto [Mon, 5 Aug 2013 07:47:23 +0000 (00:47 -0700)]
fixes #9063: add var for navbar border radius
Mark Otto [Mon, 5 Aug 2013 07:39:03 +0000 (00:39 -0700)]
run grunt dist
Mark Otto [Mon, 5 Aug 2013 07:38:18 +0000 (00:38 -0700)]
update docs nav to use new stuff
Mark Otto [Mon, 5 Aug 2013 07:07:19 +0000 (00:07 -0700)]
Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1
Mark Otto [Mon, 5 Aug 2013 07:03:24 +0000 (00:03 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Chris Rebert [Mon, 5 Aug 2013 06:45:03 +0000 (23:45 -0700)]
Merge pull request #9087 from eratzlaff/3.0.0-wip
Update documentation on offset for small medium and large devices.
Mark Otto [Mon, 5 Aug 2013 06:44:02 +0000 (23:44 -0700)]
Fixes #9061: Panel titles should inherit color when linked
Mark Otto [Mon, 5 Aug 2013 06:27:15 +0000 (23:27 -0700)]
fixes #8805: ensure .active buttons in button groups behave like :active buttons
Mark Otto [Mon, 5 Aug 2013 06:20:55 +0000 (23:20 -0700)]
fixes #8793: remove padding-right from inputs with state changes
Elvis Ratzlaff [Mon, 5 Aug 2013 06:19:14 +0000 (02:19 -0400)]
Update documentation on offset for small medium and large devices. "Grid options"
Mark Otto [Mon, 5 Aug 2013 06:16:06 +0000 (23:16 -0700)]
Merge pull request #9081 from vsn4ik/rem_type_attr
Remove type attribute of tag "script".
Mark Otto [Mon, 5 Aug 2013 06:05:54 +0000 (23:05 -0700)]
Enable input focus state customization
- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.
Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
Mark Otto [Mon, 5 Aug 2013 05:30:09 +0000 (22:30 -0700)]
Fixes #8723: allow modals to not need the .fade class /cc @fat
Mark Otto [Mon, 5 Aug 2013 05:25:58 +0000 (22:25 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 5 Aug 2013 05:16:41 +0000 (22:16 -0700)]
Merge pull request #9079 from liuyl/buttongroups
Fix #7108: btn group styling
Mark Otto [Mon, 5 Aug 2013 04:09:05 +0000 (21:09 -0700)]
run grunt dist
vsn4ik [Mon, 5 Aug 2013 01:40:25 +0000 (05:40 +0400)]
Remove type attribute of tag "script".
In HTML5 in tag script, the type attribute is no longer required. The default value is "text/javascript".
http://www.w3.org/TR/html5/scripting-1.html#attr-script-type
Chris Rebert [Mon, 5 Aug 2013 00:36:08 +0000 (17:36 -0700)]
tooltip.js: add missing space
liuyl [Mon, 5 Aug 2013 00:29:01 +0000 (08:29 +0800)]
btngroups
fat [Mon, 5 Aug 2013 00:22:49 +0000 (17:22 -0700)]
fixes #8880
fat [Sun, 4 Aug 2013 22:45:51 +0000 (15:45 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Sun, 4 Aug 2013 22:45:27 +0000 (15:45 -0700)]
remove js anchor interference
Chris Rebert [Sun, 4 Aug 2013 07:06:56 +0000 (00:06 -0700)]
trivial docs grammar improvements
Chris Rebert [Sun, 4 Aug 2013 06:45:08 +0000 (23:45 -0700)]
Merge pull request #9059 from twbs/nested-btn-groups-docs
adjust description & give source for nested `.btn-group`s example
Chris Rebert [Sun, 4 Aug 2013 06:34:26 +0000 (23:34 -0700)]
adjust description & give source for nested `.btn-group`s example
Chris Rebert [Sun, 4 Aug 2013 06:23:40 +0000 (23:23 -0700)]
components.html: rm disconnected sentence fragment