]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agonuke bootstrap dependencies
Mark Otto [Thu, 15 Aug 2013 23:32:36 +0000 (16:32 -0700)] 
nuke bootstrap dependencies

11 years agonuke assets pre-move
Mark Otto [Thu, 15 Aug 2013 23:30:09 +0000 (16:30 -0700)] 
nuke assets pre-move

11 years agoMerge pull request #40 from huyouare/carousel-example
Mark Otto [Thu, 15 Aug 2013 23:23:40 +0000 (16:23 -0700)] 
Merge pull request #40 from huyouare/carousel-example

Added glyphicons to index.html

11 years agoMerge pull request #42 from huyouare/navbar-paths
Mark Otto [Thu, 15 Aug 2013 23:23:33 +0000 (16:23 -0700)] 
Merge pull request #42 from huyouare/navbar-paths

Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.

11 years agoMerge pull request #46 from ggam/revamp-offcanvas
Mark Otto [Thu, 15 Aug 2013 23:23:24 +0000 (16:23 -0700)] 
Merge pull request #46 from ggam/revamp-offcanvas

Simplified Off Canvas example

12 years agoSimplified Off Canvas example:
ggam [Sat, 10 Aug 2013 11:36:05 +0000 (13:36 +0200)] 
Simplified Off Canvas example:
- Removed unneeded media queries to be more consistent with the rest of Bootstrap.
- Fixed unworking grid on latest 3.0 builds (BS version on this repo is outdated)
- Inluded needed bootstrap.js

12 years agoAdded url paths to navbar navbar-static-top and navbar-fixed-top
Jesse Hu [Tue, 6 Aug 2013 07:00:40 +0000 (03:00 -0400)] 
Added url paths to navbar navbar-static-top and navbar-fixed-top

12 years agoChanged nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static...
Jesse Hu [Tue, 6 Aug 2013 06:47:58 +0000 (02:47 -0400)] 
Changed nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static-top as mentioned in Docs

12 years agoAdded jquery.js and bootstrap.js tags to navbar and navbar-fixed top
Jesse Hu [Tue, 6 Aug 2013 06:46:08 +0000 (02:46 -0400)] 
Added jquery.js and bootstrap.js tags to navbar and navbar-fixed top

12 years agoAdded glyphicons to index.html
Jesse Hu [Tue, 6 Aug 2013 06:34:36 +0000 (02:34 -0400)] 
Added glyphicons to index.html

12 years agoMerge pull request #36 from ggam/patch-1
Mark Otto [Sat, 3 Aug 2013 00:17:28 +0000 (17:17 -0700)] 
Merge pull request #36 from ggam/patch-1

Included required JavaScript in navbar-static-top

12 years agoIncluded required JavaScript in navbar-static-top
Guillermo González de Agüero [Fri, 2 Aug 2013 09:53:25 +0000 (11:53 +0200)] 
Included required JavaScript in navbar-static-top

12 years agoMerge pull request #22 from Dev-Ad/patch-1
Mark Otto [Wed, 31 Jul 2013 00:43:55 +0000 (17:43 -0700)] 
Merge pull request #22 from Dev-Ad/patch-1

.navbar-wrapper need higher z-index to be on top of the carousel

12 years agoMerge pull request #9 from ssorallen/carousel-img-height-js-path
Mark Otto [Wed, 31 Jul 2013 00:43:39 +0000 (17:43 -0700)] 
Merge pull request #9 from ssorallen/carousel-img-height-js-path

Carousel image height and JS path

12 years agoMerge pull request #7 from sprice/update_scripts
Mark Otto [Wed, 31 Jul 2013 00:43:18 +0000 (17:43 -0700)] 
Merge pull request #7 from sprice/update_scripts

Update scripts

12 years agoMerge pull request #18 from p8952/local-jquery
Mark Otto [Wed, 31 Jul 2013 00:42:46 +0000 (17:42 -0700)] 
Merge pull request #18 from p8952/local-jquery

use the local copy of jquery

12 years agoMerge pull request #13 from hph/master
Mark Otto [Wed, 31 Jul 2013 00:42:33 +0000 (17:42 -0700)] 
Merge pull request #13 from hph/master

Fix relative links to examples and links to docs

12 years agoMerge pull request #10 from ssorallen/sigin-input-block
Mark Otto [Wed, 31 Jul 2013 00:42:10 +0000 (17:42 -0700)] 
Merge pull request #10 from ssorallen/sigin-input-block

