Merge remote-tracking branch 'origin/master' into curriculum-help-feature

Author: jordanmccullough

_javascript/curriculum.js

@@ -111,11 +111,14 @@ $(function(){
 	}
 
 	// Bind checkbox toggle for TOC
-	$(".toc-toggle-check").change(function(){
-		console.log("shiftleft on both.");
-		$(".col-content").toggleClass("shift-left");
-		$(".col-toc").toggleClass("shift-left");
-	});
+	var toc = {};
+	toc.toggle = function(event){
+		if(event.shiftKey && event.keyCode === 84){
+			$(".col-content").toggleClass("shift-left");
+			$(".col-toc").toggleClass("shift-left");
+		}
+	}
+	document.addEventListener("keydown", toc.toggle, false);
 
 	// Render the TOC
 	buildToc();

_layouts/curriculum.html

@@ -57,15 +57,6 @@ <h4 class="modal-title" id="myModalLabel">Help / Shortcuts</h4>
   </div>
 </div>
 
-
-<div id="toc-toggle">
-  <input type="checkbox" class="toc-toggle-check" id="toc-toggle-check" name="toc-toggle-check" value="true" checked="checked">
-  <label class="toc-toggle-label" for="toc-toggle-check">
-    <span class="octicon octicon-list-unordered"></span>
-    <!-- <span class="toc-header">Table of Contents</span> -->
-  </label>
-</div>
-
 <div class="col-content deck  col-md-12 col-sm-12 col-xs-12 materials curriculum shift-left">
   <div id="teacher" class="hidden">
     <div class="alignment">
@@ -113,6 +104,7 @@ <h4 class="modal-title" id="myModalLabel">Help / Shortcuts</h4>
 <div class="col-toc col-md-2 col-sm-2 col-xs-2 shift-left">
   <div id="toc-wrapper">
     <div id="toc" data-spy="affix" data-offset-top="145">
+      <h4>Table of Contents</h4>
       <ul id="toc-list" class="nav nav-pills nav-stacked" role="tablist">
         <li></li>
       </ul>

_stylesheets/curriculum.scss

@@ -42,38 +42,6 @@ table{
 	}
 }
 
-#toc-toggle{
-	position: fixed;
-	top: 15px;
-	right: 24px;
-	padding: 0;
-	margin: 0;
-	z-index:1000;
-}
-.toc-toggle-check{
-	visibility: hidden;
-	width: 0;
-	height: 0;
-
-	& + .toc-toggle-label{
-		color: $gray-darker;
-		opacity: .3;
-
-		.toc-header{
-			margin-left: 1em;
-			display: none;
-		}
-	}
-
-	&:checked + .toc-toggle-label{
-		opacity: 1;
-		// right: 16.66667%;
-
-		.toc-header{
-			display: inline;
-		}
-	}
-}
 
 #toc-wrapper{
 	opacity: .5;
@@ -361,7 +329,7 @@ table{
 }
 
 .affix{
-  margin-top: -130px;
+  margin-top: -165px;
   position: fixed;
 }