Merge branch 'master' of git.gmu.edu:srct/roomlist

97f43875 · Daniel W Bond · c8bd47f0 · 98c61b5f · 97f43875 · 97f43875
Commit 97f43875 authored Jan 12, 2015 by Daniel W Bond
Showing with 56 additions and 20 deletions

roomlist/static/css/style.css roomlist/static/css/style.css +44 -10

roomlist/templates/index.html roomlist/templates/index.html +10 -8

roomlist/templates/layouts/base.html roomlist/templates/layouts/base.html +2 -2

No files found.
--- a/roomlist/static/css/style.css
+++ b/roomlist/static/css/style.css
 /* Sticky footer styles */
+
 html,
 body {
  height: 95%;
 }
-
+#contentcontain {
+  padding-top: 45px;
+  display: inline-block;
+  vertical-align: top;
+}
 /* Wrapper for page content to push down footer */
+
 #wrap {
  min-height: 100%;
  height: auto;
  /* Negative indent footer by its height */
+
  margin: 0 auto -30px;
  /* Pad bottom by footer height */
+
  padding: 0 0 30px;
 }
 /* Set the fixed height of the footer here */
+
 #footer {
  height: 30px;
 }
-
 .jumboindex {
  background: url(/static/img/North_Section_of_Presidents_Park_Dorms.jpg) no-repeat;
  background-size: cover;
  background-position: center;
  box-shadow: inset 0px 0px 20px #333;
  color: white;
-  text-shadow: 
-    2px 2px 4px #000;
+  text-shadow: 2px 2px 4px #000;
  padding-top: 75px;
  padding-bottom: 75px;
 }
-
 .jumboabout {
  background: url(/static/img/Campus_Dorms_East_side_of_Campus.jpg) no-repeat;
  background-size: cover;
  background-position: bottom;
  box-shadow: inset 0px 0px 20px #333;
  color: white;
-  text-shadow: 
-    2px 2px 4px #000;
+  text-shadow: 2px 2px 4px #000;
  padding-top: 75px;
  padding-bottom: 75px;
 }
-
 .license img {
  position: absolute;
  bottom: 8px;
  right: 15px;
 }
-
 .container-padding {
-  padding-top: 75px;
+  padding-top: 30px;
+}
+#get-started {
+  border-radius: 10px;
+  margin-top: 9%;
+  width: 250px;
+  height: 75px;
+  font-size: 20pt;
+  border-bottom: 5px solid #005030;
+  box-shadow: 0px 0px 8px #222;
+  outline: none;
+}
+
+#get-started:hover,#get-started.active:focus, #get-started:focus {
+color: #fff;
+background-color: #005937;
+outline: none;
+}
+
+#get-started:active, #get-started.active {
+color: #fff;
+background-color: #005030;
+border-top:5px solid #005030;
+box-shadow: 0px 0px 6px #222;
+outline-offset: none;
+}
+
+#get-started:focus,
+#get-started:active:focus,
+#get-started.active:focus {
+    outline: none;
+    outline-offset: 0px;
 }
--- a/roomlist/templates/index.html
+++ b/roomlist/templates/index.html
-{% extends 'layouts/base.html' %}
-
-{% block title %}
-GMU RoomList &bull; Homepage
-{% endblock %}
-
-{% block content %}
+{% extends 'layouts/base.html' %} {% block title %} GMU RoomList &bull; Homepage {% endblock %} {% block content %}

 <div class="container container-padding">
  <div class="row">
@@ -13,7 +7,9 @@ GMU RoomList &bull; Homepage
        <h1 class="text-center"><strong>GMU</strong>&#8203;ROOMLIST</h1>
        <h3 class="text-center">Find your on-campus neighbors.</h3>
      </div>
-      <a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="https://licensebuttons.net/l/by-nc/2.0/80x15.png" title="'North Section of President's Park Dorms' by Flickr user cgs_gmu2005 is licensed under a Creative Commons Attribution-NonCommercial 2.0 Generic License."/></a>
+      <a href="https://creativecommons.org/licenses/by-nc/2.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="https://licensebuttons.net/l/by-nc/2.0/80x15.png" title="'North Section of President's Park Dorms' by Flickr user cgs_gmu2005 is licensed under a Creative Commons Attribution-NonCommercial 2.0 Generic License."
+        />
+      </a>
    </div>
  </div>
 </div>
@@ -39,4 +35,10 @@ GMU RoomList &bull; Homepage
  </div>
 </div>

+<div class="row">
+  <div class=".col-md-12 text-center">
+      <button type="button" class="btn btn-primary" id="get-started">Get Started</button>
+  </div>
+</div>
+
 {% endblock %}
--- a/roomlist/templates/layouts/base.html
+++ b/roomlist/templates/layouts/base.html
@@ -14,9 +14,9 @@
 </head>

 <body>
-  <div id="wrap">
+  <div id="wrap" style="display: flex;">
    {% include 'layouts/navbar.html' %}
-    <div class="container">
+    <div id="contentcontain" class="container">
      {% block content %} {% endblock %}
    </div>
  </div>