Merge pull request #42 from amsardesai/gh-pages

Made the site responsive
sholiday · Apr 24, 2015 · 57fc9ba · 57fc9ba
2 parents 7b3305b + f8afe3f
commit 57fc9ba
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -10,21 +10,14 @@
 	<title>{{ page.title }}</title>
 	<meta name="description" content="">
 	<meta name="author" content="">
-
 	<meta name="viewport" content="width=device-width">
 
-	<link rel="stylesheet" href="css/bootstrap.css">
-	<style>
-	body {
-	  padding-top: 60px;
-	  padding-bottom: 40px;
-	}
-	</style>
 	<link rel="stylesheet" href="css/bootstrap.min.css">
+	<link rel="stylesheet" href="css/bootstrap-responsive.min.css">
 	<link rel="stylesheet" href="css/style.css">
 </head>
 <body>
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-fixed-top main-navbar">
       <div class="navbar-inner">
         <div class="container">
           <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -120,16 +113,17 @@
       </div>
     </div>
 
-    <div class="container">
-    <a href="https://github.com/sholiday/Unofficial-Waterloo-USA-Intern-Guide">
-      <img style="position: absolute; top: 40px; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub">
-    </a>
-    {{ content }}
-      <footer>
-        <a href="http://creativecommons.org/licenses/by-nc-sa/2.5/ca/">Attribution-NonCommercial-ShareAlike 2.5 Canada</a>
-      </footer>
-
-    </div> <!-- /container -->
+    <div class="main-container">
+      <a href="https://github.com/sholiday/Unofficial-Waterloo-USA-Intern-Guide">
+        <img class="github-fork-link" src="https://s3.amazonaws.com/github/ribbons/forkme_right_green_007200.png" alt="Fork me on GitHub">
+      </a>
+      <div class="container">
+        {{ content }}
+        <footer>
+          <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/ca/"><img alt="Creative Commons Licence" src="https://i.creativecommons.org/l/by-nc-sa/2.5/ca/88x31.png" /></a>
+        </footer>
+      </div> <!-- /container -->
+    </div><!-- /main-container -->
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 <script>window.jQuery || document.write('<script src="js/libs/jquery-1.7.1.min.js"><\/script>')</script>
 

diff --git a/css/style.css b/css/style.css
@@ -7,14 +7,36 @@
 
 
 
+
 body {
-	background-image: url(img/bgnoise.png);
-	background-position: initial initial;
-	background-repeat: initial initial;
+    background-image: url('../img/bgnoise.png');
+    background-position: initial initial;
+    background-repeat: initial initial;
+    margin-top: 40px;
+    margin-bottom: 40px;
+}
+
+@media (max-width: 980px) {
+    body {
+        margin-top: 0;
+    }
 }
 
+.main-navbar {
+    margin-bottom: 0;
+}
 
+.main-container {
+    position: relative;
+    padding-top: 20px;
+}
 
+.github-fork-link {
+    position: absolute;
+    top: 0;
+    right: 0;
+    border: 0;
+}