rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity
187 Commits 107 Branches 89 Tags
Commit Graph

187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
6b5a199559 Merge pull request #42 from huyouare/navbar-paths 
Paths to navbar, navbar-fixed-top and navbar-static-top fixed in the navbar.
 2013-08-15 16:23:33 -07:00
Mark Otto
0bc2a69fc9 Merge pull request #46 from ggam/revamp-offcanvas 
Simplified Off Canvas example
 2013-08-15 16:23:24 -07:00
ggam
6e8ace4b2b 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
 2013-08-10 13:36:05 +02:00
Jesse Hu
a24319eb44 Added url paths to navbar navbar-static-top and navbar-fixed-top 2013-08-06 03:00:40 -04:00
Jesse Hu
da249b55c4 Changed nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static-top as mentioned in Docs 2013-08-06 02:47:58 -04:00
Jesse Hu
6739522d6c Added jquery.js and bootstrap.js tags to navbar and navbar-fixed top 2013-08-06 02:46:08 -04: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
Guillermo González de Agüero
ee6db98136 Included required JavaScript in navbar-static-top 2013-08-02 11:53:25 +02:00
Mark Otto
031ed98c8b Merge pull request #22 from Dev-Ad/patch-1 
.navbar-wrapper need higher z-index to be on top of the carousel
 2013-07-30 17:43:55 -07:00
Mark Otto
2a4aacc037 Merge pull request #9 from ssorallen/carousel-img-height-js-path 
Carousel image height and JS path
 2013-07-30 17:43:39 -07:00
Mark Otto
26053b94e5 Merge pull request #7 from sprice/update_scripts 
Update scripts
 2013-07-30 17:43:18 -07:00
Mark Otto
1edaabb250 Merge pull request #18 from p8952/local-jquery 
use the local copy of jquery
 2013-07-30 17:42:46 -07:00
Mark Otto
aa90811fb0 Merge pull request #13 from hph/master 
Fix relative links to examples and links to docs
 2013-07-30 17:42:33 -07:00
Mark Otto
a9830a0bab Merge pull request #10 from ssorallen/sigin-input-block 
Replace 'input-block-level' with 'form-control'
 2013-07-30 17:42:10 -07:00
Mark Otto
6c2db4bbbe Merge pull request #16 from ssorallen/starter-template-js 
Add jQuery + Bootstrap JS to starter template
 2013-07-30 17:41:57 -07:00
Mark Otto
4a060881d7 Merge pull request #11 from ssorallen/jumbotron-js-inputs 
Jumbotron JS + "form-control"
 2013-07-30 17:41:43 -07:00
Mark Otto
0f23f514ab Merge pull request #24 from ssorallen/sticky-footer-js 
Sticky footer example JS and navbar dropdown style
 2013-07-30 17:37:21 -07:00
Ross Allen
ad01dd8ce8 Use correct class for header in jumbotron dropdown nav 2013-07-30 10:33:48 -07:00
Ross Allen
6a8f76f020 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.
 2013-07-30 10:10:34 -07:00
Ross Allen
934cf4f683 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".
 2013-07-30 10:09:30 -07:00
Gerhard
a9144b50ea .navbar-wrapper need higher z-index to be on top of the carousel 2013-07-30 16:23:34 +02:00
Peter Wilmott
c2b7e2ca27 use the local copy of jquery 2013-07-29 21:23:19 +01:00
Ross Allen
07dd62ed7c 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
 2013-07-29 11:24:40 -07:00
Haukur Páll Hallvarðsson
582787342e Fix relative links to examples and links to docs 2013-07-28 15:37:53 +00:00
Ross Allen
d149f651f2 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.
 2013-07-27 20:40:24 -07:00
Ross Allen
cee5f6fbdf Add new 'form-control' class to style header inputs 2013-07-27 20:39:24 -07:00
Ross Allen
1a1bc33406 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.
 2013-07-27 20:24:28 -07:00
Ross Allen
ce1fdc5ded 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.
 2013-07-27 20:17:53 -07:00
Ross Allen
c834b4027c 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.
 2013-07-27 20:14:49 -07:00
Shawn Price
d8b477f273 Use local copy of jquery instead of hotlinking 2013-07-27 14:30:38 -07:00
Shawn Price
dfa71726a9 Fix path to bootstrap javascript 2013-07-27 14:28:13 -07:00
Mark Otto
2998929b39 fix up carousel holder and navbar probs 2013-07-26 20:48:10 -07:00
Mark Otto
c3e6626411 Merge branch 'example-named-files' 
Conflicts:
	.gitignore
 2013-07-26 20:43:22 -07:00
Mark Otto
9c13af8cb1 massive update, including new index page 2013-07-26 20:42:47 -07:00
Mark Otto
4b849e5fd7 Merge branch 'master' of github.com:twbs/bootstrap-examples 2013-07-26 20:26:53 -07:00
Nicole
6d269c2ed7 add git ignore 2013-07-20 23:30:08 -07:00
Nicole
bf51e24700 change file names to example names 2013-07-20 23:17:01 -07:00
Mark Otto
36c2a34c1e Merge pull request #2 from ssorallen/master 
Let .navbar-wrapper flow in Carousel example
 2013-07-18 15:41:11 -07:00
Ross Allen
1a2ef331fd 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.
 2013-07-18 14:57:27 -07:00
Mark Otto
838bc93724 Merge branch 'master' of github.com:twbs/bootstrap-examples 2013-06-23 20:34:38 -07:00
Mark Otto
0dffb03c0b add gitignore and editorconfig 2013-06-23 20:33:37 -07:00
Nicole
0a1c46a12c Merge branch 'master' of https://github.com/twbs/bootstrap-examples 2013-06-23 17:17:20 -07:00
Nicole
8e50e7a8f2 Update remaining templates to match starter template 2013-06-23 17:17:08 -07:00
Mark Otto
eec86051a4 move readme to root 2013-06-23 13:21:40 -07:00
Mark Otto
471c409a12 Add basic readme 2013-06-22 18:29:13 -07:00
Mark Otto
5226490115 Create CNAME 2013-06-22 16:35:58 -06:00
Mark Otto
14273cd53d add example screenshots dir 2013-06-19 23:17:17 -07:00
Mark Otto
a550ea5113 minify latest bs3 2013-06-19 23:16:34 -07:00
Mark Otto
f91559d85d update starter template to use new format; include latest BS3 CSS 2013-06-19 23:16:00 -07:00
Mark Otto
9f73fef30a 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
 2013-06-19 20:31:03 -07:00