Merge branch 'master' of https://github.com/HumairAK/solutions_repo

5 files changed, 39 insertions, 14 deletions

diff --git a/assets/css/style.css b/assets/css/style.css
index c959139..35eb354 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -13,8 +13,8 @@ ul {
 	list-style-type: none;
 }
 
-a {
-	text-decoration: none;
+a, a:hover {
+	text-decoration: none!important;
 }
 
 h1{
@@ -280,7 +280,6 @@ section.solutions-card{
     width: 95%;
     margin-left: 2.5%;
     margin-bottom: 2%;
-    cursor: pointer;
     padding-bottom: 5px;
 }
 
diff --git a/exams.html b/exams.html
index 84a2e7d..12d15f0 100644
--- a/exams.html
+++ b/exams.html
@@ -94,33 +94,41 @@
     <main id = 'solutions-main'>
         <div class = 'search container' id = 'solutions-div'>
                 <h4 class='search-head'>Search results for "CSC148"</h4>
+                <a href="questions.html">
                 <section class = 'solutions-card'>
                     <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
                     <p class = 'solutions-time' ><em>Term: </em>Winter 2015</p>
                     <p class = 'exam-instr'><em>Instructors: </em>Fairgrieve and Hangerman</p>
                     <p class = 'solutions-type'>Final Examination</p>
                 </section>
+                </a>
 
+                <a href="questions.html">
                 <section class = 'solutions-card'>
                     <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
                     <p class = 'solutions-time' ><em>Term: </em>Fall 2014</p>
                     <p class = 'exam-instr'><em>Instructors: </em>Campbell and Fairgrieve</p>
                     <p class = 'solutions-type'>Midterm Examination</p>
                 </section>
+                </a>
 
+                <a href="questions.html">
                 <section class = 'solutions-card'>
                     <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
                     <p class = 'solutions-time' ><em>Term: </em>Winter 2014</p>
                     <p class = 'exam-instr'><em>Instructors: </em>Campbell and Papadopoulou</p>
                     <p class = 'solutions-type'>Final Examination</p>
                 </section>
+                </a>
 
+                <a href="questions.html">
                 <section class = 'solutions-card'>
                     <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
                     <p class = 'solutions-time' ><em>Term: </em>Fall 2013</p>
                     <p class = 'exam-instr'><em>Instructors: </em>Craig and Gries</p>
                     <p class = 'solutions-type'>Final Examination</p>
                 </section>
+                </a>
         </div>
     </main>
 
diff --git a/index.html b/index.html
index a9feb1a..59db517 100644
--- a/index.html
+++ b/index.html
@@ -52,9 +52,9 @@
 						    <li class="dropdown-submenu">
 						        <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a>
 						        <ul class="dropdown-menu">
-						          <li><a tabindex="-1" href="#">CSC108</a></li>			                  
-						          <li><a href="#">CSC148</a></li>
-						          <li><a href="#">CSC165</a></li>
+						          <li><a tabindex="-1" href="exams.html">CSC108</a></li>			                  
+						          <li><a href="exams.html">CSC148</a></li>
+						          <li><a href="exams.html">CSC165</a></li>
 						        </ul>
 						    </li>
 							<li><a href="#">Second Year</a></li>
@@ -107,7 +107,7 @@
 
 						<input type="text" class="form-control" aria-label="..." name="search" placeholder="Enter course name">
 						<span class="input-group-btn">
-					    	<button class="btn btn-default search-button" type="button">Go!</button>
+					    	<button onclick="window.location='exams.html';"class="btn btn-default search-button go-button" type="button">Go!</button>
 					    </span>
 					</div>
 
@@ -156,6 +156,12 @@
 	<script>
 		$(document).ready(function() {
 
+			$("input").keyup( function(event) {
+			    if(event.keyCode == 13){
+			        $(".go-button").click();
+			    }
+			});
+
 			$(".dropdown").hover(function(){ 
   				$(".dropdown-toggle", this).trigger("click"); 
 			});
diff --git a/questions.html b/questions.html
index e4da15e..6461dcd 100644
--- a/questions.html
+++ b/questions.html
@@ -101,6 +101,7 @@
                     <p><em>Question count:</em> 10</p>
                 </section>
 
+                <a href="user_solutions.html">
                 <section class = 'solutions-card row'>
                     <div class='pull-left col-sm-8 col-md-8'>
                         <h3 class = 'questions-number'>Question 1</h3>
@@ -110,7 +111,9 @@
                         <img class='rounded' src="assets/images/right-arrow.png">
                     </div>
                 </section>
+                </a>
 
+                <a href="user_solutions.html">
                 <section class = 'solutions-card row'>
                     <div class='pull-left col-sm-8 col-md-8'>
                         <h3 class = 'questions-number'>Question 2</h3>
@@ -120,7 +123,9 @@
                         <img class='rounded' src="assets/images/right-arrow.png">
                     </div>
                 </section>
+                </a>
 
+                <a href="user_solutions.html">
                 <section class = 'solutions-card row'>
                     <div class='pull-left col-sm-8 col-md-8'>
                         <h3 class = 'questions-number'>Question 3</h3>
@@ -131,7 +136,9 @@
                     </div>
                     
                 </section>
+                </a>
 
+                <a href="user_solutions.html">
                 <section class = 'solutions-card row'>
                     <div class='pull-left col-sm-8 col-md-8'>
                         <h3 class = 'questions-number'>Question 4</h3>
@@ -141,7 +148,9 @@
                         <img class='rounded' src="assets/images/right-arrow.png">
                     </div>
                 </section>
+                </a>
 
+                <a href="user_solutions.html">
                 <section class = 'solutions-card row'>
                     <div class='pull-left col-sm-8 col-md-8'>
                         <h3 class = 'questions-number'>Question 5</h3>
@@ -151,6 +160,7 @@
                         <img class='rounded' src="assets/images/right-arrow.png">
                     </div>
                 </section>
+                </a>
         </div>
 
     </main>
diff --git a/user_solutions.html b/user_solutions.html
index 92ad0e4..e307cbd 100644
--- a/user_solutions.html
+++ b/user_solutions.html
@@ -103,7 +103,9 @@
 					<div class="post-info">
 						<div class="">
 							<img class="img-responsive img-circle user-image" src="assets/images/misc/user1.jpeg">
-							<p class="username">jSmith123</p>
+							<p class="username"><a href="user_profile_alt.html">jSmith123</a></p>
+
+
 						</div>
 
 						<div class="pull-right">
@@ -130,19 +132,19 @@
 						<ul class="list-group">
 							<li class="list-group-item">
 								<img src="assets/images/misc/user3.jpeg" class="img-responsive img-circle comment-user-img">
-								<p class="comment-username">janeDoe456</p>
+								<p class="comment-username"><a href="user_profile_alt.html">janeDoe456</a></p>
 								<p class="user-comment"> This is a good answer!</p>
 							</li>
 
 							<li class="list-group-item">
 								<img src="assets/images/misc/user2.jpeg" class="img-responsive img-circle comment-user-img">
-								<p class="comment-username">BenAfleckIsAnOkActor</p>
+								<p class="comment-username"><a href="user_profile_alt.html">BenAfleckIsAnOkActor</a></p>
 								<p class="user-comment">Ben Affleck is indeed just an ok actor.</p>
 							</li>
 
 							<li class="list-group-item">
 								<img src="assets/images/misc/user6.jpeg" class="img-responsive img-circle comment-user-img">
-								<p class="comment-username">morgana254</p>
+								<p class="comment-username"><a href="user_profile_alt.html">morgana254</a></p>
 								<p class="user-comment">I mean, he's no Casey Affleck.</p>
 							</li>
 
@@ -159,7 +161,7 @@
 					<div class="post-info">
 						<div class="">
 							<img class="img-responsive img-circle user-image" src="assets/images/misc/user3.jpeg">
-							<p class="username">janeDoe456</p>
+							<p class="username"><a href="user_profile_alt.html">janeDoe456</a></p>
 						</div>
 
 						<div class="pull-right">
@@ -187,13 +189,13 @@
 						<ul class="list-group">
 							<li class="list-group-item">
 								<img src="assets/images/misc/user5.jpeg" class="img-responsive img-circle comment-user-img">
-								<p class="comment-username">catherineTheGreat</p>
+								<p class="comment-username"><a href="user_profile_alt.html">catherineTheGreat</a></p>
 								<p class="user-comment"> As a Portuguese, this was offensive and hilarious.</p>
 							</li>
 
 							<li class="list-group-item">
 								<img src="assets/images/user-default.png" class="img-responsive img-circle comment-user-img">
-								<p class="comment-username">alexStrav748</p>
+								<p class="comment-username"><a href="user_profile_alt.html">alexStrav748</a></p>
 								<p class="user-comment">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
 							</li>
 						</ul>