2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

171 Commits

Author SHA1 Message Date
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
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
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
Mark Otto 84b6847c75 Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example 2013-06-19 19:13:38 -07:00
Mark Otto 993efebe4f 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
2013-06-09 23:43:43 -07:00
Mark Otto 37cd7b8596 nuke the .col 2013-06-03 21:57:51 -07:00
Robert Burns afe0ab13dd Fix navbar toggles 2013-06-02 17:51:36 -04:00
Mark Otto 9ecde4aab7 Better grid template; link color change in docs navbar 2013-05-16 22:11:31 -07:00
Mark Otto 551d729083 More row change ups:
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Robert Burns 4910e779ab Fix buttons within examples 2013-05-12 22:04:22 -04:00
Robert Burns 71377771fe Fix form in navbar 2013-05-09 07:21:22 -04:00
William Ghelfi 94c067e76f Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example 2013-05-08 14:26:55 +02:00
William Ghelfi 5e033dcc20 add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
William Ghelfi 18be5f6d42 add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-06 15:58:18 +02:00
Mark Otto 17713a6d39 correct right nav in navbar examples 2013-05-04 15:00:59 -07:00
Mark Otto a0d02368a3 Update justified nav CSS for proper selectors 2013-05-03 15:18:27 -07:00
Mark Otto 1bce9b295d Merge pull request #7769 from holic/3.0.0-sticky-footer
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Kevin Ingersoll a0aaa222a6 Use padding instead of #push with box-sizing: border-box 2013-05-03 15:23:10 +12:00
Seth Lilly c8daf15985 Corrected typo in carousel.html
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00