Mark Otto
85cd847e47
actually readd the padding and set it to smaller amount for narrow viewports
2013-03-30 22:54:31 -07:00
Mark Otto
f8d78eba5c
remove padding form sign in form example
2013-03-30 22:53:35 -07:00
Mark Otto
9a0ee742f6
drop .muted for .text-muted
2013-03-30 00:11:38 -07:00
Mark Otto
2d47cb699e
Remove grid example; update grid classes in examples
2013-03-26 17:17:39 -07:00
Mark Otto
64946ce93b
remove .navbar-inner from starter template
2013-03-26 12:31:03 -07:00
Mark Otto
37ba2824bf
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
2013-03-26 12:28:00 -07:00
mo
597d9e8965
Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"
2013-03-25 18:13:13 -07:00
mo
110c5b70a1
Fixed all the .brand in navbar to .navbar-brand
2013-03-25 17:46:44 -07:00
Mark Otto
044b094b22
nuke remaining less/tests/ files and move grid over to examples dir
2013-02-26 00:49:21 -08:00
Mark Otto
61174c3c1d
moved examples added
2013-02-26 00:42:24 -08:00
Mark Otto
42488cbb45
more narrow jumbotron example fixes in the mobile first arena
2013-02-17 19:04:38 -08:00
Mark Otto
9f279c6077
Refactor some common classes from docs css and examples, then prevent examples from using docs.css
2013-02-17 18:58:40 -08:00
Mark Otto
c65063271a
revamp narrow jumbotron to avoid conflicts with docs .masthead
2013-02-17 18:48:00 -08:00
Mark Otto
34ca3d645a
Nuke the fluid example since it's no longer applicable
2013-02-16 01:43:23 -08:00
Mark Otto
c4b2bb5bcd
fix spelling as pointed out by @jodytate that got nuked in the merge
2013-02-14 23:51:35 -08:00
Mark Otto
87a317f42f
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
2013-02-14 23:44:50 -08:00
Mark Otto
0765ea43dd
Make example pages use Jekyll; add sticky footer navbar image to examples
2013-02-14 23:38:00 -08:00
jody tate
b9291929bf
Update docs/examples/sticky-footer.html
...
again, "it's" to "its" for grammar fun!
2013-02-14 13:30:22 -08:00
jody tate
83f55eab5b
Update docs/examples/sticky-footer-navbar.html
...
contraction "it's" to possessive "its", aka pedantic grammar fix
2013-02-14 13:26:52 -08:00
Mark Otto
407e935c9c
rearrange jekyll and docs
2013-02-12 12:44:41 -08:00
Mark Otto
eb02887bc3
nuke what we don't need for jekyll
2013-02-12 12:25:05 -08:00
Mark Otto
3db1b902c8
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
0a8d834af6
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
e4aa1fcef4
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto
cc58a65fa1
Use button element instead of a for responsive navbar buttons
2013-02-01 10:33:36 -08:00
Mark Otto
ce497ae730
start to refactor justified nav example
2013-02-01 10:32:08 -08:00
Mark Otto
b1088a2d49
button element instead of href-less a tag for navbar button
2013-02-01 10:30:48 -08:00
Mark Otto
7c55cf0660
Refactor jumbotron-narrow.html example
...
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto
c3fefca1be
Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes
2013-01-31 18:25:44 -08:00
Mark Otto
c16aee941f
Refactor jumbotron example:
...
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto
bd265daa82
Update starter template to include left/right padding on inner container; also include body padding
2013-01-31 18:06:56 -08:00
Mark Otto
5762b67a9f
remove .navbar-inner from sticky footer navbar
2013-01-19 09:40:26 -08:00
Mark Otto
57a66ee7cd
mo betta links between sticky footer examples
2013-01-19 09:39:56 -08:00
Mark Otto
4e938ff018
update sticky footer templates
2013-01-19 09:34:08 -08:00
Mark Otto
e405a22301
unified and simplified sign in form example
2013-01-18 01:52:16 -08:00
Mark Otto
07543a9403
cleanup more examples
2013-01-18 01:37:31 -08:00
Mark Otto
a4ad96b848
mo betta justified nav
2013-01-18 01:33:55 -08:00
Mark Otto
8713fa1edf
overhaul justified nav example
2013-01-17 21:05:23 -08:00
Mark Otto
70fca06f25
Remove docs and prettify css from examples thus far; update narrow page
2013-01-17 20:39:38 -08:00
Mark Otto
56f8b735a5
fix up jumbotron example
2013-01-17 20:35:59 -08:00
Mark Otto
0f1af68e69
Rename hero.html to jumbotron.html
2013-01-17 20:32:07 -08:00
Mark Otto
0050688fec
finish updating starter template
2013-01-17 20:30:19 -08:00
Mark Otto
dd58217712
comment tweaks and updating starter template
2013-01-17 20:28:05 -08:00
Mark Otto
68475f8707
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
0f9073c5cd
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
Mark Otto
cecabeadec
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
2013-01-13 04:26:52 -08:00
Mark Otto
d034ec74c4
fix username navbar text in fluid example for responsive variations
2013-01-12 00:20:13 -08:00
Mark Otto
07a5563a0b
Comment fix
2013-01-11 20:30:56 -08:00
Mark Otto
99649aad71
Remove navbar links from sticky footer navbar example
2013-01-11 11:00:45 -08:00
Mark Otto
98b0d4946f
Merge branch 'wilfra-patch-2' into 2.3.0-wip
2013-01-11 10:58:17 -08:00
