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
Jason Diamond
fb57eda268
use quotes to allow dots in data-parent
2013-08-04 23:59:57 -07:00
Jason Diamond
700e742a9c
failing test for dot in data-parent
2013-08-04 23:59:30 -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
Chris Rebert
509ffe110e
Merge pull request #9059 from twbs/nested-btn-groups-docs
...
adjust description & give source for nested `.btn-group`s example
2013-08-03 23:45:08 -07:00
Chris Rebert
19e8342c7a
adjust description & give source for nested .btn-groups example
2013-08-03 23:34:27 -07:00
Chris Rebert
a84e07b272
components.html: rm disconnected sentence fragment
2013-08-03 23:23:40 -07:00
Chris Rebert
899c147cd5
streamline $().dropdown('toggle') description
2013-08-03 23:16:09 -07:00
Chris Rebert
eed4844fd2
JS docs: capitalize Bootstrap
2013-08-03 23:01:05 -07:00
Mark Otto
c45edbe6b5
Merge pull request #9056 from twbs/large-to-lg-etc
...
Greater standardization of sizing terminology
2013-08-03 22:44:44 -07:00
Chris Rebert
cabcd36019
add missing ref to .btn-xs in button sizes docs
2013-08-03 21:59:30 -07:00
Chris Rebert
b9c572184f
add .btn-xs to .btn-group example
2013-08-03 21:59:01 -07:00
Chris Rebert
7a04e95b71
rm stray space in components.html
2013-08-03 21:58:31 -07:00
Chris Rebert
23ef8c0c20
Greater standardization of sizing terminology
...
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")
In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
Mark Otto
30a01e0a33
Merge pull request #9052 from liuyl/inputgroups
...
fix #9051
2013-08-03 20:44:41 -07:00
liuyl
4bbbf774a4
add line-height
2013-08-04 09:27:23 +08:00
Mark Otto
4582eb704f
Merge pull request #9036 from eratzlaff/3.0.0-wip
...
Change value with variables for btn-large, btn-small and pagination
2013-08-03 16:50:08 -07:00
Mark Otto
5fb0d69ee2
Merge pull request #9050 from jonschlinkert/3.0.0-wip
...
organizes the Gruntfile a bit and makes better use of Grunt conventions
2013-08-03 16:25:12 -07:00
Jon Schlinkert
55df26ae20
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.
2013-08-03 19:03:38 -04:00
Mark Otto
98b50abed3
Merge pull request #9045 from naneau/3.0.0-wip
...
using @line-height-computed in .navbar-nav link
2013-08-03 16:01:52 -07:00
