]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agosimplify padding in list groups and margins on badges within
Mark Otto [Mon, 12 Aug 2013 04:17:49 +0000 (21:17 -0700)] 
simplify padding in list groups and margins on badges within

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 12 Aug 2013 03:46:22 +0000 (20:46 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoadd another var
Mark Otto [Mon, 12 Aug 2013 03:45:51 +0000 (20:45 -0700)] 
add another var

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 12 Aug 2013 03:45:42 +0000 (20:45 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #9355 from kevinSuttle/aside
Mark Otto [Mon, 12 Aug 2013 03:43:18 +0000 (20:43 -0700)] 
Merge pull request #9355 from kevinSuttle/aside

Map 'role="complementary"' to proper HTML5 aside element

11 years agoMap 'role="complementary"' to proper aside element 9355/head
Kevin Suttle [Mon, 12 Aug 2013 03:40:22 +0000 (23:40 -0400)] 
Map 'role="complementary"' to proper aside element

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#complementary

11 years agoMerge pull request #9353 from kevinSuttle/contentinfo
Mark Otto [Mon, 12 Aug 2013 03:34:58 +0000 (20:34 -0700)] 
Merge pull request #9353 from kevinSuttle/contentinfo

Map "contentinfo" role to HTML5 footer element

11 years agoCustomizer field updates for variables
Mark Otto [Mon, 12 Aug 2013 03:33:58 +0000 (20:33 -0700)] 
Customizer field updates for variables

11 years agoaddressing #9189 manually, part 7: thumbnails vars
Mark Otto [Mon, 12 Aug 2013 02:32:16 +0000 (19:32 -0700)] 
addressing #9189 manually, part 7: thumbnails vars

11 years agoMap "contentinfo" role to HTML5 footer element 9353/head
Kevin Suttle [Mon, 12 Aug 2013 02:26:40 +0000 (22:26 -0400)] 
Map "contentinfo" role to HTML5 footer element

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#contentinfo

11 years agoDrop the font-weight on panel labels since heading elements already get it
Mark Otto [Mon, 12 Aug 2013 02:20:23 +0000 (19:20 -0700)] 
Drop the font-weight on panel labels since heading elements already get it

11 years agoRestore prior docs spacing
Mark Otto [Mon, 12 Aug 2013 02:19:56 +0000 (19:19 -0700)] 
Restore prior docs spacing

11 years agoFollow up commit: fix collapse clearing and navbar brand/nav spacing
Mark Otto [Mon, 12 Aug 2013 02:19:44 +0000 (19:19 -0700)] 
Follow up commit: fix collapse clearing and navbar brand/nav spacing

11 years agoMerge pull request #9352 from kevinSuttle/aria-forms
Mark Otto [Mon, 12 Aug 2013 02:18:36 +0000 (19:18 -0700)] 
Merge pull request #9352 from kevinSuttle/aria-forms

Give forms and search fields proper ARIA roles

11 years agoRefactor navbars to simplify things
Mark Otto [Mon, 12 Aug 2013 02:06:26 +0000 (19:06 -0700)] 
Refactor navbars to simplify things

* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.

11 years agoGive forms and search fields proper ARIA roles 9352/head
Kevin Suttle [Mon, 12 Aug 2013 01:41:31 +0000 (21:41 -0400)] 
Give forms and search fields proper ARIA roles

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#form

http://www.w3.org/TR/wai-aria/roles#search

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
fat [Mon, 12 Aug 2013 01:42:34 +0000 (18:42 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agorebuild + first bit of customizer urls
fat [Mon, 12 Aug 2013 01:42:13 +0000 (18:42 -0700)] 
rebuild + first bit of customizer urls

11 years agoaddressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar...
Mark Otto [Mon, 12 Aug 2013 01:32:52 +0000 (18:32 -0700)] 
addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable

11 years agoaddressing #9189 manually, part 5: don't bother with a .label font-weight var and...
Mark Otto [Mon, 12 Aug 2013 01:10:42 +0000 (18:10 -0700)] 
addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500

11 years agoaddressing #9189 manually, part 4: input group background var
Mark Otto [Mon, 12 Aug 2013 01:09:56 +0000 (18:09 -0700)] 
addressing #9189 manually, part 4: input group background var

11 years agoaddressing #9189 manually, part 3: forms
Mark Otto [Mon, 12 Aug 2013 01:06:26 +0000 (18:06 -0700)] 
addressing #9189 manually, part 3: forms

11 years agoMerge pull request #9351 from vsn4ik/quotes_in_nav_main
Chris Rebert [Mon, 12 Aug 2013 00:59:27 +0000 (17:59 -0700)] 
Merge pull request #9351 from vsn4ik/quotes_in_nav_main

Move quotes in nav-main.html

11 years agospacing
Mark Otto [Mon, 12 Aug 2013 00:47:53 +0000 (17:47 -0700)] 
spacing

11 years agoaddressing #9189 manually, part 2: dropdown header and disabled link colors (and...
Mark Otto [Mon, 12 Aug 2013 00:47:30 +0000 (17:47 -0700)] 
addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles)

11 years agoMove quotes in nav-main.html 9351/head
vsn4ik [Mon, 12 Aug 2013 00:46:07 +0000 (04:46 +0400)] 
Move quotes in nav-main.html

11 years agoaddressing #9189 manually, part 1: code and pre vars
Mark Otto [Mon, 12 Aug 2013 00:23:19 +0000 (17:23 -0700)] 
addressing #9189 manually, part 1: code and pre vars

11 years agoMerge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less...
Mark Otto [Mon, 12 Aug 2013 00:03:24 +0000 (17:03 -0700)] 
Merge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less-mixins

Make visibility utility classes responsive when used as LESS mixins

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 11 Aug 2013 23:07:57 +0000 (16:07 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9348 by ditching a comment
Mark Otto [Sun, 11 Aug 2013 23:07:45 +0000 (16:07 -0700)] 
fixes #9348 by ditching a comment

11 years agofixes #8983
Jacob Thornton [Sun, 11 Aug 2013 22:41:06 +0000 (15:41 -0700)] 
fixes #8983

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Jacob Thornton [Sun, 11 Aug 2013 22:17:30 +0000 (15:17 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9318
Jacob Thornton [Sun, 11 Aug 2013 22:17:04 +0000 (15:17 -0700)] 
fixes #9318

11 years agoMerge pull request #9286 from neilhem/3.0.0-wip
Mark Otto [Sun, 11 Aug 2013 22:15:53 +0000 (15:15 -0700)] 
Merge pull request #9286 from neilhem/3.0.0-wip

set img-circle class in percents

11 years agorefresh scrollspy after page 'loads'
Jacob Thornton [Sun, 11 Aug 2013 22:03:48 +0000 (15:03 -0700)] 
refresh scrollspy after page 'loads'

11 years agoMerge pull request #9229 from ggam/patch-13
Mark Otto [Sun, 11 Aug 2013 22:02:07 +0000 (15:02 -0700)] 
Merge pull request #9229 from ggam/patch-13

Removed Glyphicons mention from carousel.less

11 years agofixes #8900: nuke empty space between panel heading and list group
Mark Otto [Sun, 11 Aug 2013 22:01:16 +0000 (15:01 -0700)] 
fixes #8900: nuke empty space between panel heading and list group

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Jacob Thornton [Sun, 11 Aug 2013 21:59:57 +0000 (14:59 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofix comment in tooltip
Jacob Thornton [Sun, 11 Aug 2013 21:59:39 +0000 (14:59 -0700)] 
fix comment in tooltip

11 years agofix broken components page, also likely from @kevinsuttle's #9332
Mark Otto [Sun, 11 Aug 2013 21:49:50 +0000 (14:49 -0700)] 
fix broken components page, also likely from @kevinsuttle's #9332

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 11 Aug 2013 21:44:39 +0000 (14:44 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofix borked js docs layout, likely from @kevinsuttle's latest PR
Mark Otto [Sun, 11 Aug 2013 21:44:32 +0000 (14:44 -0700)] 
fix borked js docs layout, likely from @kevinsuttle's latest PR

11 years agoadd event prefixes
Jacob Thornton [Sun, 11 Aug 2013 21:39:11 +0000 (14:39 -0700)] 
add event prefixes

11 years agofixes #9279
Jacob Thornton [Sun, 11 Aug 2013 21:32:32 +0000 (14:32 -0700)] 
fixes #9279

11 years agoMerge pull request #9347 from kevinSuttle/header
Mark Otto [Sun, 11 Aug 2013 21:09:46 +0000 (14:09 -0700)] 
Merge pull request #9347 from kevinSuttle/header

Ensure proper use and location of role="banner"

11 years agoEnsure proper use and location of role="banner" 9347/head
Kevin Suttle [Sun, 11 Aug 2013 20:34:48 +0000 (16:34 -0400)] 
Ensure proper use and location of role="banner"

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

http://www.w3.org/TR/wai-aria/roles#banner

11 years agofix indentation
Mark Otto [Sun, 11 Aug 2013 20:20:24 +0000 (13:20 -0700)] 
fix indentation

11 years agoMerge branch 'aria-nav' of https://github.com/kevinSuttle/bootstrap into kevinSuttle...
Mark Otto [Sun, 11 Aug 2013 20:15:52 +0000 (13:15 -0700)] 
Merge branch 'aria-nav' of https://github.com/kevinSuttle/bootstrap into kevinSuttle-aria-nav

11 years agofixes #9241: enable collapsing for labels, in addition to badges, when empty
Mark Otto [Sun, 11 Aug 2013 19:43:43 +0000 (12:43 -0700)] 
fixes #9241: enable collapsing for labels, in addition to badges, when empty

12 years agoUse nav for proper HTML5 ARIA role mapping 9332/head
Kevin Suttle [Sun, 11 Aug 2013 02:33:53 +0000 (22:33 -0400)] 
Use nav for proper HTML5 ARIA role mapping

http://www.w3.org/html/wg/drafts/html/master/sections.html#the-nav-element

http://dev.w3.org/html5/spec/sections.html#the-nav-element

http://blog.paciellogroup.com/2013/02/using-wai-aria-landmarks-2013/#tablex

12 years agofixes #9217 manually--use main element instead of div in home and default layouts
Mark Otto [Sat, 10 Aug 2013 23:11:34 +0000 (16:11 -0700)] 
fixes #9217 manually--use main element instead of div in home and default layouts

12 years agoremove customize layout now that we're bringing it back for rc2
Mark Otto [Sat, 10 Aug 2013 23:11:10 +0000 (16:11 -0700)] 
remove customize layout now that we're bringing it back for rc2

12 years agoMerge pull request #9245 from jlaswell/patch-1
Mark Otto [Sat, 10 Aug 2013 22:39:28 +0000 (15:39 -0700)] 
Merge pull request #9245 from jlaswell/patch-1

Update components.html

12 years agoMerge pull request #9230 from ggam/patch-14
Mark Otto [Sat, 10 Aug 2013 22:30:00 +0000 (15:30 -0700)] 
Merge pull request #9230 from ggam/patch-14

Changed "Standard pagination" to "Default pagination"

12 years agofixes #9222
Jacob Thornton [Sat, 10 Aug 2013 21:09:05 +0000 (14:09 -0700)] 
fixes #9222

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Jacob Thornton [Sat, 10 Aug 2013 20:35:48 +0000 (13:35 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agofixes #9111
Jacob Thornton [Sat, 10 Aug 2013 20:35:20 +0000 (13:35 -0700)] 
fixes #9111

12 years agoUse protocol-relative URL in example
Chris Rebert [Sat, 10 Aug 2013 01:01:11 +0000 (18:01 -0700)] 
Use protocol-relative URL in example

12 years agoFixes #9260
Chris Rebert [Sat, 10 Aug 2013 00:55:12 +0000 (17:55 -0700)] 
Fixes #9260

12 years agogetting-started docs: rephrase to avoid "helpful...help"
Chris Rebert [Sat, 10 Aug 2013 00:48:29 +0000 (17:48 -0700)] 
getting-started docs: rephrase to avoid "helpful...help"

12 years agoset img-circle class in percents 9286/head
Rakhat Jabagin [Fri, 9 Aug 2013 11:57:49 +0000 (17:57 +0600)] 
set img-circle class in percents

12 years agoMerge pull request #9273 from liuyl/navbars
Chris Rebert [Fri, 9 Aug 2013 07:59:43 +0000 (00:59 -0700)] 
Merge pull request #9273 from liuyl/navbars

navbar.less

12 years agonavbar.less 9273/head
liuyl [Fri, 9 Aug 2013 07:44:10 +0000 (15:44 +0800)] 
navbar.less

12 years agoMerge pull request #9271 from liuyl/panels
Chris Rebert [Fri, 9 Aug 2013 07:28:08 +0000 (00:28 -0700)] 
Merge pull request #9271 from liuyl/panels

refactor panels.less

12 years agopanels 9271/head
liuyl [Fri, 9 Aug 2013 07:24:38 +0000 (15:24 +0800)] 
panels

12 years agofixes #6159
Jacob Thornton [Fri, 9 Aug 2013 07:16:47 +0000 (00:16 -0700)] 
fixes #6159

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Jacob Thornton [Fri, 9 Aug 2013 06:08:40 +0000 (23:08 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agoadd loading class for mdo to style on customizer
Jacob Thornton [Fri, 9 Aug 2013 06:07:14 +0000 (23:07 -0700)] 
add loading class for mdo to style on customizer

12 years agofix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
Chris Rebert [Thu, 8 Aug 2013 20:29:46 +0000 (13:29 -0700)] 
fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack

fixes typo introduced in 2b6ec389876fac116ae2a152e47be321632dd9ba

12 years agoFix Find/Replace-o; good catch, @FagnerMartinsBrack!
Chris Rebert [Thu, 8 Aug 2013 19:07:27 +0000 (12:07 -0700)] 
Fix Find/Replace-o; good catch, @FagnerMartinsBrack!

Problem introduced in 6b23a66c29c3613c6792a257aafa949c81746597

12 years agoUpdate components.html 9245/head
jlaswell [Thu, 8 Aug 2013 16:31:48 +0000 (12:31 -0400)] 
Update components.html

Keeping bs-examples consistent with code provided.

12 years agoChanged "Standard pagination" to "Default pagination" 9230/head
Guillermo González de Agüero [Thu, 8 Aug 2013 10:26:06 +0000 (12:26 +0200)] 
Changed "Standard pagination" to "Default pagination"

12 years agoRemoved Glyphicons mention from carousel.less 9229/head
Guillermo González de Agüero [Thu, 8 Aug 2013 10:21:27 +0000 (12:21 +0200)] 
Removed Glyphicons mention from carousel.less

12 years agoMerge pull request #9089 from jdiamond/3.0.0-wip
Jacob [Thu, 8 Aug 2013 06:37:05 +0000 (23:37 -0700)] 
Merge pull request #9089 from jdiamond/3.0.0-wip

accordion's data-parent can't contain dots

12 years agozip js as well …
Jacob Thornton [Thu, 8 Aug 2013 06:15:03 +0000 (23:15 -0700)] 
zip js as well …

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Jacob Thornton [Thu, 8 Aug 2013 06:10:11 +0000 (23:10 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
_layouts/customize.html

12 years agofirst prototype of new customizer
Jacob Thornton [Thu, 8 Aug 2013 06:06:29 +0000 (23:06 -0700)] 
first prototype of new customizer

12 years agoMerge pull request #9200 from geedmo/3.0.0-wip
Mark Otto [Thu, 8 Aug 2013 01:11:15 +0000 (18:11 -0700)] 
Merge pull request #9200 from geedmo/3.0.0-wip

Update to use @list-group-border-radius

12 years agoMerge pull request #9201 from ggam/patch-11
Mark Otto [Thu, 8 Aug 2013 01:10:52 +0000 (18:10 -0700)] 
Merge pull request #9201 from ggam/patch-11

Added panel-variant mixin

12 years agoMake visibility utility classes responsive when used as LESS mixins 9211/head
Zac Wasielewski [Wed, 7 Aug 2013 20:47:49 +0000 (16:47 -0400)] 
Make visibility utility classes responsive when used as LESS mixins

12 years agoMerge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2
Chris Rebert [Wed, 7 Aug 2013 20:32:45 +0000 (13:32 -0700)] 
Merge pull request #9210 from twbs/browserstack-travis-pr-fix-take-2

apparently PRs against twbs/bootstrap have the same Travis slug

12 years agoapparently PRs against twbs/bootstrap have the same Travis slug 9210/head
Chris Rebert [Wed, 7 Aug 2013 20:27:27 +0000 (13:27 -0700)] 
apparently PRs against twbs/bootstrap have the same Travis slug

12 years agoUpdated panels.less to use variant-panel mixin 9201/head
Guillermo González de Agüero [Wed, 7 Aug 2013 18:19:12 +0000 (20:19 +0200)] 
Updated panels.less to use variant-panel mixin

12 years agoAdded panel-variant mixin
Guillermo González de Agüero [Wed, 7 Aug 2013 18:15:12 +0000 (20:15 +0200)] 
Added panel-variant mixin

12 years agoUpdate to use @list-group-border-radius 9200/head
geedmo [Wed, 7 Aug 2013 17:47:47 +0000 (14:47 -0300)] 
Update to use @list-group-border-radius

12 years agoMerge pull request #9198 from bwhitty/3.0.0-wip
Mark Otto [Wed, 7 Aug 2013 15:34:33 +0000 (08:34 -0700)] 
Merge pull request #9198 from bwhitty/3.0.0-wip

Fixed #9196 - malformed HTML in doc

12 years agoMerge pull request #9191 from ggam/patch-10
Mark Otto [Wed, 7 Aug 2013 15:25:42 +0000 (08:25 -0700)] 
Merge pull request #9191 from ggam/patch-10

Fixed link to JavaScript buttons plugin

12 years agoFixed #9196 - malformed HTML in doc 9198/head
Braden Whitten [Wed, 7 Aug 2013 13:18:12 +0000 (09:18 -0400)] 
Fixed #9196 - malformed HTML in doc

Stray <h3> was being closed by an </h2>. Updated to valid HTML. Fixes #9196

12 years agoFixed link to JavaScript buttons plugin 9191/head
Guillermo González de Agüero [Wed, 7 Aug 2013 10:42:46 +0000 (12:42 +0200)] 
Fixed link to JavaScript buttons plugin

12 years agoproperty order
Mark Otto [Wed, 7 Aug 2013 07:28:44 +0000 (00:28 -0700)] 
property order

12 years agocopy changes
Mark Otto [Wed, 7 Aug 2013 07:28:23 +0000 (00:28 -0700)] 
copy changes

12 years agoImprove accessibility (Section 508, WCAG) 9186/head
adamjacobbecker [Wed, 7 Aug 2013 04:25:36 +0000 (21:25 -0700)] 
Improve accessibility (Section 508, WCAG)

This PR significantly improves Bootstrap's accessibility for users of assistive technology, such as screen readers. Some of the these changes add additional markup to the source examples, but we believe that the sacrifice in readability is worth achieving more widespread usage of accessibility best-practices.

What was done
- Added lots of [WAI-ARIA attributes](http://www.w3.org/WAI/intro/aria)
- Added `.sr-only` helper class, that is only readable by screen readers (and invisible for all other users). This lets us - make progress bars and paginations accessible to screen reading users.
- Advised users to always use label elements. For inline forms, they can hide them with `.sr-only`
- Added 'Skip navigation' link
- Added "Accessibility" section to getting-started.html.

What *wasn't* done
- Contrast issues (twbs#3572)
- Tooltips (twbs#8469)
- Documentation re: usage of icons, since they now live in a separate repo

Major props to all that contributed: @bensheldon, @jasonlally, @criscristina, and @louh. Feel free to chime in, guys, if I've left anything out.

12 years agofixes #8959: only negative indent rows within .container (prevents horizontal scroll...
Mark Otto [Wed, 7 Aug 2013 04:11:16 +0000 (21:11 -0700)] 
fixes #8959: only negative indent rows within .container (prevents horizontal scroll on full-width pages)

12 years agofixes #8935: add gutter width param to grid mixins
Mark Otto [Wed, 7 Aug 2013 04:00:12 +0000 (21:00 -0700)] 
fixes #8935: add gutter width param to grid mixins

12 years agoMerge pull request #9183 from twbs/fix-other-peoples-travis-builds
Chris Rebert [Wed, 7 Aug 2013 03:19:59 +0000 (20:19 -0700)] 
Merge pull request #9183 from twbs/fix-other-peoples-travis-builds

disable BrowserStack for folks w/o their own key who are making PRs

12 years agodisable BrowserStack for folks w/o their own key who are making PRs 9183/head
Chris Rebert [Wed, 7 Aug 2013 02:54:15 +0000 (19:54 -0700)] 
disable BrowserStack for folks w/o their own key who are making PRs

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 7 Aug 2013 01:29:24 +0000 (18:29 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

12 years agolittle better spacing between major sections in le docs for jump to nav
Mark Otto [Wed, 7 Aug 2013 01:29:18 +0000 (18:29 -0700)] 
little better spacing between major sections in le docs for jump to nav

12 years agoMerge pull request #9120 from FLOKER/patch-2
Mark Otto [Wed, 7 Aug 2013 01:09:49 +0000 (18:09 -0700)] 
Merge pull request #9120 from FLOKER/patch-2

fix scrollSpy instructions for JS call

12 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 7 Aug 2013 01:06:36 +0000 (18:06 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip