Merge pull request #20 from GainTime/2.1.1

2.1.1
GainTime · Apr 30, 2017 · e125c0d · e125c0d
2 parents 01747f7 + 74dccb1
commit e125c0d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/build/js/gainTime.js b/build/js/gainTime.js
@@ -1,8 +1,10 @@
 function makeA(a) {
   a.addEventListener("click", function(e) {
     var d = a.href.split("/");
-    var f = d[d.length - 1];
-    if (f.charAt(0) == '#') {
+    var file = d[d.length - 1];
+    f = file.split("#")[1];
+
+    if (f != undefined) {
       e.preventDefault();
       f = f.replace(/\#/g,"");
       var target = document.getElementById(f);
@@ -58,7 +60,7 @@ function animate(elem, style, unit, from, to, time, prop) {
 function menuToggle(a) {
     var b = a.nextElementSibling;
     a.addEventListener("click", function(c) {
-        c.stopPropagation(), a.checked = !a.checked, a.checked ? b.style.maxWidth = "400px" : b.style.removeProperty("max-width")
+        c.stopPropagation(), !b.style.maxWidth ? b.style.maxWidth = "400px" : b.style.removeProperty("max-width")
     })
 }
 

diff --git a/build/sass/components/_dropdowns.sass b/build/sass/components/_dropdowns.sass
@@ -5,18 +5,21 @@
   margin: 15px 0
   &.btn
     &::after
-      right: -10px
-      bottom: +5px
+      right: -5px
   & > *
     display: inline-block
     vertical-align: middle
   &::after
-    content: "◣"
+    content: ""
     display: inline-block
     vertical-align: middle
-    padding: 0
+    padding: 3px
     position: relative
+    border-bottom: 2px solid
+    border-left: 2px solid
+    margin: 5px 0px 8px 3px
     +transform(rotate(-45deg))
+
   a
     text-decoration: none
 

diff --git a/build/sass/layouts/_header.sass b/build/sass/layouts/_header.sass
@@ -7,9 +7,6 @@
     top: 100%
     +transition()
 
-    [class^=dropdown] ul
-      width: 100%
-
     &:after
       clear: both
       content: ""
@@ -45,10 +42,22 @@
   & > img, nav, ul, li
     height: 100%
 
-  [class^=dropdown]
-    margin: 0 1px
+  %adjust-btn
+    margin: 0 1px!important
     height: 100%
 
+  .drop
+    &up, &down
+      &-right, &-left
+        padding: 10px 8px
+        @extend %adjust-btn
+        ul
+          width: 100%
+
+  .btn
+    @extend %adjust-btn
+    padding: 6px 18px
+
   nav
     float: right
     text-align: center