Replace 'input-block-level' with 'form-control'

12 years agoMerge pull request #16 from ssorallen/starter-template-js
Mark Otto [Wed, 31 Jul 2013 00:41:57 +0000 (17:41 -0700)] 
Merge pull request #16 from ssorallen/starter-template-js

Add jQuery + Bootstrap JS to starter template

12 years agoMerge pull request #11 from ssorallen/jumbotron-js-inputs
Mark Otto [Wed, 31 Jul 2013 00:41:43 +0000 (17:41 -0700)] 
Merge pull request #11 from ssorallen/jumbotron-js-inputs

Jumbotron JS + "form-control"

12 years agoMerge pull request #24 from ssorallen/sticky-footer-js
Mark Otto [Wed, 31 Jul 2013 00:37:21 +0000 (17:37 -0700)] 
Merge pull request #24 from ssorallen/sticky-footer-js

Sticky footer example JS and navbar dropdown style

12 years agoUse correct class for header in jumbotron dropdown nav
Ross Allen [Tue, 30 Jul 2013 17:33:48 +0000 (10:33 -0700)] 
Use correct class for header in jumbotron dropdown nav

12 years agoEnable dropdown in sticky-footer with Bootstrap JS
Ross Allen [Tue, 30 Jul 2013 17:10:34 +0000 (10:10 -0700)] 
Enable dropdown in sticky-footer with Bootstrap JS

The sticky-footer example uses a drop down in its navbar, and dropdowns
require Bootstrap's JS to work.

Use the minified version of Bootstrap since this example is about the
CSS and not about the JS.

12 years agoUse correct dropdown header class in sticky-footer
Ross Allen [Tue, 30 Jul 2013 17:09:30 +0000 (10:09 -0700)] 
Use correct dropdown header class in sticky-footer

"nav-header" does not exist in Bootstrap. The class used for headers
in dropdowns is "dropdown-header".

12 years ago.navbar-wrapper need higher z-index to be on top of the carousel
Gerhard [Tue, 30 Jul 2013 14:23:34 +0000 (16:23 +0200)] 
.navbar-wrapper need higher z-index to be on top of the carousel

12 years agouse the local copy of jquery
Peter Wilmott [Mon, 29 Jul 2013 20:23:19 +0000 (21:23 +0100)] 
use the local copy of jquery

12 years agoAdd jQuery + Bootstrap JS to starter template
Ross Allen [Mon, 29 Jul 2013 18:24:40 +0000 (11:24 -0700)] 
Add jQuery + Bootstrap JS to starter template

The starter template uses the Collapse component[1], which requires
Bootstrap's JavaScript.

Fixes #15

[1] http://twitter.github.io/bootstrap/javascript/#collapse

12 years agoFix relative links to examples and links to docs
Haukur Páll Hallvarðsson [Sun, 28 Jul 2013 15:37:53 +0000 (15:37 +0000)] 
Fix relative links to examples and links to docs

12 years agoAdd Bootstrap JS to make collapsible nav work
Ross Allen [Sun, 28 Jul 2013 03:40:24 +0000 (20:40 -0700)] 
Add Bootstrap JS to make collapsible nav work

This example uses the collapsible nav for smaller screen sizes, and it
requires Bootstrap JS to get that functionality.

12 years agoAdd new 'form-control' class to style header inputs
Ross Allen [Sun, 28 Jul 2013 03:39:24 +0000 (20:39 -0700)] 
Add new 'form-control' class to style header inputs

12 years agoReplace 'input-block-level' with 'form-control'
Ross Allen [Sun, 28 Jul 2013 03:19:20 +0000 (20:19 -0700)] 
Replace 'input-block-level' with 'form-control'

'input-block-level' was replaced with 'form-control' in v3. To get
block-level inputs, the 'form-control' class is now needed.

12 years agoUpdate carousel example JS path
Ross Allen [Sun, 28 Jul 2013 03:17:53 +0000 (20:17 -0700)] 
Update carousel example JS path

'bootstrap.min.js' lives in '../bootstrap/js' now. Switch to the
minified version for a smaller download since this example is focused
on CSS changes, not JavaScript ones.

12 years agoMatch .carousel-inner specificity to beat styles
Ross Allen [Sun, 28 Jul 2013 03:14:49 +0000 (20:14 -0700)] 
Match .carousel-inner specificity to beat styles

'.carousel ing' was replaced with '.carousel-inner > .item > img' in
3.0 and now loses the specificity war. To make carousel images 500px
tall, match specificity to make carousel.css win.

