Merge branch 'onepointoh' of git.gmu.edu:srct/srctweb into onepointoh

srctweb/website/static/css/style.css

@@ -22,8 +22,11 @@ a[name] {
   height: 40px;
   background-color: #f5f5f5;
 }
+.jumbostyle{
+  height:50px;
+}
 .carousel {
-  height: 450px;
+  height: 400px;
   margin-bottom: 30px;
 }
 .carousel-caption {
@@ -31,7 +34,7 @@ a[name] {
   margin-bottom: 30px;
 }
 .carousel .item {
-  height: 450px;
+  height: 400px;
 }
 .carousel-inner > .item > img {
   width: 100%;

srctweb/website/templates/index.html

@@ -5,6 +5,13 @@ SRCT
 {% endblock %}
 
 {% block jumbotron %}
+
+<div class="jumbotron jumbostyle">
+  <div class="text-center">
+    <h1>Student-Run Computing and Technology</h1>
+  </div>
+</div>
+
 <div id="SRCTCarousel" class="carousel slide" data-ride="carousel">
   <ol class="carousel-indicators">
     <li data-target="#SRCTCarousel" data-slide-to="0" class="active"></li>
@@ -15,22 +22,25 @@ SRCT
 
     <div class="item active">
       <img src="/static/img/renfredhaxxor_large.png" alt="First slide">
-      <div class="carousel-caption transparency">
-        <h1>Student-Run Computing and Technology</h1>
+      <div class="carousel-caption">
+        <h1>Learn more about development.</h1>
+	<p>Sweet, development!</p>
       </div>
     </div>
 
     <div class="item">
       <img src="/static/img/2013firstmeet_large.png" alt="Second slide">
-      <div class="carousel-caption transparency">
-        <h1>Student-Run Computing and Technology</h1>
+      <div class="carousel-caption">
+        <h1>Meet tons of great people.</h1>
+	<p>Because we're cool.</p>
       </div>
     </div>
 
     <div class="item">
       <img src="/static/img/bradhaxxor_large.png" alt="Third slide">
-      <div class="carousel-caption transparency">
-        <h1>Student-Run Computing and Technology</h1>
+      <div class="carousel-caption">
+        <h1>Even work on hardware.</h1>
+	<p>Yeah, hardware's pretty cool.</p>
       </div>
     </div>
   </div>