Fixed searchbar positioning and added more components

3 files changed, 25 insertions, 16 deletions

diff --git a/assets/css/style.css b/assets/css/style.css
index 4f50205..6ee1ac4 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -64,7 +64,6 @@ main .search h2{
 
 
 .search input[type=text] {
-    width: 250px;
     text-align: center;
     box-sizing: border-box;
     background-color: white;
@@ -73,24 +72,33 @@ main .search h2{
     background-position: 9px 9px;
     background-repeat: no-repeat;
     padding: 12px 20px 12px 40px;
-    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    -webkit-transition: width 0.4s ease-in-out;
-    transition: width 0.4s ease-in-out;
+
+    /*-webkit-transition: width 0.4s ease-in-out;
+    transition: width 0.4s ease-in-out;*/
 }
 
 
-.search input[type=text], .search button {
+.search input[type=text], .search button.search-button {
     font-size: 16px;
 	height: 40px;
     border-radius: 10px;
 	border: 2px solid #ccc;
-	box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+	
 }
 
-.search input[type=text]:focus {
-    width: 50%;
+.input-group {
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    -webkit-box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
 }
 
+
+/*.search input[type=text]:focus {
+    width: 100%;
+}*/
+
 main .search img {
 	width: 50px;
 	display: inline;
@@ -241,9 +249,9 @@ main [id^="sol-"] div.comments ul li img {
 
 main [id^="sol-"] div.comments ul li {
 	background-color: white;
-	border-radius: 10px;
 	background-color: #F7D08A;
 	padding: 10px;
+    border-radius: 10px;
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 	-webkit-box-shadow: 0 2px 2px 0 #C2C2C2;
@@ -251,10 +259,6 @@ main [id^="sol-"] div.comments ul li {
 	margin-bottom: 15px;
 }
 
-.comments ul {
-
-}
-
 main [id^="sol-"] div.comments ul li p.comment-username {
 	margin-bottom: 0;
 	margin-top: 5px;
diff --git a/index.html b/index.html
index dce1e1f..d613c42 100644
--- a/index.html
+++ b/index.html
@@ -83,10 +83,10 @@
 
 
 
-				<div class="search col-md-12 col-lg-12">
+				<div class="search col-md-8 col-lg-8 col-md-offset-2">
 					<div class="input-group">
 						<div class="input-group-btn">
-							<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></button>
+							<button type="button" class="btn btn-default dropdown-toggle search-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></button>
 						
 							<ul class="dropdown-menu">
 								<li><a href="#">Courses</a></li>
@@ -95,6 +95,9 @@
 						</div>
 
 						<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>
+					    </span>
 					</div>
 
 				</div>
diff --git a/user_solutions.html b/user_solutions.html
index c546ec1..6dd78b6 100644
--- a/user_solutions.html
+++ b/user_solutions.html
@@ -81,7 +81,9 @@
 			<div>
 				<div class="row top-sol">
 					<button class="col-xs-4 col-sm-2 col-md-2 col-lg-2 col-xs-offset-4 col-sm-offset-5 col-md-offset-2 col-lg-offset-2 rounded" id="add-solution"><h3>Add a solution</h3></button>
-					<p class="col-xs-12 col-sm-12 col-md-6 show-path">CSC148 > Winter 2015 > Question 1</p>
+
+					<!-- Replace p below with breadcrumbs later -->
+					<p class="col-xs-12 col-sm-12 col-md-6 show-path">CSC148 > Winter 2015 > Question 1</p> 
 				</div>
 
 				<div class="row">