12 years agoUse local copy of jquery instead of hotlinking
Shawn Price [Sat, 27 Jul 2013 21:30:38 +0000 (14:30 -0700)] 
Use local copy of jquery instead of hotlinking

12 years agoFix path to bootstrap javascript
Shawn Price [Sat, 27 Jul 2013 21:28:13 +0000 (14:28 -0700)] 
Fix path to bootstrap javascript

12 years agofix up carousel holder and navbar probs
Mark Otto [Sat, 27 Jul 2013 03:48:10 +0000 (20:48 -0700)] 
fix up carousel holder and navbar probs

12 years agoMerge branch 'example-named-files'
Mark Otto [Sat, 27 Jul 2013 03:43:22 +0000 (20:43 -0700)] 
Merge branch 'example-named-files'

Conflicts:
.gitignore

12 years agomassive update, including new index page
Mark Otto [Sat, 27 Jul 2013 03:42:47 +0000 (20:42 -0700)] 
massive update, including new index page

12 years agoMerge branch 'master' of github.com:twbs/bootstrap-examples
Mark Otto [Sat, 27 Jul 2013 03:26:53 +0000 (20:26 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap-examples

12 years agoadd git ignore
Nicole [Sun, 21 Jul 2013 06:30:08 +0000 (23:30 -0700)] 
add git ignore

12 years agochange file names to example names
Nicole [Sun, 21 Jul 2013 06:17:01 +0000 (23:17 -0700)] 
change file names to example names

12 years agoMerge pull request #2 from ssorallen/master
Mark Otto [Thu, 18 Jul 2013 22:41:11 +0000 (15:41 -0700)] 
Merge pull request #2 from ssorallen/master

Let .navbar-wrapper flow in Carousel example

12 years agoLet .navbar-wrapper flow in Carousel example
Ross Allen [Thu, 18 Jul 2013 21:57:27 +0000 (14:57 -0700)] 
Let .navbar-wrapper flow in Carousel example

A .navbar-wrapper followed by a .carousel works well in this example,
but when the navbar is not followed by a carousel, content flows
underneath the navbar because it is absolutely positioned.

Letting .navbar-wrapper be part of the flow and moving the negative
margin to the .carousel to bring it underneath the navbar makes these
example styles suitable for pages without carousels.

12 years agoMerge branch 'master' of github.com:twbs/bootstrap-examples
Mark Otto [Mon, 24 Jun 2013 03:34:38 +0000 (20:34 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap-examples

12 years agoadd gitignore and editorconfig
Mark Otto [Mon, 24 Jun 2013 03:33:37 +0000 (20:33 -0700)] 
add gitignore and editorconfig

12 years agoMerge branch 'master' of https://github.com/twbs/bootstrap-examples
Nicole [Mon, 24 Jun 2013 00:17:20 +0000 (17:17 -0700)] 
Merge branch 'master' of https://github.com/twbs/bootstrap-examples

12 years agoUpdate remaining templates to match starter template
Nicole [Mon, 24 Jun 2013 00:17:08 +0000 (17:17 -0700)] 
Update remaining templates to match starter template

12 years agomove readme to root
Mark Otto [Sun, 23 Jun 2013 20:21:40 +0000 (13:21 -0700)] 
move readme to root

12 years agoAdd basic readme
Mark Otto [Sun, 23 Jun 2013 01:29:13 +0000 (18:29 -0700)] 
Add basic readme

12 years agoCreate CNAME
Mark Otto [Sat, 22 Jun 2013 22:35:58 +0000 (16:35 -0600)] 
Create CNAME

12 years agoadd example screenshots dir
Mark Otto [Thu, 20 Jun 2013 06:17:17 +0000 (23:17 -0700)] 
add example screenshots dir

12 years agominify latest bs3
Mark Otto [Thu, 20 Jun 2013 06:16:34 +0000 (23:16 -0700)] 
minify latest bs3

12 years agoupdate starter template to use new format; include latest BS3 CSS
Mark Otto [Thu, 20 Jun 2013 06:16:00 +0000 (23:16 -0700)] 
update starter template to use new format; include latest BS3 CSS

12 years agoOffcanvas example update
Mark Otto [Thu, 20 Jun 2013 03:31:03 +0000 (20:31 -0700)] 
Offcanvas example update

* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup

12 years agoMerge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumb...
Mark Otto [Thu, 20 Jun 2013 02:13:38 +0000 (19:13 -0700)] 
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example

12 years agoRedo grid documentation
Mark Otto [Mon, 10 Jun 2013 06:43:43 +0000 (23:43 -0700)] 
Redo grid documentation

* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic

12 years agonuke the .col
Mark Otto [Tue, 4 Jun 2013 04:57:51 +0000 (21:57 -0700)] 
nuke the .col

12 years agoFix navbar toggles
Robert Burns [Sun, 2 Jun 2013 21:51:36 +0000 (17:51 -0400)] 
Fix navbar toggles

12 years agoBetter grid template; link color change in docs navbar
Mark Otto [Fri, 17 May 2013 05:11:31 +0000 (22:11 -0700)] 
Better grid template; link color change in docs navbar

12 years agoMore row change ups:
Mark Otto [Fri, 17 May 2013 04:03:29 +0000 (21:03 -0700)] 
More row change ups:

* No more negative side margins
* However, keep the negative margin for nested rows

12 years agoFix buttons within examples
Robert Burns [Mon, 13 May 2013 02:04:22 +0000 (22:04 -0400)] 
Fix buttons within examples

12 years agoFix form in navbar
Robert Burns [Thu, 9 May 2013 11:21:22 +0000 (07:21 -0400)] 
Fix form in navbar

12 years agoMerge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas...
William Ghelfi [Wed, 8 May 2013 12:26:55 +0000 (14:26 +0200)] 
Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example

12 years agoadd offcanvas layout example based on bradfrost/this-is-responsive
William Ghelfi [Mon, 6 May 2013 13:58:04 +0000 (15:58 +0200)] 
add offcanvas layout example based on bradfrost/this-is-responsive

12 years agoadd offcanvas layout example based on bradfrost/this-is-responsive
William Ghelfi [Mon, 6 May 2013 13:58:04 +0000 (15:58 +0200)] 
add offcanvas layout example based on bradfrost/this-is-responsive

12 years agocorrect right nav in navbar examples
Mark Otto [Sat, 4 May 2013 22:00:59 +0000 (15:00 -0700)] 
correct right nav in navbar examples

12 years agoUpdate justified nav CSS for proper selectors
Mark Otto [Fri, 3 May 2013 22:18:04 +0000 (15:18 -0700)] 
Update justified nav CSS for proper selectors

12 years agoMerge pull request #7769 from holic/3.0.0-sticky-footer
Mark Otto [Fri, 3 May 2013 21:29:11 +0000 (14:29 -0700)] 
Merge pull request #7769 from holic/3.0.0-sticky-footer

Use padding instead of #push with box-sizing: border-box

12 years agoUse padding instead of #push with box-sizing: border-box
Kevin Ingersoll [Fri, 3 May 2013 03:22:27 +0000 (15:22 +1200)] 
Use padding instead of #push with box-sizing: border-box

12 years agoCorrected typo in carousel.html
Seth Lilly [Thu, 2 May 2013 17:03:54 +0000 (14:03 -0300)] 
Corrected typo in carousel.html

Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.

12 years agoUpdate examples after grid changes
Robert Burns [Mon, 29 Apr 2013 02:22:33 +0000 (22:22 -0400)] 
Update examples after grid changes

12 years agoUpdate examples after overhaul of navbar navs
Robert Burns [Sun, 28 Apr 2013 13:10:01 +0000 (09:10 -0400)] 
Update examples after overhaul of navbar navs

12 years agorefactor some of the carousel caption stuff to center it and tighten styles up; updat...
Mark Otto [Tue, 2 Apr 2013 23:17:04 +0000 (16:17 -0700)] 
refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first

12 years agoImprove responsiveness for tablet and below of navbar in carousel example
Fabien [Tue, 2 Apr 2013 11:39:04 +0000 (13:39 +0200)] 
Improve responsiveness for tablet and below of navbar in carousel example

- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel

12 years agoReplace png img by holder.js in carousel example
Fabien [Tue, 2 Apr 2013 11:30:13 +0000 (13:30 +0200)] 
Replace png img by holder.js in carousel example

12 years agoFix corss link for sticky footer
Fabien [Tue, 2 Apr 2013 11:26:35 +0000 (13:26 +0200)] 
Fix corss link for sticky footer

12 years agoFix link to navbar doc
Fabien [Tue, 2 Apr 2013 11:22:31 +0000 (13:22 +0200)] 
Fix link to navbar doc

12 years agoMerge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsr...
Mark Otto [Mon, 1 Apr 2013 20:17:31 +0000 (13:17 -0700)] 
Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel

12 years agoonly negative indent nested grid rows; add new grid example
Mark Otto [Mon, 1 Apr 2013 19:55:48 +0000 (12:55 -0700)] 
only negative indent nested grid rows; add new grid example

12 years agoAdditional cleanup to responsive navbar
Robert Burns [Mon, 1 Apr 2013 16:58:40 +0000 (12:58 -0400)] 
Additional cleanup to responsive navbar

12 years agoAdd carousel indicators to example
Robert Burns [Mon, 1 Apr 2013 13:29:43 +0000 (09:29 -0400)] 
Add carousel indicators to example

12 years agoUpdate carousel-caption btn styles
Robert Burns [Mon, 1 Apr 2013 13:27:49 +0000 (09:27 -0400)] 
Update carousel-caption btn styles

12 years agoFix image paths and carousel controls for carousel example
Robert Burns [Mon, 1 Apr 2013 01:25:45 +0000 (21:25 -0400)] 
Fix image paths and carousel controls for carousel example

12 years agoadd some container padding for examples
Mark Otto [Sun, 31 Mar 2013 18:24:31 +0000 (11:24 -0700)] 
add some container padding for examples

12 years agoactually readd the padding and set it to smaller amount for narrow viewports
Mark Otto [Sun, 31 Mar 2013 05:54:31 +0000 (22:54 -0700)] 
actually readd the padding and set it to smaller amount for narrow viewports

12 years agoremove padding form sign in form example
Mark Otto [Sun, 31 Mar 2013 05:53:35 +0000 (22:53 -0700)] 
remove padding form sign in form example

12 years agodrop .muted for .text-muted
Mark Otto [Sat, 30 Mar 2013 07:11:38 +0000 (00:11 -0700)] 
drop .muted for .text-muted

12 years agoRemove grid example; update grid classes in examples
Mark Otto [Wed, 27 Mar 2013 00:17:39 +0000 (17:17 -0700)] 
Remove grid example; update grid classes in examples

12 years agoremove .navbar-inner from starter template
Mark Otto [Tue, 26 Mar 2013 19:31:03 +0000 (12:31 -0700)] 
remove .navbar-inner from starter template

12 years agoMerge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0...
Mark Otto [Tue, 26 Mar 2013 19:28:00 +0000 (12:28 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip

Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html

12 years agoFixed the navbar toggle in example templates by changing all the ".btn .btn-navbar...
mo [Tue, 26 Mar 2013 01:13:13 +0000 (18:13 -0700)] 
Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"

12 years agoFixed all the .brand in navbar to .navbar-brand
mo [Tue, 26 Mar 2013 00:46:44 +0000 (17:46 -0700)] 
Fixed all the .brand in navbar to .navbar-brand

12 years agonuke remaining less/tests/ files and move grid over to examples dir
Mark Otto [Tue, 26 Feb 2013 08:49:21 +0000 (00:49 -0800)] 
nuke remaining less/tests/ files and move grid over to examples dir

12 years agomoved examples added
Mark Otto [Tue, 26 Feb 2013 08:42:24 +0000 (00:42 -0800)] 
moved examples added

12 years agomore narrow jumbotron example fixes in the mobile first arena
Mark Otto [Mon, 18 Feb 2013 03:04:38 +0000 (19:04 -0800)] 
more narrow jumbotron example fixes in the mobile first arena

12 years agoRefactor some common classes from docs css and examples, then prevent examples from...
Mark Otto [Mon, 18 Feb 2013 02:58:40 +0000 (18:58 -0800)] 
Refactor some common classes from docs css and examples, then prevent examples from using docs.css

12 years agorevamp narrow jumbotron to avoid conflicts with docs .masthead
Mark Otto [Mon, 18 Feb 2013 02:48:00 +0000 (18:48 -0800)] 
revamp narrow jumbotron to avoid conflicts with docs .masthead

12 years agoNuke the fluid example since it's no longer applicable
Mark Otto [Sat, 16 Feb 2013 09:43:23 +0000 (01:43 -0800)] 
Nuke the fluid example since it's no longer applicable

12 years agofix spelling as pointed out by @jodytate that got nuked in the merge
Mark Otto [Fri, 15 Feb 2013 07:51:35 +0000 (23:51 -0800)] 
fix spelling as pointed out by @jodytate that got nuked in the merge

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 15 Feb 2013 07:44:50 +0000 (23:44 -0800)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html