diff options
| author | Mark Otto <[email protected]> | 2015-01-14 18:02:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-14 18:02:18 -0800 |
| commit | 0531d6476cc655fe7fce56356067512b75ce7a15 (patch) | |
| tree | 29ca60bd3edef23ea24e80f3d9bd526ecb01848c | |
| parent | 720d02c5e5fc435bb2145bfbbb17878a536d1efb (diff) | |
| parent | e94a597685e52d335747e61f3286abae3f6a5694 (diff) | |
| download | bootstrap-0531d6476cc655fe7fce56356067512b75ce7a15.tar.xz bootstrap-0531d6476cc655fe7fce56356067512b75ce7a15.zip | |
Merge pull request #63 from twbs/team-unity
Core & Sass Teams are now one and the same bigger Team
| -rw-r--r-- | docs/_data/core-team.yml | 8 | ||||
| -rw-r--r-- | docs/_data/sass-team.yml | 7 | ||||
| -rw-r--r-- | docs/about/team.md | 16 |
3 files changed, 8 insertions, 23 deletions
diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml index d1fd76320..2b3fd9ac6 100644 --- a/docs/_data/core-team.yml +++ b/docs/_data/core-team.yml @@ -25,3 +25,11 @@ - name: Patrick H. Lauke user: patrickhlauke gravatar: 357f279672db832fc41a5a2f36559fcb + +- name: Thomas McDonald + user: thomas-mcdonald + gravatar: 24cd55ab1a62ffb113ab8c02f64c9301 + +- name: Gleb Mazovetskiy + user: glebm + gravatar: 729f685b8e8d7e9feed18c177c82e59b diff --git a/docs/_data/sass-team.yml b/docs/_data/sass-team.yml deleted file mode 100644 index 9918e23ce..000000000 --- a/docs/_data/sass-team.yml +++ /dev/null @@ -1,7 +0,0 @@ -- name: Thomas McDonald - user: thomas-mcdonald - gravatar: 24cd55ab1a62ffb113ab8c02f64c9301 - -- name: Gleb Mazovetskiy - user: glebm - gravatar: 729f685b8e8d7e9feed18c177c82e59b diff --git a/docs/about/team.md b/docs/about/team.md index 8b4bf25bb..aa2a0c06a 100644 --- a/docs/about/team.md +++ b/docs/about/team.md @@ -20,19 +20,3 @@ Bootstrap is maintained by the founding team and a small group of invaluable cor </div> Get involved with Bootstrap development by [opening an issue](https://github.com/twbs/bootstrap/issues/new) or submitting a pull request. Read our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for information on how we develop. - -## Sass team - -<div class="list-group bs-team"> - {% for member in site.data.sass-team %} - <div class="list-group-item"> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user={{ member.user }}&type=follow"></iframe> - <a class="team-member" href="https://github.com/{{ member.user }}"> - <img src="http://www.gravatar.com/avatar/{{ member.gravatar }}" alt="@{{ member.user }}" width="32" height="32"> - <strong>{{ member.name }}</strong> <small>@{{ member.user }}</small> - </a> - </div> - {% endfor %} -</div> - -The [official Sass port of Bootstrap]({{ site.sass_repo }}) was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.0. Read the Sass [contributing guidelines](https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md) for information on how the Sass port is developed. |