bootstrapped questions page

author: kumar <kumar.damani@mail.utoronto.ca> 2016-07-10 04:59:36 +0000
committer: kumar <kumar.damani@mail.utoronto.ca> 2016-07-10 04:59:36 +0000
commit: 41234c1caf85c2306563ec01efa16ad285f706bd (patch)
tree: 3a9c4b768c25631d035c292f26f671dae48dce4c
parent: 984927a324e8e7cfb208e613ce527e90ed962308 (diff)
3 files changed, 113 insertions, 17 deletions
diff --git a/assets/css/style.css b/assets/css/style.css
index 3c80cd7..dad099b 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -224,8 +224,10 @@ footer nav a {
     font-family: 'Roboto', sans-serif;
 }
 #solutions-main{
-    min-height: 87%;
+    min-height: 100%;
+    padding-top: 65px;
 }
+
 /*the section which holds each of the solutions*/
 section.solutions-card{
     text-align: left;
diff --git a/questions.html b/questions.html
index 0ee7b5b..e4d9340 100644
--- a/questions.html
+++ b/questions.html
@@ -1,18 +1,67 @@
-<!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Solutions Repo</title>
+
+    <!--ORDER IS IMPORTANT DO NOT SHIFT-->
+
+    <!--Custom CSS Files-->
     <link href="assets/css/style.css" rel="stylesheet" type="text/css">
-    <!--<link rel="stylesheet" href="assets/css/bootstrap.min.css" crossorigin="anonymous">-->
+
+    <!--Bootstrap File-->
+    <link rel="stylesheet" href="assets/css/bootstrap.min.css" crossorigin="anonymous">
+    <link rel="stylesheet" href="assets/css/creative.css">
+
+    <!--Fonts-->
     <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
     <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-    <meta charset="UTF-8">
-    <title>Solutions Repo</title>
+
+    <!--JS-->
+    <script src="assets/js/jquery-2.2.4.min.js"></script>
+    <script src="assets/js/bootstrap.min.js"></script>
 </head>
 <body>
 
+    <nav id="mainNav" class="navbar navbar-default navbar-fixed-top" >
+        <div class="container-fluid">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle collapsed"
+                        data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span> <span
+                        class="icon-bar"></span> <span class="icon-bar"></span> <span
+                        class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand page-scroll" href="#page-top"> ENTER OUR NAME HERE</a>
+            </div>
+
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse"
+                 id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#">First Year</a></li>
+                            <li><a href="#">Second Year</a></li>
+                            <li><a href="#">Third Year</a></li>
+                            <li><a href="#">Fourth Year</a></li>
+                        </ul>
+                    </li>
+                    <li><a href="#">Register</a></li>
+                    <li><a href="#">Log In</a></li>
+
+                    <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> &ndash;&gt;-->
+                </ul>
+            </div>
+            <!-- /.navbar-collapse -->
+        </div>
+        <!-- /.container-fluid -->
+    </nav>
+
     <main id = 'solutions-main'>
-        <div class = 'search' id = 'solutions-div'>
+        <div class = 'search container' id = 'solutions-div'>
             <h1 id = 'solutions-header'>CSC309-Programming on the Web</h1>
             <h3> Summer, 2016</h3>
             <h3> Final</h3>
@@ -37,16 +86,47 @@
             </section>
 
         </div>
+
     </main>
 
-    <footer id = 'solutions-footer'>
-        <div id="footer-container">
-            <nav>
-                <a href="#">Contact</a>
-                <a href="#">About Us</a>
-                <a href="#">Terms of Use</a>
-            </nav>
-            <h6>Copyright 2016</h6>
+    <!--<main>-->
+        <!--&lt;!&ndash;made the id in to a class&ndash;&gt;-->
+        <!--<div class='search container'>-->
+            <!--<h2>The solutions to all your problems.</h2>-->
+            <!--&lt;!&ndash;<img src="assets/images/down.png">&ndash;&gt;-->
+            <!--<input type="text" name="search" placeholder="Enter course name">-->
+        <!--</div>-->
+
+    <!--</main>-->
+
+    <footer>
+        <!--<div id="footer-container" class="container-fluid">-->
+        <!--<nav>-->
+        <!--<a href="#">Contact</a>-->
+        <!--<a href="#">About Us</a>-->
+        <!--<a href="#">Terms of Use</a>-->
+        <!--</nav>-->
+        <!--<h6>Copyright 2016</h6>-->
+        <!--</div>-->
+        <div class="navbar navbar-default navbar-fixed-bottom">
+            <div class="container-fluid">
+                <div class="navbar-collapse collapse" id="footer-body">
+                    <ul class="nav navbar-nav">
+                        <li><a href="#">About Us</a></li>
+                        <li><a href="#">Contact Us</a></li>
+                        <li><a href="#">Terms &amp; Conditions</a></li>
+                        <li><a href="#">Privacy Policy</a></li>
+                    </ul>
+                </div>
+                <div class="navbar-header">
+                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#footer-body">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                </div>
+
+            </div>
         </div>
     </footer>
 
diff --git a/solutions.html b/solutions.html
index ce8c536..1da4ff4 100644
--- a/solutions.html
+++ b/solutions.html
@@ -2,11 +2,25 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Solutions Repo</title>
+
+    <!--ORDER IS IMPORTANT DO NOT SHIFT-->
+
+    <!--Custom CSS Files-->
     <link href="assets/css/style.css" rel="stylesheet" type="text/css">
-    <!--<link rel="stylesheet" href="assets/css/bootstrap.min.css" crossorigin="anonymous">-->
+
+    <!--Bootstrap File-->
+    <link rel="stylesheet" href="assets/css/bootstrap.min.css" crossorigin="anonymous">
+    <link rel="stylesheet" href="assets/css/creative.css">
+
+    <!--Fonts-->
     <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
     <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
-    <title>Solutions Repo</title>
+
+    <!--JS-->
+    <script src="assets/js/jquery-2.2.4.min.js"></script>
+    <script src="assets/js/bootstrap.min.js"></script>
 </head>
 <body>
author	kumar <kumar.damani@mail.utoronto.ca>	2016-07-10 04:59:36 +0000
committer	kumar <kumar.damani@mail.utoronto.ca>	2016-07-10 04:59:36 +0000
commit	41234c1caf85c2306563ec01efa16ad285f706bd (patch)
tree	3a9c4b768c25631d035c292f26f671dae48dce4c
parent	984927a324e8e7cfb208e613ce527e90ed962308 (diff)