]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
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
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
Chris Rebert [Sun, 4 Aug 2013 06:16:09 +0000 (23:16 -0700)]
streamline $().dropdown('toggle') description
Chris Rebert [Sun, 4 Aug 2013 06:01:05 +0000 (23:01 -0700)]
JS docs: capitalize Bootstrap
Mark Otto [Sun, 4 Aug 2013 05:44:44 +0000 (22:44 -0700)]
Merge pull request #9056 from twbs/large-to-lg-etc
Greater standardization of sizing terminology
Chris Rebert [Sun, 4 Aug 2013 04:59:30 +0000 (21:59 -0700)]
add missing ref to .btn-xs in button sizes docs
Chris Rebert [Sun, 4 Aug 2013 04:59:01 +0000 (21:59 -0700)]
add .btn-xs to .btn-group example
Chris Rebert [Sun, 4 Aug 2013 04:58:31 +0000 (21:58 -0700)]
rm stray space in components.html
Chris Rebert [Sun, 4 Aug 2013 04:39:57 +0000 (21:39 -0700)]
Greater standardization of sizing terminology
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")
In screen size categories:
* Tiny => Extra small
Mark Otto [Sun, 4 Aug 2013 03:44:41 +0000 (20:44 -0700)]
Merge pull request #9052 from liuyl/inputgroups
fix #9051
liuyl [Sun, 4 Aug 2013 01:27:23 +0000 (09:27 +0800)]
add line-height
Mark Otto [Sat, 3 Aug 2013 23:50:08 +0000 (16:50 -0700)]
Merge pull request #9036 from eratzlaff/3.0.0-wip
Change value with variables for btn-large, btn-small and pagination
Mark Otto [Sat, 3 Aug 2013 23:25:12 +0000 (16:25 -0700)]
Merge pull request #9050 from jonschlinkert/3.0.0-wip
organizes the Gruntfile a bit and makes better use of Grunt conventions
Jon Schlinkert [Sat, 3 Aug 2013 23:03:38 +0000 (19:03 -0400)]
This pull request organizes the Gruntfile, makes better use of Grunt conventions and placates my OCD.
Changes in the Gruntfile:
* Use two spaces for consistency with the rest of the codebase.
* Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow.
* Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats.
* Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD
* Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap.
ran the build to test, everything seems good.
Mark Otto [Sat, 3 Aug 2013 23:01:52 +0000 (16:01 -0700)]
Merge pull request #9045 from naneau/3.0.0-wip
using @line-height-computed in .navbar-nav link
Maurice Fonk [Sat, 3 Aug 2013 19:07:43 +0000 (15:07 -0400)]
using @line-height-computed in .navbar-nav link
When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.
James Holland [Sat, 3 Aug 2013 14:28:17 +0000 (10:28 -0400)]
Update .navbar-toggle to match other navbar el
In place of commit #9040, fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el
Chris Rebert [Sat, 3 Aug 2013 09:24:31 +0000 (02:24 -0700)]
JS docs: put `transitionEnd` within <code>
Chris Rebert [Sat, 3 Aug 2013 09:22:55 +0000 (02:22 -0700)]
JavaScript docs: fix caps of "JS"
Chris Rebert [Sat, 3 Aug 2013 09:21:29 +0000 (02:21 -0700)]
JS docs: fix caps of "CSS" acronym
Elvis Ratzlaff [Sat, 3 Aug 2013 08:52:09 +0000 (04:52 -0400)]
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
Chris Rebert [Sat, 3 Aug 2013 08:27:20 +0000 (01:27 -0700)]
Merge pull request #9037 from ChrisRiddell/horizontal-form-fix
Fix Horizontal form docs
ChrisRiddell [Sat, 3 Aug 2013 08:18:15 +0000 (17:48 +0930)]
fix Horizontal form docs
Elvis Ratzlaff [Sat, 3 Aug 2013 07:59:37 +0000 (03:59 -0400)]
Change value for padding on pagination to variables
Elvis Ratzlaff [Sat, 3 Aug 2013 07:56:06 +0000 (03:56 -0400)]
Change line-height value with variable for btn-large and btn-small
Mark Otto [Sat, 3 Aug 2013 03:19:20 +0000 (20:19 -0700)]
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Sat, 3 Aug 2013 02:58:17 +0000 (19:58 -0700)]
Merge pull request #8939 from frabrunelle/3.0.0-wip
add nav to media object and thumbnails
Mark Otto [Sat, 3 Aug 2013 02:30:03 +0000 (19:30 -0700)]
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Conflicts:
dist/css/bootstrap.min.css
Mark Otto [Sat, 3 Aug 2013 02:05:49 +0000 (19:05 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sat, 3 Aug 2013 01:59:06 +0000 (18:59 -0700)]
Merge pull request #8934 from twbs/generalize-horiz-form-example
use separate `form-group`s in horiz form example for greater generality
Mark Otto [Sat, 3 Aug 2013 01:48:44 +0000 (18:48 -0700)]
move form layouts from input groups back to forms (messed this up in
b281ad64096d919145159ffbc4e1a5b284708d9b )
Mark Otto [Sat, 3 Aug 2013 00:57:19 +0000 (17:57 -0700)]
Remove requirement of `.list-group-flush` when list groups are in panels
Fixes #8900
Chris Rebert [Fri, 2 Aug 2013 23:36:54 +0000 (16:36 -0700)]
fix typo in comment
fat [Fri, 2 Aug 2013 22:13:12 +0000 (15:13 -0700)]
fixes #8957
fat [Fri, 2 Aug 2013 22:10:47 +0000 (15:10 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Fri, 2 Aug 2013 22:10:14 +0000 (15:10 -0700)]
fixes #8955
Mark Otto [Fri, 2 Aug 2013 22:09:48 +0000 (15:09 -0700)]
Tighten up buttons and form controls
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones
Fixes #8707 and #8700.
(Also relevant: #8711)
Mark Otto [Fri, 2 Aug 2013 21:08:58 +0000 (14:08 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Fri, 2 Aug 2013 21:07:26 +0000 (14:07 -0700)]
fixes #9015: bold links not semibold in alerts
Mark Otto [Fri, 2 Aug 2013 21:04:16 +0000 (14:04 -0700)]
Merge pull request #9018 from adamwoodbeck/3.0.0-wip
Added ".col-sm-*" to the grid example per the description above the
Mark Otto [Fri, 2 Aug 2013 20:58:06 +0000 (13:58 -0700)]
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
Conflicts:
dist/css/bootstrap.min.css
Adam Woodbeck [Fri, 2 Aug 2013 20:30:13 +0000 (16:30 -0400)]
Added ".col-sm-*" to the grid example per the description above the
example.
Mark Otto [Fri, 2 Aug 2013 19:48:39 +0000 (12:48 -0700)]
Merge pull request #9017 from jonschlinkert/3.0.0-wip
updates mixins to consistently use semicolons as argument separator.
Jon Schlinkert [Fri, 2 Aug 2013 19:31:13 +0000 (15:31 -0400)]
Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS.
Mark Otto [Fri, 2 Aug 2013 17:11:39 +0000 (10:11 -0700)]
run grunt dist for #8967
Mark Otto [Fri, 2 Aug 2013 17:11:06 +0000 (10:11 -0700)]
Merge pull request #8967 from bassjobsen/patch-2
Update input-groups.less
Mark Otto [Fri, 2 Aug 2013 17:02:46 +0000 (10:02 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip