]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agorestore breadcrumbs
Mark Otto [Wed, 16 Jan 2013 21:06:15 +0000 (13:06 -0800)] 
restore breadcrumbs

13 years agorestore wells and close
Mark Otto [Wed, 16 Jan 2013 21:05:20 +0000 (13:05 -0800)] 
restore wells and close

13 years agoRestore button groups
Mark Otto [Wed, 16 Jan 2013 21:04:29 +0000 (13:04 -0800)] 
Restore button groups

13 years agorestore glyphicons docs styles and then overhaul the shit out of them
Mark Otto [Wed, 16 Jan 2013 21:02:15 +0000 (13:02 -0800)] 
restore glyphicons docs styles and then overhaul the shit out of them

13 years agoRestore dropdowns.less
Mark Otto [Wed, 16 Jan 2013 20:44:31 +0000 (12:44 -0800)] 
Restore dropdowns.less

13 years agoRestore responsive docs
Mark Otto [Wed, 16 Jan 2013 20:44:11 +0000 (12:44 -0800)] 
Restore responsive docs

13 years agorestore glyphicons
Mark Otto [Wed, 16 Jan 2013 20:30:44 +0000 (12:30 -0800)] 
restore glyphicons

13 years agoRe-add and update form styles:
Mark Otto [Wed, 16 Jan 2013 20:20:34 +0000 (12:20 -0800)] 
Re-add and update form styles:

* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes

13 years agotwerk docs code examples
Mark Otto [Wed, 16 Jan 2013 20:02:45 +0000 (12:02 -0800)] 
twerk docs code examples

13 years agorestore table styles
Mark Otto [Wed, 16 Jan 2013 19:48:20 +0000 (11:48 -0800)] 
restore table styles

13 years agomore subhead/jumbotron tweaks for docs
Mark Otto [Wed, 16 Jan 2013 19:45:16 +0000 (11:45 -0800)] 
more subhead/jumbotron tweaks for docs

13 years agoDerp on type styles a bit more; bring back and fix up more more docs styles
Mark Otto [Wed, 16 Jan 2013 19:38:34 +0000 (11:38 -0800)] 
Derp on type styles a bit more; bring back and fix up more more docs styles

13 years agoadd back docs footer
Mark Otto [Wed, 16 Jan 2013 19:03:54 +0000 (11:03 -0800)] 
add back docs footer

13 years agomo betta type margins for headings
Mark Otto [Wed, 16 Jan 2013 18:57:00 +0000 (10:57 -0800)] 
mo betta type margins for headings

13 years agoPort over temp responsive styles to bootstrap.less; readd buttons
Mark Otto [Wed, 16 Jan 2013 18:52:33 +0000 (10:52 -0800)] 
Port over temp responsive styles to bootstrap.less; readd buttons

13 years agoremove extra border-radius props
Mark Otto [Wed, 16 Jan 2013 18:49:19 +0000 (10:49 -0800)] 
remove extra border-radius props

13 years agoMerge pull request #6600 from Yohn/patch-12
Mark Otto [Wed, 16 Jan 2013 18:28:02 +0000 (10:28 -0800)] 
Merge pull request #6600 from Yohn/patch-12

added missing class to doc example

13 years agoMerge pull request #6591 from Quy/2.3.0-wip
Mark Otto [Wed, 16 Jan 2013 18:24:13 +0000 (10:24 -0800)] 
Merge pull request #6591 from Quy/2.3.0-wip

Add text alignment classes info to docs

13 years agoUpdate docs/templates/pages/components.mustache 6600/head
Yohn [Wed, 16 Jan 2013 12:46:42 +0000 (07:46 -0500)] 
Update docs/templates/pages/components.mustache

13 years agoadding class to example code
Yohn [Wed, 16 Jan 2013 12:45:31 +0000 (07:45 -0500)] 
adding class to example code

13 years agoAdd text alignment classes info to docs 6591/head
Quy Ton [Wed, 16 Jan 2013 02:16:44 +0000 (18:16 -0800)] 
Add text alignment classes info to docs

13 years agomobile-first navs, navbar, grids, and type
Mark Otto [Wed, 16 Jan 2013 01:55:14 +0000 (17:55 -0800)] 
mobile-first navs, navbar, grids, and type

13 years agocode changes
Mark Otto [Tue, 15 Jan 2013 22:34:04 +0000 (14:34 -0800)] 
code changes

13 years agodocs changes, more type improvements, add grid system basics back
Mark Otto [Tue, 15 Jan 2013 22:30:00 +0000 (14:30 -0800)] 
docs changes, more type improvements, add grid system basics back

13 years agoFixes #6586: remove top 5px margin from navbar input group button groups
Mark Otto [Tue, 15 Jan 2013 18:27:30 +0000 (10:27 -0800)] 
Fixes #6586: remove top 5px margin from navbar input group button groups

13 years agoadd text alignment classes from 3.0
Mark Otto [Tue, 15 Jan 2013 18:15:02 +0000 (10:15 -0800)] 
add text alignment classes from 3.0

13 years agotype and stuff
Mark Otto [Tue, 15 Jan 2013 18:14:12 +0000 (10:14 -0800)] 
type and stuff

13 years agoRevert "Leave tabindex=-1 alone" 6441/head
Patrick H. Lauke [Tue, 15 Jan 2013 07:22:02 +0000 (07:22 +0000)] 
Revert "Leave tabindex=-1 alone"

This reverts commit 370fa45fbe4ee879a626a67bb4df0ec9495102be.

13 years agoLeave tabindex=-1 alone
Patrick H. Lauke [Tue, 15 Jan 2013 07:16:33 +0000 (07:16 +0000)] 
Leave tabindex=-1 alone

It seems that, as misguided as I personally think it is, ARIA does
indeed want dropdown menus not to behave as regular keyboard users
expect them, killing TAB/SHIFT+TAB in favor of cursor keys. Fair
enough, the issue I have is then with ARIA, not with bootstrap. I would
sugges thought that if you really do want to follow ARIA consistently,
*any* navigation bar should also become an ARIA menu, further making it
impossible for keyboard users to use TAB/SHIFT+TAB to navigate through
it, and that these changes should be reflected in the bootstrap
examples as well...

13 years agoRevert "Keyboard accessibility in documentation"
Patrick H. Lauke [Tue, 15 Jan 2013 07:13:19 +0000 (07:13 +0000)] 
Revert "Keyboard accessibility in documentation"

This reverts commit a809daf2841f65ffac5030b2c6ce6aea60dd6233.

13 years agonuke and flatten and stuff
Mark Otto [Tue, 15 Jan 2013 06:05:55 +0000 (22:05 -0800)] 
nuke and flatten and stuff

13 years agoChanges some more commands to use the local npm install. 6576/head
Nicolas Dudebout [Mon, 14 Jan 2013 14:02:25 +0000 (09:02 -0500)] 
Changes some more commands to use the local npm install.

13 years agoAllows the user to set different source and destination in Makefile.
Nicolas Dudebout [Wed, 2 Jan 2013 11:13:46 +0000 (06:13 -0500)] 
Allows the user to set different source and destination in Makefile.

A user can use the following command to determine where to copy the resulting css file:

    $ BOOTSTRAP=<my-path> make

13 years agoModifies the Makefile to use local npm install **when available**
Nicolas Dudebout [Wed, 2 Jan 2013 11:12:14 +0000 (06:12 -0500)] 
Modifies the Makefile to use local npm install **when available**

The change introduced in 5bd8cdca9 was:

  - partial, as not all the command were translated
  - preventing the use of a global npm installation

13 years agoMoves one @printf statement to be more accurate.
Nicolas Dudebout [Wed, 2 Jan 2013 10:59:55 +0000 (05:59 -0500)] 
Moves one @printf statement to be more accurate.

13 years agoReplaces some @echo recipes by @printf.
Nicolas Dudebout [Wed, 2 Jan 2013 10:42:59 +0000 (05:42 -0500)] 
Replaces some @echo recipes by @printf.

The echo command does not understand the -n argument on Mac OS X.
This is due to the fact that:

  - Makefile calls /bin/sh to execute a command
  - in Mac OS X, /bin/sh is a link to bash
  - in Mac OS X, bash is compiled with --enable-strict-posix-default

Therefore, the echo command does not have the -n argument.

printf on the other hand is a builtin function that works well on Mac OS X and Linux.

