Fix layouts when using bootstrap 2.3.0

Use span10 instead of span12

Make some horizontal positioning changes

Author: ashawley

_layouts/frontpage.html

@@ -8,15 +8,15 @@
   <div class="darkblue-overlay">&nbsp;</div>
   <div class="container">
     <div class="row">
-      <div class="span12">
+      <div class="span10 offset1">
         <div class="scala-logo">
           <img src="{{ site.baseurl }}/resources/img/scala-logo-white.png" alt="Scala Logo" />
         </div>
         {% include navbar.html %}
       </div>
     </div>
     <div class="row">
-      <div class="span12">
+      <div class="span10 offset1">
         <div class="splash-text ontop">
           <h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
           <p class="splash-pitch">
@@ -69,7 +69,7 @@ <h2 style="font-weight: 700;">Object-Oriented Meets Functional</h2>
   <div class="bullet-row-1-wrap">
     <div class="container">
       <div class="row">
-        <div class="span12 bullet-point">
+        <div class="span10 offset1 bullet-point">
           <h2><span>Scala in a Nutshell</span></h2>
           <p class="click">&nbsp;click the boxes below to see Scala in action!&nbsp;</p>
         </div>
@@ -129,7 +129,7 @@ <h3>Higher-Order Functions</h3>
   <div class="where-to-learn-more">
     <div class="container">
       <div class="row">
-        <div class="span12">
+        <div class="span10 offset1">
           <a class="learn-more-btn" href="{{ site.baseurl }}/what-is-scala.html">Learn More</a>
           <p>or visit the <a class="italicize" href="{{ site.baseurl }}/documentation">Scala Documentation</a></p>
         </div>
@@ -150,11 +150,11 @@ <h3>Higher-Order Functions</h3>
 <div class="events">
   <div class="container">
     <div class="row">
-      <div class="span12 upcoming-events">
+      <div class="span10 offset1 upcoming-events">
         <h2><span>Upcoming Events</span></h2>
       </div>
 
-      <div class="span12" id="eventspane">
+      <div class="span10 offset1" id="eventspane">
       </div>
     </div>
   </div>
@@ -166,10 +166,10 @@ <h2><span>Upcoming Events</span></h2>
 <div class="training">
   <div class="container">
     <div class="row">
-      <div class="span12 upcoming-training">
+      <div class="span10 offset1 upcoming-training">
         <h2><span>Upcoming Training</span></h2>
       </div>
-      <div class="span12" id="trainingspane">
+      <div class="span10 offset1" id="trainingspane">
         <div class="add-training"><a href="{{ site.baseurl }}/training">See more trainings</a> or <a href="https://github.com/scala/scala-lang/tree/master/training">add one to our feed</a>
         </div>
 
@@ -181,7 +181,7 @@ <h2><span>Upcoming Training</span></h2>
 <div class="news">
   <div class="container">
     <div class="row">
-      <div class="span12">
+      <div class="span10 offset1">
       </div>
     </div>
     <div class="row">
@@ -193,12 +193,12 @@ <h2><span>Upcoming Training</span></h2>
 <div class="twitter">
   <div class="container">
     <div class="row">
-      <div class="span12">
+      <div class="span10 offset1">
         <h2 class="twitterhdr"><span>Scala on Twitter</span></h2>
       </div>
     </div>
     <div class="row">
-      <div class="span12">
+      <div class="span10 offset1">
         <div id="tweets" class="tweets">
           <a class="twitter-timeline" data-tweet-limit="4" data-chrome="noheader nofooter noborders" data-width="520" href="https://twitter.com/scala_lang">Tweets by scala_lang</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
         </div>

resources/css/main.css

@@ -1722,7 +1722,7 @@ a.btn.download:hover, a.btn.download:focus { background-color:#58ccd5; border-co
 .marker {
   position: absolute;
   top: 120px;
-  right: 280px;
+  right: 295px;
   -webkit-transform-style: preserve-3d;
   -webkit-transform: rotateX(60deg);
   -moz-transform-style: preserve-3d;
@@ -1950,7 +1950,7 @@ a.central-btn.api {
 }
 
 .download {
-  left: 120px;
+  left: 240px;
   top: 145px;
 }
 
@@ -1981,13 +1981,13 @@ a.for-platform {
 
 .api {
   text-align: right;
-  right: 120px;
+  right: 240px;
   top: 145px;
 }
 
 .big-scala-spiral {
   position: absolute;
-  left: 378px;
+  left: 498px;
   top: 30px;
   z-index: 100;
 }
@@ -2032,7 +2032,7 @@ a.for-platform {
   z-index: 50;
   position: absolute;
   top: 42px;
-  left: 142px;
+  left: 262px;
   width: 170px;
   font-family: "museo-slab", serif;
   font-size: 12px;
@@ -2045,7 +2045,7 @@ a.for-platform {
   z-index: 50;
   position: absolute;
   top: 42px;
-  right: 142px;
+  right: 262px;
   width: 160px;
   font-family: "museo-slab", serif;
   font-size: 12px;
@@ -2140,7 +2140,7 @@ figcaption {
   height: 100%;
   float: left;
   display: block;
-  width: 610px;
+  width: 61.8%; /* 1.618033988749^-1 */
   background: white;
   padding-top: 24px;
   padding-left: 9999em;

resources/js/main.js

@@ -45,7 +45,7 @@ $(document).ready(function(){
     }).get());
     boxes.height(maxHeight);
   }
-  var nutshell = $(".bullet-point").not(".span12");
+  var nutshell = $(".bullet-point").not(".span10");
   makeAllBoxesSameHeight(nutshell);
 
   // var newsBoxes = $(".newsbox");