Arnold Daniels
|
695c18090a
|
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
Fixed variables when loading custom.json
Conflicts:
Makefile
README.md
component.json
composer.json
docs/assets/css/bootstrap-responsive.css
docs/assets/js/application.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/javascript.html
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-typeahead.js
package.json
|
2013-02-20 02:16:44 +01:00 |
|
Arnold Daniels
|
f997a9ada7
|
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3
Conflicts:
Makefile
README.md
component.json
docs/assets/css/docs.css
docs/assets/img/bs-docs-bootstrap-features.png
docs/assets/img/bs-docs-responsive-illustrations.png
docs/assets/img/bs-docs-twitter-github.png
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/base-css.html
docs/components.html
docs/customize.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/index.mustache
js/bootstrap-typeahead.js
package.json
|
2012-12-10 00:22:22 +01:00 |
|
Mark Otto
|
d5697fcf6b
|
fixes #5717: add retina favicon, recompile docs
|
2012-10-31 10:41:41 -07:00 |
|
Arnold Daniels
|
9fcb8deb18
|
Use correct version in docs + readme + Makefile
Added the use of versions for Google analytics
Changed favicon
Modified package.json
|
2012-10-15 13:57:51 +02:00 |
|
Mark Otto
|
6bf661aceb
|
new fav and touch icons to match new masthead
|
2012-07-30 10:33:48 -07:00 |
|
Mark Otto
|
d1864b3608
|
adding 144x144 ipad touch icon
|
2012-03-25 00:46:03 -07:00 |
|
Mark Otto
|
8fd126ba1b
|
updated apple touch icons and moved input responsive fix from <480 to <767
|
2012-03-11 17:28:28 -07:00 |
|
Burak Tuyan
|
4a5867b18b
|
Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode)
|
2012-01-21 23:52:39 +02:00 |
|
Mark Otto
|
1d50fa77e4
|
adding quick and dirty favicons and touch icons for iOS
|
2011-09-13 09:35:43 -07:00 |
|