13 years agoSplits the progress @echo statements in the Makefile.
Nicolas Dudebout [Mon, 12 Nov 2012 00:13:43 +0000 (19:13 -0500)] 
Splits the progress @echo statements in the Makefile.

13 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Mon, 14 Jan 2013 08:33:16 +0000 (00:33 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

13 years agoUpgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
Mark Otto [Mon, 14 Jan 2013 08:11:55 +0000 (00:11 -0800)] 
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing

13 years agoUpgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
Mark Otto [Mon, 14 Jan 2013 08:11:55 +0000 (00:11 -0800)] 
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing

13 years agoMerge pull request #6568 from Yohn/patch-12
Mark Otto [Mon, 14 Jan 2013 08:03:55 +0000 (00:03 -0800)] 
Merge pull request #6568 from Yohn/patch-12

Updating docs -> popover to show container option

13 years agofix typo 6568/head
Yohn [Sun, 13 Jan 2013 20:32:51 +0000 (15:32 -0500)] 
fix typo

13 years agofix typo
Yohn [Sun, 13 Jan 2013 20:32:03 +0000 (15:32 -0500)] 
fix typo

13 years agoadded container options to docs for popover
Yohn [Sun, 13 Jan 2013 20:23:22 +0000 (15:23 -0500)] 
added container options to docs for popover

13 years agoadded container options to docs for popover
Yohn [Sun, 13 Jan 2013 20:21:31 +0000 (15:21 -0500)] 
added container options to docs for popover

13 years agoReset docs jumbotron button to blue defaults
Mark Otto [Sun, 13 Jan 2013 12:27:51 +0000 (04:27 -0800)] 
Reset docs jumbotron button to blue defaults

13 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Sun, 13 Jan 2013 12:26:52 +0000 (04:26 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json

13 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Sun, 13 Jan 2013 12:26:52 +0000 (04:26 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json

13 years agoRemove comment out code and simplify what's left for button group toggles
Mark Otto [Sun, 13 Jan 2013 12:05:34 +0000 (04:05 -0800)] 
Remove comment out code and simplify what's left for button group toggles

13 years agoFix btn link hover and tweak dropdown border/shadows
Mark Otto [Sun, 13 Jan 2013 12:04:16 +0000 (04:04 -0800)] 
Fix btn link hover and tweak dropdown border/shadows

13 years agoFix up .brand in navbar of docs
Mark Otto [Sun, 13 Jan 2013 04:10:42 +0000 (20:10 -0800)] 
Fix up .brand in navbar of docs

13 years agowhite text on buttons on hover for links
Mark Otto [Sun, 13 Jan 2013 04:08:13 +0000 (20:08 -0800)] 
white text on buttons on hover for links

13 years agoUpdate Holder.js 1.6 to 1.9
Mark Otto [Sun, 13 Jan 2013 03:49:15 +0000 (19:49 -0800)] 
Update Holder.js 1.6 to 1.9

13 years agoNuke shadow on pagination
Mark Otto [Sun, 13 Jan 2013 03:46:47 +0000 (19:46 -0800)] 
Nuke shadow on pagination

13 years agofixed navbars fixings
Mark Otto [Sun, 13 Jan 2013 03:44:51 +0000 (19:44 -0800)] 
fixed navbars fixings

13 years agoRemove shadows from active links in navbar
Mark Otto [Sun, 13 Jan 2013 03:02:58 +0000 (19:02 -0800)] 
Remove shadows from active links in navbar

13 years agoTweak button
Mark Otto [Sun, 13 Jan 2013 03:02:48 +0000 (19:02 -0800)] 
Tweak button

13 years agobuttons and button group flattening improvements
Mark Otto [Sun, 13 Jan 2013 02:52:06 +0000 (18:52 -0800)] 
buttons and button group flattening improvements

13 years agoremove font-sizes from button group btn sizes
Mark Otto [Sun, 13 Jan 2013 01:54:30 +0000 (17:54 -0800)] 
remove font-sizes from button group btn sizes

13 years agofinetune buttons flattened colors
Mark Otto [Sun, 13 Jan 2013 01:51:57 +0000 (17:51 -0800)] 
finetune buttons flattened colors

13 years agoFlatten navbar
Mark Otto [Sat, 12 Jan 2013 22:31:18 +0000 (14:31 -0800)] 
Flatten navbar

13 years agoMerge branch '3.0.0-wip' into bs3-flatten
Mark Otto [Sat, 12 Jan 2013 22:16:49 +0000 (14:16 -0800)] 
Merge branch '3.0.0-wip' into bs3-flatten

13 years agoRemove mention of Extend page from readme and index page
Mark Otto [Sat, 12 Jan 2013 21:57:41 +0000 (13:57 -0800)] 
Remove mention of Extend page from readme and index page

13 years agoRemove Extend page from the docs entirely
Mark Otto [Sat, 12 Jan 2013 21:46:07 +0000 (13:46 -0800)] 
Remove Extend page from the docs entirely

* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page

13 years agoRemove parent div from pagination component
Mark Otto [Sat, 12 Jan 2013 21:15:19 +0000 (13:15 -0800)] 
Remove parent div from pagination component

* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.

13 years agoUpdate extend page to point to readme for compiling.
Mark Otto [Sat, 12 Jan 2013 20:41:01 +0000 (12:41 -0800)] 
Update extend page to point to readme for compiling.

Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.

13 years agoKeyboard accessibility in documentation
Patrick H. Lauke [Sat, 12 Jan 2013 17:04:51 +0000 (17:04 +0000)] 
Keyboard accessibility in documentation

Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.

13 years agoCleaned up dirty CSS
Patrick H. Lauke [Sat, 12 Jan 2013 11:02:13 +0000 (11:02 +0000)] 
Cleaned up dirty CSS

Used recess rather than less

13 years agoAddress #6459 and add mention of disabled links in dropdowns to le docs
Mark Otto [Sat, 12 Jan 2013 08:33:12 +0000 (00:33 -0800)] 
Address #6459 and add mention of disabled links in dropdowns to le docs

13 years agoMerge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
Mark Otto [Sat, 12 Jan 2013 08:29:34 +0000 (00:29 -0800)] 
Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0

update 2.3.0 docs to reflect #5786

13 years agoMerge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
Mark Otto [Sat, 12 Jan 2013 08:29:23 +0000 (00:29 -0800)] 
Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0

update 3.0.0 docs to reflect #5786

13 years agoMerge pull request #6472 from RWOverdijk/patch-1
Mark Otto [Sat, 12 Jan 2013 08:21:08 +0000 (00:21 -0800)] 
Merge pull request #6472 from RWOverdijk/patch-1

Update composer.json

13 years agofix username navbar text in fluid example for responsive variations
Mark Otto [Sat, 12 Jan 2013 08:20:13 +0000 (00:20 -0800)] 
fix username navbar text in fluid example for responsive variations

13 years agofix username navbar text in fluid example for responsive variations
Mark Otto [Sat, 12 Jan 2013 08:20:13 +0000 (00:20 -0800)] 
fix username navbar text in fluid example for responsive variations

13 years agoFixes #6538: Add th support to all the .table-rounded selectors
Mark Otto [Sat, 12 Jan 2013 07:38:53 +0000 (23:38 -0800)] 
Fixes #6538: Add th support to all the .table-rounded selectors

13 years agoFixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active
Mark Otto [Sat, 12 Jan 2013 07:35:22 +0000 (23:35 -0800)] 
Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active

13 years agoAddress #6545: clarify initialization of tooltips in docs
Mark Otto [Sat, 12 Jan 2013 04:58:24 +0000 (20:58 -0800)] 
Address #6545: clarify initialization of tooltips in docs

13 years agoFixes #6547: Make blockquotes use multiple of @baseFontSize
Mark Otto [Sat, 12 Jan 2013 04:55:09 +0000 (20:55 -0800)] 
Fixes #6547: Make blockquotes use multiple of @baseFontSize

13 years agoFixes #6552: example fix for button group
Mark Otto [Sat, 12 Jan 2013 04:52:39 +0000 (20:52 -0800)] 
Fixes #6552: example fix for button group

13 years agoFixes #6553: example fix for validation states
Mark Otto [Sat, 12 Jan 2013 04:51:11 +0000 (20:51 -0800)] 
Fixes #6553: example fix for validation states

13 years agoIncrease input group margin on bottom and vertically center to match inputs
Mark Otto [Sat, 12 Jan 2013 04:46:21 +0000 (20:46 -0800)] 
Increase input group margin on bottom and vertically center to match inputs

13 years agoFixes #6473: Make .input-prepend and .input-append inline-block to match other form...
Mark Otto [Sat, 12 Jan 2013 04:42:44 +0000 (20:42 -0800)] 
Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states

13 years agoFixes #6474: remove duplicate .btn border colors to make @btn-border work
Mark Otto [Sat, 12 Jan 2013 04:40:17 +0000 (20:40 -0800)] 
Fixes #6474: remove duplicate .btn border colors to make @btn-border work

13 years agoFixes #6478: scope table backgrounds to immediate td/th elements
Mark Otto [Sat, 12 Jan 2013 04:38:14 +0000 (20:38 -0800)] 
Fixes #6478: scope table backgrounds to immediate td/th elements

13 years agoComment fix
Mark Otto [Sat, 12 Jan 2013 04:30:56 +0000 (20:30 -0800)] 
Comment fix

13 years agoComment fix
Mark Otto [Sat, 12 Jan 2013 04:30:56 +0000 (20:30 -0800)] 
Comment fix

13 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sat, 12 Jan 2013 04:27:00 +0000 (20:27 -0800)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

13 years agoRemove overflow: auto; from .tab-content
Mark Otto [Sat, 12 Jan 2013 04:26:48 +0000 (20:26 -0800)] 
Remove overflow: auto; from .tab-content

13 years agoFixes #6555: remove .controls-row from responsive
Mark Otto [Sat, 12 Jan 2013 04:23:37 +0000 (20:23 -0800)] 
Fixes #6555: remove .controls-row from responsive

13 years agoMerge pull request #6550 from Boulox/font-variable-fix
Mark Otto [Fri, 11 Jan 2013 19:11:32 +0000 (11:11 -0800)] 
Merge pull request #6550 from Boulox/font-variable-fix

Add glyphicons font path variable

13 years agoRemove navbar links from sticky footer navbar example
Mark Otto [Fri, 11 Jan 2013 19:00:45 +0000 (11:00 -0800)] 
Remove navbar links from sticky footer navbar example

13 years agoRemove navbar links from sticky footer navbar example
Mark Otto [Fri, 11 Jan 2013 19:00:45 +0000 (11:00 -0800)] 
Remove navbar links from sticky footer navbar example

13 years agoMerge branch 'wilfra-patch-2' into 2.3.0-wip
Mark Otto [Fri, 11 Jan 2013 18:58:17 +0000 (10:58 -0800)] 
Merge branch 'wilfra-patch-2' into 2.3.0-wip

13 years agoMerge branch 'wilfra-patch-2' into 2.3.0-wip
Mark Otto [Fri, 11 Jan 2013 18:58:17 +0000 (10:58 -0800)] 
Merge branch 'wilfra-patch-2' into 2.3.0-wip

13 years agoAdd glyphicons font path variable 6550/head
Fabien [Fri, 11 Jan 2013 17:32:00 +0000 (18:32 +0100)] 
Add glyphicons font path variable

13 years agoNuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago
Mark Otto [Fri, 11 Jan 2013 02:50:52 +0000 (18:50 -0800)] 
Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago

13 years agoUpdate docs/examples/marketing-narrow.html
William Franceschine [Thu, 10 Jan 2013 10:14:14 +0000 (02:14 -0800)] 
Update docs/examples/marketing-narrow.html

Updated copyright to 2013

13 years agoUpdate docs/examples/marketing-narrow.html 6529/head
William Franceschine [Thu, 10 Jan 2013 10:14:14 +0000 (02:14 -0800)] 
Update docs/examples/marketing-narrow.html

Updated copyright to 2013

13 years agoUpdate docs/examples/marketing-alternate.html
William Franceschine [Thu, 10 Jan 2013 10:13:57 +0000 (02:13 -0800)] 
Update docs/examples/marketing-alternate.html

Updated copyright to 2013

13 years agoUpdate docs/examples/marketing-alternate.html
William Franceschine [Thu, 10 Jan 2013 10:13:57 +0000 (02:13 -0800)] 
Update docs/examples/marketing-alternate.html

Updated copyright to 2013