Need pull

author: nanalelfe <nargiza.nosirova@mail.utoronto.ca> 2016-07-11 05:44:23 +0000
committer: nanalelfe <nargiza.nosirova@mail.utoronto.ca> 2016-07-11 05:44:23 +0000
commit: 01e9cff4c6fa7f0672705613ff03107dabe9268d (patch)
tree: 4d27505c23cea5878c586213fe720c8fe6408f0b
parent: c8ad9ad251649bff998b678d7324b8be31540e55 (diff)
3 files changed, 94 insertions, 90 deletions
diff --git a/assets/css/style.css b/assets/css/style.css
index d8fcb54..28122e6 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -207,7 +207,18 @@ main .search img {
 	display: inline;
 }
 
-/*
+main button#add-solution {
+	display: inline-block;
+	border-radius: 10px;
+	background-color: maroon; 
+	color: white;
+	width: 110px;
+
+}
+
+main p {
+	display: inline-block;
+}
 
 footer {
 	background-color: #333333;
@@ -235,15 +246,12 @@ footer h6 {
 	font-style: italic;
 
 }
-*/
-/*
 
 footer nav a {
 	display: block;
 	color: darkgray;
 	vertical-align: top;
 }
-*/
 
 /***********************************************************************************************************************/
 
diff --git a/index.html b/index.html
index f9a5325..07d8662 100644
--- a/index.html
+++ b/index.html
@@ -4,25 +4,12 @@
 	<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">
-
-	<!--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'>
-
-	<!--JS-->
-	<script src="assets/js/jquery-2.2.4.min.js"></script>
-	<script src="assets/js/bootstrap.min.js"></script>
 </head>
 <body>
-<!--	<div id="top-bar">
+	<div id="top-bar">
 		<div id="logo"><a href="#"><img src="assets/images/placeholder.png"></a></div>
 		<nav>
 			<ul>
@@ -34,63 +21,26 @@
 						<ul>
 							<li class="side-drop"><a href="#">First Year</a>
 								<div class="side-menu">
-									<a href="">CSC108</a>
-									<a href="">CSC148</a>
-									<a href="">CSC165</a>
+									<a href="CSC108"></a>
+									<a href="CSC148"></a>
+									<a href="CSC165"></a>
 								</div>
 							</li>
 							<li>
 								<a href="#">Second Year</a></li>
 							<li><a href="#">Third Year</a></li>
 							<li><a href="#">Fourth Year</a></li>
-						</ul>
+						</ul>	
 					</nav>
 				</li>
-				&lt;!&ndash; <li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> &ndash;&gt;
+				<!-- <li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> -->
 			</ul>
 		</nav>
-	</div>-->
-
-	<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>
+	</div>
 
 	<main>
 	<!--made the id in to a class-->
-		<div class='search container'>
+		<div class='search'>
 			<h2>The solutions to all your problems.</h2>
 			<!--<img src="assets/images/down.png">-->
 			<div id="search-select">
@@ -105,35 +55,15 @@
 	</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 id="footer-container">
+			<nav>
+					<a href="#">Contact</a>
+					<a href="#">About Us</a>
+					<a href="#">Terms of Use</a>
+			</nav>
+			<h6>Copyright 2016</h6>
 		</div>
-	</footer>
 
+	</footer>
 </body>
 </html>
 \ No newline at end of file
diff --git a/user_solutions.html b/user_solutions.html
new file mode 100644
index 0000000..ee56557
--- /dev/null
+++ b/user_solutions.html
@@ -0,0 +1,66 @@
+<html>
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Solutions Repo</title>
+
+	<link href="assets/css/style.css" rel="stylesheet" type="text/css">
+	<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'>
+</head>
+<body>
+	<div id="top-bar">
+		<div id="logo"><a href="#"><img src="assets/images/placeholder.png"></a></div>
+		<nav>
+			<ul>
+				<li><a href="#">Register</a></li>
+				<li><a href="#">Log In</a></li>
+				<li class="drop-down">
+					<a href="#">Courses</a>
+					<nav class="drop-menu">
+						<ul>
+							<li class="side-drop"><a href="#">First Year</a>
+								<div class="side-menu">
+									<a href="CSC108"></a>
+									<a href="CSC148"></a>
+									<a href="CSC165"></a>
+								</div>
+							</li>
+							<li>
+								<a href="#">Second Year</a></li>
+							<li><a href="#">Third Year</a></li>
+							<li><a href="#">Fourth Year</a></li>
+						</ul>	
+					</nav>
+				</li>
+				<!-- <li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> -->
+			</ul>
+		</nav>
+	</div>
+
+	<main>
+	<!--made the id in to a class-->
+		<div class='search solutions'>
+
+			<button id="add-solution"><h3>Add a solution</h3></button>
+			<p id="show-path">CSC148 > Winter 2015 > Question 1</p>
+
+		</div>
+		
+	</main>
+
+	<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>
+		</div>
+
+	</footer>
+</body>
+</html>
+
+
author	nanalelfe <nargiza.nosirova@mail.utoronto.ca>	2016-07-11 05:44:23 +0000
committer	nanalelfe <nargiza.nosirova@mail.utoronto.ca>	2016-07-11 05:44:23 +0000
commit	01e9cff4c6fa7f0672705613ff03107dabe9268d (patch)
tree	4d27505c23cea5878c586213fe720c8fe6408f0b
parent	c8ad9ad251649bff998b678d7324b8be31540e55 (diff)