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-group
s 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
Maurice Fonk
bf0f3c7c1c
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.
2013-08-03 15:09:56 -04:00
James Holland
744b79a666
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
2013-08-03 10:28:17 -04:00
Chris Rebert
fce2e89b7d
JS docs: put transitionEnd
within <code>
2013-08-03 02:24:31 -07:00
Chris Rebert
364fdf7fa1
JavaScript docs: fix caps of "JS"
2013-08-03 02:22:55 -07:00
Chris Rebert
3a96ff9a0a
JS docs: fix caps of "CSS" acronym
2013-08-03 02:21:29 -07:00
Elvis Ratzlaff
e06b6ba7ba
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
2013-08-03 04:52:09 -04:00
Chris Rebert
5b66a1608e
Merge pull request #9037 from ChrisRiddell/horizontal-form-fix
...
Fix Horizontal form docs
2013-08-03 01:27:20 -07:00
ChrisRiddell
602e0c0ba0
fix Horizontal form docs
2013-08-03 17:48:15 +09:30
Elvis Ratzlaff
777ae911b6
Change value for padding on pagination to variables
2013-08-03 03:59:37 -04:00
Elvis Ratzlaff
2fd8689b08
Change line-height value with variable for btn-large and btn-small
2013-08-03 03:56:06 -04:00
Mark Otto
4bac2c567a
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 20:19:20 -07:00
Mark Otto
a0c44329e3
Merge pull request #8939 from frabrunelle/3.0.0-wip
...
add nav to media object and thumbnails
2013-08-02 19:58:17 -07:00
Mark Otto
a3be713f8f
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 19:30:03 -07:00
Mark Otto
e8145ac939
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 19:05:49 -07:00
Mark Otto
b5dcbf5045
Merge pull request #8934 from twbs/generalize-horiz-form-example
...
use separate `form-group`s in horiz form example for greater generality
2013-08-02 18:59:06 -07:00
Mark Otto
9435991ff0
move form layouts from input groups back to forms (messed this up in b281ad6409
)
2013-08-02 18:48:44 -07:00
Mark Otto
6b850132d0
Remove requirement of .list-group-flush
when list groups are in panels
...
Fixes #8900
2013-08-02 17:57:19 -07:00
Mark Otto
0a7b185224
Merge pull request #36 from ggam/patch-1
...
Included required JavaScript in navbar-static-top
2013-08-02 17:17:28 -07:00
Chris Rebert
0fefbbe659
fix typo in comment
2013-08-02 16:36:54 -07:00
fat
f6cec812a6
fixes #8957
2013-08-02 15:13:12 -07:00
fat
e969d2ff18
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 15:10:47 -07:00
fat
69f9920132
fixes #8955
2013-08-02 15:10:14 -07:00
Mark Otto
173dac4e54
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 )
2013-08-02 15:09:48 -07:00