Merge pull request #8 from no-stack-dub-sack/master

ui/ux fix, menu default un-collapsed
freeCodeCamp · Jan 12, 2017 · 2d15738 · 2d15738
2 parents 56a472d + 8b7d0f7
commit 2d15738
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,7 +44,6 @@ local_test/*
 local_test/js/*
 local_test/css/*
 
-
 # local test code
 localTestCode.txt
 

diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@ testable projects for freecodecamp.com curriculum expansion.
   - will throttle heavy traffic
   - changes will propagate much quicker so replace the gitCDN link with this for testing 
 
-### This repo did not originally live here. There are several important contributors who have not technically contributed to this repo. So credit where credit is due:
-First and foremost is @Weezlo, thanks for getting us started! Also @Christian-Paul, @paycoguy, and @bonham000. 
+### This repo did not originally live here. There are several important contributors who contributed code before this project took its current form. So credit where credit is due:
+First and foremost is @Weezlo, thanks for getting us started! And to @no-stack-dub-sack for seeing it through the rest of the way! Also @Christian-Paul & @paycoguy for coming up with reliable ways to test D3, and @bonham000 for helping to get this all bundled up nicely in one sweet little package. 
 
 ### Credits:
 - credits for individual example projects coming soon...

diff --git a/build/bundle.js b/build/bundle.js
diff --git a/local_test/index.html b/local_test/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Local Test</title>
     <!-- Add your css here... -->
-    <!-- <link rel="stylesheet" href="css/style.css"> -->
+    <link rel="stylesheet" href="css/style.css">
 </head>
 <body>
   <!-- ...your external resources here... -->
@@ -19,6 +19,6 @@
   <script src='js/bundle.js'></script>  
 
   <!-- ...and your local JS here. -->
-  <!-- <script src="js/index.js"></script> -->
+  <script src="js/index.js"></script>
 </body>
 </html>
diff --git a/src/assets/test_suite_skeleton.js b/src/assets/test_suite_skeleton.js
@@ -127,7 +127,7 @@ const test_suite_skeleton = `
         #fcc_foldout_menu {
             position: absolute;
             top: 0;
-            left: -320px;
+            left: 0;
             width: 320px;
             height: 195px;
             border-bottom-right-radius: 5px;
@@ -138,7 +138,7 @@ const test_suite_skeleton = `
             transition: .5s;
         }
         input[type=checkbox]:checked ~ #fcc_foldout_menu {
-            left: 0;
+            left: -320px;
             transition: .5s ease-in-out;
         }
         #fcc_foldout_menu_inner {
@@ -162,6 +162,19 @@ const test_suite_skeleton = `
             z-index: 99998;   
         }
 
+        .transform_top {
+            opacity: 1;
+            transform: rotate(45deg) translate(-2px, -1px);
+        }
+        .transform_middle {
+            opacity: 0;
+            transform: rotate(0deg) scale(0.2, 0.2);
+        }
+        .transform_bottom {
+            opacity: 1;
+            transform: rotate(-45deg) translate(-1px, -1px);
+        }
+
         .fcc_hamburger {
             position: relative;
             width: 25px;
@@ -183,19 +196,7 @@ const test_suite_skeleton = `
             bottom: -6px;
             transform-origin: 20% 80%;
         }
-        .transform_top {
-            opacity: 1;
-            transform: rotate(45deg) translate(-2px, -1px);
-        }
-        .transform_middle {
-            opacity: 0;
-            transform: rotate(0deg) scale(0.2, 0.2);
-        }
-        .transform_bottom {
-            opacity: 1;
-            transform: rotate(-45deg) translate(-1px, -1px);
-        }
-
+        
         #fcc_foldout_menu label {
             top: 38px;
             left: 20px;
@@ -308,9 +309,9 @@ const test_suite_skeleton = `
     </style>
     <div id="fcc_test_suite_indicator_wrapper"></div>
     <div id="fcc_foldout_toggler">
-        <span id="hamburger_top" class="fcc_hamburger"></span>    
-        <span id="hamburger_middle" class="fcc_hamburger"></span>  
-        <span id="hamburger_bottom" class="fcc_hamburger"></span>      
+        <span id="hamburger_top" class="fcc_hamburger transform_top"></span>    
+        <span id="hamburger_middle" class="fcc_hamburger transform_middle"></span>  
+        <span id="hamburger_bottom" class="fcc_hamburger transform_bottom"></span>      
     </div>
     <input id="toggle" onclick="FCC_Global.hamburger_transform()" type="checkbox" title="CTRL + SHIFT + O">
     <div id="fcc_foldout_menu">