Commits · 75943868be04a76bb374b9f8347a3174596bb8ac · Bootstrap / bootstrap

01 Dec, 2014 11 commits

update home and side nav to use new navbar structure · 75943868
Mark Otto authored 10 years ago

75943868
add new album example · 639a2113
Mark Otto authored 10 years ago

639a2113

Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header... · 9180e15e

Mark Otto authored 10 years ago

Clean up navbar to remove .navbar-toggle, .navbar-collapse, and .navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse

9180e15e

nav tweaks · 19d15476
Mark Otto authored 10 years ago

19d15476
Merge branch 'master' into v4 · 72d17612
Mark Otto authored 10 years ago
```
Conflicts:
	docs/_includes/js/collapse.html
```
72d17612
nuke the other incomplete example per @ianw · a17f23c0
Mark Otto authored 10 years ago

a17f23c0
fixes and grunt · 7a799af9
Mark Otto authored 10 years ago

7a799af9
fix more broke shit, run grunt · 4bba2d0e
Mark Otto authored 10 years ago

4bba2d0e

Merge branch 'master' into v4 · b648a77e

Mark Otto authored 10 years ago

Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/...

b648a77e

Merge branch 'master' of github.com:twbs/bootstrap · 0eb2c922
Mark Otto authored 10 years ago

0eb2c922
clarify collapse example with link and button triggers; also mention classes · 88ec5152
Mark Otto authored 10 years ago

88ec5152

30 Nov, 2014 23 commits
- Merge pull request #15244 from zalog/patch-2 · ced63b0a
  Mark Otto authored 10 years ago
```
Center .icon-prev and .icon-next in carousel
```
  ced63b0a
- Merge pull request #15258 from Quy/media-object · 20ddded9
  Mark Otto authored 10 years ago
```
Add .media-object in docs
```
  20ddded9
- Add .media-object in docs · a6950ce2
  Quy Ton authored 10 years ago
  
  a6950ce2
- Example: minor image compression improvements. · 2a1a3e68
  XhmikosR authored 10 years ago
```
[ci skip]
```
  2a1a3e68
- Merge pull request #15183 from twbs/deps · d5a4db48
  XhmikosR authored 10 years ago
```
Update devDependencies
```
  d5a4db48
- Update devDependencies. · 61bbe74d
  XhmikosR authored 10 years ago
  
  61bbe74d
- Merge pull request #15134 from twbs/docs-gh · 4e2db80c
  XhmikosR authored 10 years ago
```
Add a target to generate the gh-pages files.
```
  4e2db80c
- Merge branch 'master' of github.com:twbs/bootstrap · e6fc081c
  Mark Otto authored 10 years ago
  
  e6fc081c
- Bump Glyphicons to v1.9 · bcb90ef3
  Mark Otto authored 10 years ago
  
  bcb90ef3
- Fixes #15096 : Fix navbar forms in the non-responsive example · d74fd9af
  Mark Otto authored 10 years ago
  
  d74fd9af
- Merge pull request #15133 from patrickhlauke/docs-table-fixes · 65f72ff0
  Mark Otto authored 10 years ago
```
Fixes to scope
```
  65f72ff0
- Fixes #15241: Add simple example to docs for collapse plugin · 9928144d
  Mark Otto authored 10 years ago
  
  9928144d
- grunt · 23bdfc45
  Mark Otto authored 10 years ago
  
  23bdfc45
- Fixes #15140: Restore more missing .media styles from shipping #14801 · 7e27e749
  Mark Otto authored 10 years ago
  
  7e27e749
- Alternate fix for #15250 with a more descriptive theme jumbotron · 149f32d9
  Mark Otto authored 10 years ago
  
  149f32d9
- grunt · 9c049c99
  Mark Otto authored 10 years ago
  
  9c049c99
- Fixes #15074 : Fix the nesting problem with form control size variants · 7c71b487
  Mark Otto authored 10 years ago
  
  7c71b487
- grunt · 80d7be11
  Mark Otto authored 10 years ago
  
  80d7be11
- Fixes #15124 : Restore .media-object · c2d868cf
  Mark Otto authored 10 years ago
  
  c2d868cf
- Fixes #15148 : make the dropdown and dropup menus have the same margins · c22b8dca
  Mark Otto authored 10 years ago
  
  c22b8dca
- fixes #15164 : wrap disable pagination spans in another span · 1de638f8
  Mark Otto authored 10 years ago
  
  1de638f8
- fix the run-on · c9289691
  Mark Otto authored 10 years ago
  
  c9289691
- Merge pull request #15238 from peterblazejewicz/docs/dist-update · a35ee9d2
  Mark Otto authored 10 years ago
```
Add CSS source maps reference to docs. Closes #15211
```
  a35ee9d2
29 Nov, 2014 5 commits
- clean up navbar examples · b53ad74d
  Mark Otto authored 10 years ago
  
  b53ad74d
- remove more mentions of theme · c9012873
  Mark Otto authored 10 years ago
  
  c9012873
- no more theme · 55148d32
  Mark Otto authored 10 years ago
  
  55148d32
- bump docs version · 0988cfbf
  Mark Otto authored 10 years ago
  
  0988cfbf
- Merge pull request #15167 from vsn4ik/rem_blob_master_from_links · 01fa32e8
  Mark Otto authored 10 years ago
```
Remove redundant .../blob/master/ prefix in markdown.
```
  01fa32e8
28 Nov, 2014 1 commit
- Merge pull request #15249 from dandv/patch-1 · b38e284e
  Chris Rebert authored 10 years ago
```
Fix copy/paste error
```
  b38e284e