Mark Otto
|
83e5c01856
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
|
2013-01-31 17:57:31 -08:00 |
|
Mark Otto
|
baadc33c88
|
make on prev commit
|
2013-01-30 18:22:20 -08:00 |
|
Mark Otto
|
135e834bf4
|
Merge branch 'baslr-master' into 2.3.0-wip
|
2013-01-30 18:22:11 -08:00 |
|
Mark Otto
|
3cc65cb86c
|
clear up show-grid stuff
|
2013-01-30 18:16:14 -08:00 |
|
Mark Otto
|
dd4ce35ddc
|
add meta tag to second example
|
2013-01-30 17:46:18 -08:00 |
|
Mark Otto
|
a5fc3e0667
|
make on prev commit
|
2013-01-30 17:45:02 -08:00 |
|
Mark Otto
|
3b6b8e9f41
|
Merge branch 'greg-raven-patch-2' into 2.3.0-wip
|
2013-01-30 17:44:45 -08:00 |
|
Mark Otto
|
f20c3368e4
|
Update pagination example HTML to match examples
|
2013-01-30 17:42:03 -08:00 |
|
Mark Otto
|
ab0c055bc6
|
Merge pull request #6728 from fredsa/2.3.0-wip
Fix `form-actions` documentation
|
2013-01-28 10:35:16 -08:00 |
|
Fred Sauer
|
d6e3b6b5a4
|
Fix form-actions documentation
|
2013-01-28 10:01:59 -08:00 |
|
baslr
|
6afb1055e3
|
.icon-folder-close same width as icon-folder-open
.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folder
|
2013-01-26 01:01:10 +01:00 |
|
Greg Raven
|
22f1cc44ca
|
Update docs/templates/pages/getting-started.mustache
Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.
|
2013-01-22 06:46:53 -08:00 |
|
Mark Otto
|
d30f47efb2
|
Tighten up badges docs; less bottom margin on h3
|
2013-01-19 18:53:41 -08:00 |
|
Mark Otto
|
c21c3f101b
|
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
|
2013-01-19 17:06:40 -08:00 |
|
Mark Otto
|
64bc5dc91f
|
remove .navbar-inner from sticky footer navbar
|
2013-01-19 09:40:26 -08:00 |
|
Mark Otto
|
1a88367b72
|
mo betta links between sticky footer examples
|
2013-01-19 09:39:56 -08:00 |
|
Mark Otto
|
d7d5069be1
|
Add sticky footer navbar example to list; fix docs padding
|
2013-01-19 09:38:49 -08:00 |
|
Mark Otto
|
7c9295d44b
|
update sticky footer templates
|
2013-01-19 09:34:08 -08:00 |
|
Vickash Mahabir
|
67ec13a44c
|
Counters example doesn't need to be a table
|
2013-01-18 18:03:43 -04:00 |
|
Vickash Mahabir
|
964cb77383
|
Make the counter example more meaningful
|
2013-01-18 17:50:58 -04:00 |
|
Vickash Mahabir
|
665de0455c
|
Change .badge to .counter, make appearance more OSX-ish, and remove colors
|
2013-01-18 17:35:23 -04:00 |
|
Mark Otto
|
411e6b18cb
|
unified and simplified sign in form example
|
2013-01-18 01:52:16 -08:00 |
|
Mark Otto
|
82bfa965a7
|
cleanup more examples
|
2013-01-18 01:37:31 -08:00 |
|
Mark Otto
|
d4cb7077fe
|
mo betta justified nav
|
2013-01-18 01:33:55 -08:00 |
|
Mark Otto
|
604f76dcf8
|
overhaul justified nav example
|
2013-01-17 21:05:23 -08:00 |
|
Mark Otto
|
8111e307b9
|
Remove docs and prettify css from examples thus far; update narrow page
|
2013-01-17 20:39:38 -08:00 |
|
Mark Otto
|
caed3a9dbb
|
fix up jumbotron example
|
2013-01-17 20:35:59 -08:00 |
|
Mark Otto
|
6466fe00a1
|
Rename hero.html to jumbotron.html
|
2013-01-17 20:32:07 -08:00 |
|
Mark Otto
|
5075f4973b
|
Semibold dat .navbar .brand
|
2013-01-17 20:30:40 -08:00 |
|
Mark Otto
|
ac3c907799
|
finish updating starter template
|
2013-01-17 20:30:19 -08:00 |
|
Mark Otto
|
1b128b3431
|
comment tweaks and updating starter template
|
2013-01-17 20:28:05 -08:00 |
|
Mark Otto
|
fd89531f6a
|
Update commenting and structure of layout.mustache
|
2013-01-17 20:26:17 -08:00 |
|
Mark Otto
|
d9b35c2602
|
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
|
f068cdeb63
|
Combine .thumbnail and .img-thumbnail into simpler selectors
|
2013-01-17 20:18:03 -08:00 |
|
Mark Otto
|
ca74b9882b
|
Change .img-polaroid to .img-thumbnail
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
|
2013-01-17 20:16:04 -08:00 |
|
Mark Otto
|
89b6477bdc
|
Remove .info from table rows
|
2013-01-17 20:13:11 -08:00 |
|
Mark Otto
|
5663833bfc
|
Restore .btn-info
|
2013-01-17 19:51:22 -08:00 |
|
Mark Otto
|
b30b8c2c12
|
Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though.
|
2013-01-17 17:02:35 -08:00 |
|
Mark Otto
|
41ecc2a171
|
derp, numbers
|
2013-01-17 16:35:30 -08:00 |
|
Mark Otto
|
2523b91dad
|
dat min
|
2013-01-17 16:11:01 -08:00 |
|
Mark Otto
|
8765df47cd
|
remove global text-shadow from alerts components because it was fucking up buttons in a real way
|
2013-01-17 15:43:23 -08:00 |
|
Mark Otto
|
e304798194
|
scrollspy example twerks
|
2013-01-17 15:42:52 -08:00 |
|
Mark Otto
|
3a1e1167d6
|
restore scrollspy example
|
2013-01-17 15:40:43 -08:00 |
|
Mark Otto
|
97975c5fcf
|
Readd focused example of inputs to docs; clean up alerts section
|
2013-01-17 15:36:36 -08:00 |
|
Mark Otto
|
32bcbe5671
|
cleanup example templates
|
2013-01-17 15:00:49 -08:00 |
|
Mark Otto
|
f6226c9b91
|
Update Getting Started page to include mention of Respond
|
2013-01-17 14:49:52 -08:00 |
|
Mark Otto
|
237f5e15d3
|
Nuke shadows around thumbnails
|
2013-01-17 14:25:40 -08:00 |
|
Mark Otto
|
bb94de7873
|
Larger homepage headings
|
2013-01-17 14:22:41 -08:00 |
|
Mark Otto
|
5c76518f7d
|
Add respond.js to main docs pages, but only for IE8 and down
|
2013-01-17 14:00:03 -08:00 |
|
Mark Otto
|
01b465928e
|
overhaul alerts section of tests
|
2013-01-17 12:24:16 -08:00 |
|