add translations, copy edit a few things, and fix alignment of ads

diff --git a/_includes/nav-about.html b/_includes/nav-about.html
index d6f971f6bee77669a75cbd4bd3bc572585795745..2cf12359b7955e42d05be236c6d2f967329afa15 100644 (file)
--- a/_includes/nav-about.html
+++ b/_includes/nav-about.html
@@ -7,3 +7,6 @@
 <li>
   <a href="#community">Community</a>
 </li>
+<li>
+  <a href="#translations">Translations</a>
+</li>

diff --git a/about.html b/about.html
index c9c208837573d3f34136651f26bf1a562e966219..e7bc384251b9236ac3425c6f8c5d4ce18011e857 100644 (file)
--- a/about.html
+++ b/about.html
@@ -13,8 +13,8 @@ base_url: "../"
   <div class="page-header">
     <h1 id="history">History</h1>
   </div>
-  <p class="lead">Originally created at Twitter by a designer and a developer nearly three years ago, Bootstrap has become one of the most popular front-end frameworks and open source projects in the world.</p>
-  <p>Bootstrap was created at Twitter in mid-2010 by <a href="https://twitter.com/mdo">@mdo</a> and <a href="https://twitter.com/fat">@fat</a>. Prior to being open-sourced framework, Bootstrap was known as <em>Twitter Blueprint</em>. A few months into development, Twitter held its <a href="https://blog.twitter.com/2010/hack-week">first Hack Week</a> and the project exploded as developers of all skill levels jumped in. It served as the style guide for internal tools development at the company for over a year before its public release.</p>
+  <p class="lead">Originally created by a designer and a developer at Twitter, Bootstrap has become one of the most popular front-end frameworks and open source projects in the world.</p>
+  <p>Bootstrap was created at Twitter in mid-2010 by <a href="https://twitter.com/mdo">@mdo</a> and <a href="https://twitter.com/fat">@fat</a>. Prior to being an open-sourced framework, Bootstrap was known as <em>Twitter Blueprint</em>. A few months into development, Twitter held its <a href="https://blog.twitter.com/2010/hack-week">first Hack Week</a> and the project exploded as developers of all skill levels jumped in without any external guidance. It served as the style guide for internal tools development at the company for over a year before its public release, and continues to do so today.</p>
   <p>Originally <a href="https://dev.twitter.com/blog/bootstrap-twitter">released</a> on <a href="https://twitter.com/mdo/statuses/104620039650557952"><time datetime="2011-08-19 11:25">Friday, August 19, 2011</time></a>, we've since had over <a href="https://github.com/twbs/bootstrap/releases">twenty releases</a>, including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach.</p>
 </div>
 
@@ -67,3 +67,19 @@ base_url: "../"
   </ul>
   <p>You can also follow <a href="https://twitter.com/twbootstrap">@twbootstrap on Twitter</a> for the latest gossip and awesome music videos.</p>
 </div>
+
+
+<!-- Translations
+================================================== -->
+<div class="bs-docs-section">
+  <div class="page-header">
+    <h1 id="translations">Translations</h1>
+  </div>
+  <p class="lead">Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.</p>
+  <ul>
+    <li><a href="http://v3.bootcss.com/">Bootstrap in Chinese</a></li>
+    <li><a href="http://bootstrap.oneskyapp.net/ru">Bootstrap in Russian</a></li>
+    <li><a href="http://bootstrap.oneskyapp.net/es">Bootstrap in Spanish</a></li>
+  </ul>
+  <p>Have another language to add, or perhaps a different or better translation? Let us know by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a>.</p>
+</div>

diff --git a/assets/css/docs.css b/assets/css/docs.css
index 0d8981d71eedea8e7fa170455be83ba27a4fcea4..c1ecf71b91bd64589e9b8fb9234ab68491f1be43 100644 (file)
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -373,7 +373,7 @@ body {
   .carbonad {
     position: absolute;
     top: 20px;
-    right: 0;
+    right: 15px; /* 15px instead of 0 since box-sizing */
     padding: 15px !important;
     width: 330px !important;
   }
@@ -1118,6 +1118,11 @@ h1[id] {
  * Odds and ends for optimum docs display.
  */
 
+ /* About page */
+ .bs-about {
+  font-size: 16px;
+ }
+
 /* Examples gallery: space out content better */
 .bs-examples h4 {
   margin-bottom: 5px;