Commits · 35e5f6f16919c85ef8ed2d0f240ba98b13e58db4 · Bootstrap / bootstrap

21 Jan, 2015 7 commits
- copy · 35e5f6f1
  Mark Otto authored 10 years ago
  
  35e5f6f1
- fix dupe images · 4a3ae1cf
  Mark Otto authored 10 years ago
  
  4a3ae1cf
- custom holder theme · 74fbf61e
  Mark Otto authored 10 years ago
  
  74fbf61e
- large page titles · 97eb1256
  Mark Otto authored 10 years ago
  
  97eb1256
- grunt · 4bed09af
  Mark Otto authored 10 years ago
  
  4bed09af
- Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 · c5d4ab25
  Mark Otto authored 10 years ago
  
  c5d4ab25
- fix docs homepage ad · 474ea24f
  Mark Otto authored 10 years ago
  
  474ea24f
20 Jan, 2015 14 commits
- Merge pull request #61 from twbs/clear-out-fonts · 6ebf6829
  Mark Otto authored 10 years ago
```
remove unused font files
```
  6ebf6829
- Update README.md · 26037841
  Mark Otto authored 10 years ago
  
  26037841
- new headers, ad placements, intro paragraphs on several pages, etc · 33e32bff
  Mark Otto authored 10 years ago
  
  33e32bff
- fix scrollspy nav · ff1d10af
  Mark Otto authored 10 years ago
  
  ff1d10af
- Merge pull request #52 from twbs/normalize-figure · 8ecdda0b
  Chris Rebert authored 10 years ago
```
Let Normalize.css normalize <figure>'s margin
```
  8ecdda0b
- fix broken brand logos · 6f61201f
  Mark Otto authored 10 years ago
  
  6f61201f
- no need for additional subheading · 2327a1d4
  Mark Otto authored 10 years ago
  
  2327a1d4
- tons of docs helpers cleanup · e2c6dd29
  Mark Otto authored 10 years ago
  
  e2c6dd29
- properly reset button.close styles · 6ba05d95
  Mark Otto authored 10 years ago
  
  6ba05d95
- fix quick floats example · 29c7a0f0
  Mark Otto authored 10 years ago
  
  29c7a0f0
- fix broken breadcrumb divider · dfdb99c9
  Mark Otto authored 10 years ago
  
  dfdb99c9
- fix broken buttons · 21dc9b1f
  Mark Otto authored 10 years ago
  
  21dc9b1f
- separate examples for inline radios and checkboxes · e1dfe01c
  Mark Otto authored 10 years ago
  
  e1dfe01c
- consolidate forms docs · 43e45ce0
  Mark Otto authored 10 years ago
  
  43e45ce0
19 Jan, 2015 18 commits
- docs subheading tweaks · dba0e3c9
  Mark Otto authored 10 years ago
  
  dba0e3c9
- fix border color on inverse tables · 3fe96e8f
  Mark Otto authored 10 years ago
  
  3fe96e8f
- better separation of docs sections with a light bottom border on h2s · affd8912
  Mark Otto authored 10 years ago
  
  affd8912
- remove unnecessary docs sections for media queries page · 1633da2c
  Mark Otto authored 10 years ago
  
  1633da2c
- fix homepage nav styles · 72bc9b97
  Mark Otto authored 10 years ago
  
  72bc9b97
- nuke files · a72741ed
  Mark Otto authored 10 years ago
  
  a72741ed
- move around files · d8c94029
  Mark Otto authored 10 years ago
  
  d8c94029
- grunt · faedb7fe
  Mark Otto authored 10 years ago
  
  faedb7fe
- fix invalid css · 7440c384
  Mark Otto authored 10 years ago
  
  7440c384
- Merge branch 'master' into v4 · 325748ff
  Mark Otto authored 10 years ago
```
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	...
```
  325748ff
- Merge pull request #15605 from twbs/deps · 4fd01b7a
  XhmikosR authored 10 years ago
```
Update devDependencies.
```
  4fd01b7a
- Update devDependencies. · fbc220de
  XhmikosR authored 10 years ago
  
  fbc220de
- customizer typo · 24aad4fe
  Mark Otto authored 10 years ago
  
  24aad4fe
- Merge pull request #15604 from twbs/ship_v3.3.2 · bcf7dd38
  Mark Otto authored 10 years ago
```
Ship v3.3.2
```
  bcf7dd38
- grunt · fa47de71
  Mark Otto authored 10 years ago
  
  fa47de71
- bump versions · c683e7de
  Mark Otto authored 10 years ago
  
  c683e7de
- grunt · ce29def7
  Mark Otto authored 10 years ago
  
  ce29def7
- remove less references from package files · 0964504f
  Thomas McDonald authored 10 years ago
```
Closes #62 (of v4)
```
  0964504f
18 Jan, 2015 1 commit
- Merge pull request #64 from twbs/fix-build · 1236e7a9
  Chris Rebert authored 10 years ago
```
Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"
```
  1236e7a9