diff options
| author | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
| commit | 12c619f5b9149a4d3f4d24efe106504b6a8a5004 (patch) | |
| tree | dacdd064110d04b8195151c08ef4e5713ba3ea24 /docs/_data | |
| parent | f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc (diff) | |
| parent | 7e299c6a49bced5d2c2581a5504ddf7dbcaf041f (diff) | |
| download | bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.tar.xz bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.zip | |
Merge branch 'master' into boulox-responsive-embed
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_data')
| -rw-r--r-- | docs/_data/core-team.yml | 19 | ||||
| -rw-r--r-- | docs/_data/glyphicons.yml | 2 | ||||
| -rw-r--r-- | docs/_data/sass-team.yml | 7 | ||||
| -rw-r--r-- | docs/_data/showcase.yml | 19 |
4 files changed, 46 insertions, 1 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml new file mode 100644 index 000000000..d1177964d --- /dev/null +++ b/docs/_data/core-team.yml @@ -0,0 +1,19 @@ +- name: Mark Otto + user: mdo + gravatar: bc4ab438f7a4ce1c406aadc688427f2c + +- name: Jacob Thornton + user: fat + gravatar: a98244cbdacaf1c0b55499466002f7a8 + +- name: Chris Rebert + user: cvrebert + gravatar: edec428c425453955f770095a7d26c50 + +- name: Julian Thilo + user: juthilo + gravatar: 0f7dd3ce58a416be5685ea6194f82b11 + +- name: XhmikosR + user: xhmikosr + gravatar: e37759b1ea0125d4e97b1e00b5eed26f diff --git a/docs/_data/glyphicons.yml b/docs/_data/glyphicons.yml index 80b4c9b08..fc4a8a58a 100644 --- a/docs/_data/glyphicons.yml +++ b/docs/_data/glyphicons.yml @@ -1,4 +1,4 @@ -# This file is generated via Grunt task. **Do not edit directly.** +# This file is generated via Grunt task. **Do not edit directly.** # See the 'build-glyphicons-data' task in Gruntfile.js. - glyphicon-asterisk diff --git a/docs/_data/sass-team.yml b/docs/_data/sass-team.yml new file mode 100644 index 000000000..9918e23ce --- /dev/null +++ b/docs/_data/sass-team.yml @@ -0,0 +1,7 @@ +- name: Thomas McDonald + user: thomas-mcdonald + gravatar: 24cd55ab1a62ffb113ab8c02f64c9301 + +- name: Gleb Mazovetskiy + user: glebm + gravatar: 729f685b8e8d7e9feed18c177c82e59b diff --git a/docs/_data/showcase.yml b/docs/_data/showcase.yml new file mode 100644 index 000000000..eb62dcc89 --- /dev/null +++ b/docs/_data/showcase.yml @@ -0,0 +1,19 @@ +- name: Little + url: http://littleco.com + expo_url: http://expo.getbootstrap.com/2014/02/12/little/ + img: http://expo.getbootstrap.com/screenshots/little.jpg + +- name: Engine Yard + url: http://engineyard.com + expo_url: http://expo.getbootstrap.com/2014/02/10/engine-yard/ + img: http://expo.getbootstrap.com/screenshots/engine-yard.jpg + +- name: Webflow + url: http://webflow.com + expo_url: http://expo.getbootstrap.com/2014/02/04/webflow/ + img: http://expo.getbootstrap.com/screenshots/webflow.jpg + +- name: Sentry + url: https://getsentry.com + expo_url: http://expo.getbootstrap.com/2013/05/09/sentry/ + img: http://expo.getbootstrap.com/screenshots/sentry.jpg |