Main bookstrap page

public/Mockups/mock.html

@@ -16,7 +16,7 @@ <h1>Hello Marcus Welcome to MakerSquare</h1>
     <h2>Github</h2>
     <div id="github" style="overflow-y: scroll; width:800px; height:300px;"></div>
     <h2>Today's Sprint</h2>
-    <div style="overflow-y: scroll; width:800px; height:300px;"><img src="./Mockups/datastructures.png" ></img></div>
+    <div style="overflow-y: scroll; width:800px; height:500px;"><img src="./Mockups/datastructures.png" ></img></div>
     <script type="text/javascript">
          $(document).ready(function() {
             $("#github").load("./Mockups/joe.html");   

public/fellow/css/styles.css

@@ -8,6 +8,31 @@
 	src:url('../../student/css/BebasNeue.otf');
 }
 
+#dropdown {
+	position:absolute;
+}
+
+a {
+	color:black;
+	text-decoration:none;
+	font-family:BebasNeue;
+	font-size:24px;
+	padding-left:7px;
+	padding-right:7px;
+}
+
+a:hover {
+	text-decoration:none;
+	color:#cccccc;
+}
+
+.dropdown-toggle {
+	padding-left:7px;
+	font-family:BebasNeue;
+	font-size: 24px;
+	color:#748583;
+}
+
 .bug-container {
 
 }
@@ -69,7 +94,7 @@
 
 @keyframes fade {
 	from {background-color:#fbfdd5;}
-	to{background-color:#fafbe3;}
+	to{background-color:#fcfcf0;}
 }
 
 #is-helping {

public/fellow/index.html

@@ -43,7 +43,7 @@
 		<script src="../bower_components/underscore/underscore-min.js"></script>
 
     <!-- local React components -->
-    <script type="text/babel" src="../components/navbar.js"></script>
+    // <script type="text/babel" src="../components/navbar.js"></script>
     <script type="text/babel" src="../components/help-request-manager.js"></script>
     <script type="text/babel" src="../components/bug-log.js"></script>
   </body>

public/student/css/styles.css

@@ -11,8 +11,18 @@ body {
 	font-family:Gotham-Book;
 }
 
-.navbar {
-	margin: 0 ;
+#today-sprint {
+	font-family:BebasNeue;
+	font-size:50px;
+	color:black;
+}
+#mock {
+	border:#cccccc;
+}
+
+#table-contents {
+	width:700px;
+	height:500px;
 }
 
 #dropdown {
@@ -45,8 +55,14 @@ a:hover {
 }
 
 .container {
+	margin: 0 auto;
+/*	background-image: url('tableofcontents.png')*/
 }
 
+/*.sidebar {
+	margin-left:-1000px;
+}*/
+
 #submit {
 	margin-left:280px;
 	font-family:Gotham-Book;
@@ -62,15 +78,13 @@ a:hover {
 #header {
 	margin-left:20px;
 	color:#748583;
-	/*color:#9eb4b1;*/
 	font-family:BebasNeue;
 	font-size:50px;
 }
 
 #header2{
 	margin-left:40px;
 	font-size:35px;
-	/*color:#748583;*/
 	color:#9eb4b1;
 	margin-top:0px;
 	font-family:BebasNeue;
@@ -213,6 +227,14 @@ a:hover {
 
 }
 
+/*#navbar {
+	position:static;
+}
+*/
+#align-left {
+	position:absolute;
+	/*float:left;*/
+}
 
 .help-text {
 	font-family:BebasNeue;

public/student/index.html

@@ -7,19 +7,12 @@
   <link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <link type="text/css" rel="stylesheet" href="./css/modified.materialize.min.css"  media="screen,projection"/>
 
-    <!-- Keep these CDNs around in case dep's don't load -->
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.0/react.js"></script> -->
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.14.0/react-dom.js"></script> -->
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> -->
-
-    <!-- DEPENDENCIES -->
-    <script src="../node_modules/react/dist/react.min.js"></script>
-    <script src="../node_modules/react-dom/dist/react-dom.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.6.15/browser.js"></script>
-    <script>console.log('babel loaded');</script>
-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
+  <script src="https://fb.me/react-0.14.2.js"></script>
+  <script src="https://fb.me/react-dom-0.14.2.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.23/browser.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.3.7/socket.io.min.js"></script>
-    <script src="../bower_components/underscore/underscore-min.js"></script>
 
     <script>
       socket = io();
@@ -46,15 +39,20 @@
       </div>
 
       <div class="main-bar col-sm-8">
-        <div id="navbar"></div>
-        <div id="content"><img src="./data-structures1-1.png" /></div>
+        <div id="navbar"></div> 
+        <div><img id='table-contents-pic' src='./tablecontent.png' /></div>
+        <div style="overflow-y: scroll; width:800px; height:500px;"><img id='table-contents' src="./tableofcontents.png" /></div>
+        <div><img id='todays-sprint' src='./todays-sprint.png' /></div>
+        <div id='mock' style="overflow-y: scroll; width:800px; height:500px;"><img src="../Mockups/datastructures.png" ></img></div>
+        <!-- <div id="content-img"><img src="./data-structures1-1.png" /></div> -->
         <div id="app"></div>
       </div>
     </div>
   </div>
 
   <script type="text/babel" src="../components/navbar.js"></script>
   <script type="text/babel" src="../components/help-request.js"></script>
+  <span id="align-left" className="align glyphicon glyphicon-align-left"></span>
 
 </body>
 </html>