0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

5432 Commits

Author SHA1 Message Date
Mark Otto
844df9e001 Fixes #8732: unfucks disabled fieldset form example with form groups 2013-08-05 14:45:00 -07:00
Mark Otto
bfe76273a0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 14:20:46 -07:00
Mark Otto
c15f5a89a0 Enable scrollable responsive nav bar
Fixes #9007 in a hopefully decent way
2013-08-05 14:19:32 -07:00
Chris Rebert
c321adf289 carousel.less: copyedit explanatory comment 2013-08-05 13:13:54 -07:00
Mark Otto
96136dbb56 Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 12:20:52 -07:00
Mark Otto
e23906faca 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
2013-08-05 12:17:09 -07:00
Mark Otto
bac9e80a46 Fixes #8872: widen the carousel indicators to prevent wrapping 2013-08-05 11:59:32 -07:00
Mark Otto
a82ca0f9e1 Fixes #8795, a reoccurence of #1969 2013-08-05 11:47:12 -07:00
Mark Otto
d0d8ab8364 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 11:30:59 -07:00
Mark Otto
01c46bfc0f More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Chris Rebert
7fe1c1d78d Merge pull request #9110 from chrisseaton/help-block-fix
Update css.html
2013-08-05 10:50:23 -07:00
Chris Seaton
ea17069f6e 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.
2013-08-05 18:48:51 +01:00
Mark Otto
6af693d160 Fixes #8770: mobile-first (stacked by default) horizontal dls 2013-08-05 09:10:52 -07:00
Mark Otto
41eef69e6f Fixes #8786 (part 2): new default button styles
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
2013-08-05 09:02:59 -07:00
Mark Otto
2ee9bea890 Fixes #8786 (part 1): darken hover states on buttons 2013-08-05 08:52:22 -07:00
Mark Otto
e85b8f315f Fixes #9049: switch order of gradient mixin params to avoid problems for upgraders 2013-08-05 08:45:51 -07:00
Mark Otto
550493a87e Fixes #9073: add note to homepage about download differences 2013-08-05 08:33:15 -07:00
Mark Otto
38a0eb6f77 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 08:23:39 -07:00
Mark Otto
e92518aec2 more docs changes 2013-08-05 08:17:41 -07:00
Mark Otto
233eef6861 update modals demo code 2013-08-05 08:13:44 -07:00
Mark Otto
d6ed590e83 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
2013-08-05 08:11:13 -07:00
Mark Otto
7a98af5ec8 typo 2013-08-05 08:01:33 -07:00
Chris Rebert
2dcc9db6a3 Merge pull request #9097 from trevorah/patch-1
fixed small typo
2013-08-05 03:02:34 -07:00
Andy Trevorah
5e9af6578c fixed small typo
its => belonging to it
it's => it is / it has
2013-08-05 10:50:31 +01:00
Chris Rebert
39e1261de1 Merge pull request #9091 from liuyl/docs
remove image description from docs
2013-08-05 02:41:45 -07:00
liuyl
e444baa22f remove image description 2013-08-05 17:01:44 +08:00
Mark Otto
d2389ec7c4 fixes #8832 and #8823: remove max-width from .navbar-brand when not mobile 2013-08-05 00:50:40 -07:00
Mark Otto
11e46845b2 fixes #9063: add var for navbar border radius 2013-08-05 00:47:23 -07:00
Mark Otto
52266cfdcd run grunt dist 2013-08-05 00:39:03 -07:00
Mark Otto
42e78c322b update docs nav to use new stuff 2013-08-05 00:38:18 -07:00
Mark Otto
2a2acb6bf2 Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1 2013-08-05 00:07:19 -07:00
Mark Otto
7f632ef5b4 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 00:03:24 -07:00
Chris Rebert
88652f745f Merge pull request #9087 from eratzlaff/3.0.0-wip
Update documentation on offset for small medium and large devices.
2013-08-04 23:45:03 -07:00
Mark Otto
a2823d0f5e Fixes #9061: Panel titles should inherit color when linked 2013-08-04 23:44:02 -07:00
Mark Otto
d95ff9da81 fixes #8805: ensure .active buttons in button groups behave like :active buttons 2013-08-04 23:27:15 -07:00
Mark Otto
f62ea2afe2 fixes #8793: remove padding-right from inputs with state changes 2013-08-04 23:20:55 -07:00
Elvis Ratzlaff
9c14fe6044 Update documentation on offset for small medium and large devices. "Grid options" 2013-08-05 02:19:14 -04:00
Mark Otto
222ea8cb71 Merge pull request #9081 from vsn4ik/rem_type_attr
Remove type attribute of tag "script".
2013-08-04 23:16:06 -07:00
Mark Otto
73c048578d 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
2013-08-04 23:05:54 -07:00
Mark Otto
2641fed73f Fixes #8723: allow modals to not need the .fade class /cc @fat 2013-08-04 22:30:09 -07:00
Mark Otto
5e637313b7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-04 22:25:58 -07:00
Mark Otto
6bebecfb28 Merge pull request #9079 from liuyl/buttongroups
Fix #7108: btn group styling
2013-08-04 22:16:41 -07:00
Mark Otto
300a9e7b5a run grunt dist 2013-08-04 21:09:05 -07:00
vsn4ik
efc7514f9f 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
2013-08-05 05:40:25 +04:00
Chris Rebert
180034a4b4 tooltip.js: add missing space 2013-08-04 17:36:08 -07:00
liuyl
584759eac0 btngroups 2013-08-05 08:29:01 +08:00
fat
2b6ec38987 fixes #8880 2013-08-04 17:22:49 -07:00
fat
f22a077f6e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-04 15:45:51 -07:00
fat
b1d21731ad remove js anchor interference 2013-08-04 15:45:27 -07:00
Chris Rebert
b6390d298a trivial docs grammar improvements 2013-08-04 00:06:56 -07:00