Team members on About page

diff --git a/_config.yml b/_config.yml
index 32c94d3854c9ec4234ae3b195bec7df3680c09a2..65d12f386a38891eef46fbf654a6c3789b192114 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -19,6 +19,7 @@ download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.1.0/boo
 
 blog:             http://blog.getbootstrap.com
 expo:             http://expo.getbootstrap.com
+sass_repo:        https://github.com/twbs/bootstrap-sass
 
 cdn_css:          //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css
 cdn_theme_css:    //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css

diff --git a/_includes/nav-about.html b/_includes/nav-about.html
index 2cf12359b7955e42d05be236c6d2f967329afa15..f0f4a5b8a67d86e111157bcd371dd4245318623f 100644 (file)
--- a/_includes/nav-about.html
+++ b/_includes/nav-about.html
@@ -2,7 +2,7 @@
   <a href="#history">History</a>
 </li>
 <li>
-  <a href="#team">Core team</a>
+  <a href="#team">Team</a>
 </li>
 <li>
   <a href="#community">Community</a>

diff --git a/about.html b/about.html
index 2cd4e62f451dd7ba9ae63c150edf6ec5ec322ac9..b554d4546520a763afb1a1df479bbbe720a6f423 100644 (file)
--- a/about.html
+++ b/about.html
@@ -23,9 +23,11 @@ base_url: "../"
 ================================================== -->
 <div class="bs-docs-section">
   <div class="page-header">
-    <h1 id="team">Core team</h1>
+    <h1 id="team">Team</h1>
   </div>
   <p class="lead">Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.</p>
+
+  <h2 id="team-core">Core team</h2>
   <div class="list-group bs-team">
     <div class="list-group-item">
       <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=mdo&amp;type=follow"></iframe>
@@ -57,6 +59,39 @@ base_url: "../"
     </div>
   </div>
   <p>Get involved with Bootstrap development by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a> or submitting a pull request. Read our <a href="https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how we develop.</p>
+
+  <h2 id="team-sass">Sass team</h2>
+  <div class="list-group bs-team">
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=thomas-mcdonald&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/thomas-mcdonald">
+        <img src="http://www.gravatar.com/avatar/24cd55ab1a62ffb113ab8c02f64c9301" alt="@thomas-mcdonald">
+        <strong>Thomas McDonald</strong> <small>@thomas-mcdonald</small>
+      </a>
+    </div>
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=glebm&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/glebm">
+        <img src="http://www.gravatar.com/avatar/729f685b8e8d7e9feed18c177c82e59b" alt="@glebm">
+        <strong>Gleb Mazovetskiy</strong> <small>@glebm</small>
+      </a>
+    </div>
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=trisweb&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/trisweb">
+        <img src="http://www.gravatar.com/avatar/eb97c4cc97698ed0b22918225d178761" alt="@trisweb">
+        <strong>Tristan Harward</strong> <small>@trisweb</small>
+      </a>
+    </div>
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=sporkd&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/sporkd">
+        <img src="http://www.gravatar.com/avatar/492d8f2ba0e7807519cf4208e8f6d516" alt="@sporkd">
+        <strong>Peter Gumeson</strong> <small>@sporkd</small>
+      </a>
+    </div>
+  </div>
+  <p>The <a href="{{ site.sass_repo }}">official Sass port of Bootstrap</a> was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.</p>
 </div>
 
 

diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index 8a9f562e5a0dc6d157d90458b82f0efc18b22393..f528251af9c32146b59b40f4e06f9a5019c75d53 100644 (file)
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -643,7 +643,7 @@ h1[id] {
 .bs-team .github-btn {
   float: right;
   margin-top: 6px;
-  width: 120px;
+  width: 180px;
   height: 20px;
 }
 .bs-team img {