third pass at restructuring front page

diff --git a/static/css/style.css b/static/css/style.css
index 91207d61fccf5817241968875238b53f6a0282b1..5f02f497164669d3e6d48a5aaa4cba951f61e9dc 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1178,24 +1178,34 @@
        }
 
        .navbar-brand>img {
-               width: 3em;
-               margin: 4px;
+               width: 2.5em;
+               margin: 7px;
                display: inline-block;
        }
 
        .navbar-nav>li>a {
                line-height: inherit;
-               color: #375aa8;
+               color: #cdced0;
                text-transform: uppercase;
                padding: 1em;
                font-family: 'Roboto Condensed', sans-serif;
        }
+       .navbar-nav>li>a:hover {
+               color: #fff;
+               background-color: initial;
+       }
 
        .heading {
+               color: #fff;
                margin:0;
                display: inline-block;
+               font-size: 1.25em;
        }
 
        .jumbotron {
                margin: 0;
        }
+
+       .navbar-fixed-top {
+               background-color: #0A2342;
+       }

diff --git a/templates/base.html b/templates/base.html
index 77ac4cf542db88471d18905d101efcc9dd1c88ad..f6756bf2b6671429a0ee6c76dc6d22ab907061ad 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -50,7 +50,6 @@
                <script src="{{media("js/jquery.min.js")}}"></script>
                <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
                <script src="{{media("js/jquery.matchHeight-min.js")}}"></script>
-               <script src="{{media("js/main.js")}}"></script>
                <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
                <link href="{{media("css/style.css")}}" rel="stylesheet">
 

diff --git a/templates/index_base.html b/templates/index_base.html
index 3235ea45075563147216cf93fedfa2e659f38a6b..6edfda330ff323d7f69328bd69831df9de0d7135 100644 (file)
--- a/templates/index_base.html
+++ b/templates/index_base.html
@@ -50,7 +50,6 @@
                <script src="{{media("js/jquery.min.js")}}"></script>
                <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
                <script src="{{media("js/jquery.matchHeight-min.js")}}"></script>
-               <script src="{{media("js/main.js")}}"></script>
                <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
                <link href="{{media("css/style.css")}}" rel="stylesheet">
 
@@ -115,17 +114,17 @@
                                                <div class="row">
                                                        <div class="col-sm-6">
                                                                <h3>Contact Us</h3>
-                                                                       <br><a href="mailto:program2017@postgresopen.org">program2017@postgresopen.org</a>
-                                                       </section>
+                                                               <br><a href="mailto:program2017@postgresopen.org">program2017@postgresopen.org</a>
+                                                       </div>
                                                        <div class="col-sm-6">
                                                                <h3>Hotel</h3>
-                                                                       <a href="https://2017.postgresopen.org/venue/">
-                                                                               Parc 55 Hilton Hotel
-                                                                               <br>55 Cyril Magnin St
-                                                                               <br>San Francisco, CA 94102
-                                                                               <br>(415) 392-8000
-                                                                       </a>
-                                                       </section>
+                                                               <a href="https://2017.postgresopen.org/venue/">
+                                                                       Parc 55 Hilton Hotel
+                                                                       <br>55 Cyril Magnin St
+                                                                       <br>San Francisco, CA 94102
+                                                                       <br>(415) 392-8000
+                                                               </a>
+                                                       </div>
                                                </div>
                                        </section>
                                        <div class="row">

diff --git a/templates/pages/index.html b/templates/pages/index.html
index f7cfb8d6202d562ff26e938db995a6269350bda1..4a6c1a2013aab9d5b71df501bb97e59c87b83d31 100644 (file)
--- a/templates/pages/index.html
+++ b/templates/pages/index.html
@@ -49,7 +49,7 @@
                                                </div>
                                        </div>
 
-                                       <div class="container">
+                                       <div class="row container">
                                                <section class="box">
                                                        <i class="icon big rounded color6 fa-rocket"></i>
                                                        <h3>Important Dates</h3>