merge

2 files changed, 30 insertions, 25 deletions

diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index d4c2b03..b8992ea 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -41,8 +41,7 @@ var app = (function() {
 app.init()
 
 
-$(".cell").css({ 'height': ($(".top").height() + 'px') });
-
+$(".cell, .next").css({ 'height': ($(".top").height() + 'px') });
 
 $('.top').flickity({
   cellAlign: 'left',
@@ -57,8 +56,10 @@ $('.top').flickity({
   }
 })
 
-$('.index').click( function(){
-  $('body').toggleClass('navopen');
+$(".previous, .next").css({ 'height': ($(".top").height() + 'px') });
+
+$('.index').click(function() {
+    $('body').toggleClass('navopen');
 });
 
 $('.item').click( function(){
@@ -75,10 +76,10 @@ var delay = (function() {
 })();
 
 $(window).resize(function() {
-    $(".cell").css({ 'display': 'none' });
+    $(".cell, .next, .previous").css({ 'display': 'none' });
     $('body').addClass('resizing');
     delay(function() {
-        $(".cell").css({ 'height': ($(".top").height() + 'px'), 'display': 'inline-block' });
+        $(".cell, .next, .previous").css({ 'height': ($(".top").height() + 'px'), 'display': 'inline-block' });
         $('.top').flickity('resize');
         $('body').removeClass('resizing');
     }, 400);
diff --git a/public/assets/ok.css b/public/assets/ok.css
index 1a9d973..113b43e 100644
--- a/public/assets/ok.css
+++ b/public/assets/ok.css
@@ -14,16 +14,18 @@ html {
 }
 
 ::selection {
-    color: #fff;
+    color: blue;
 }
 
 ::-moz-selection {
-    color: #fff;
+    color: blue;
 }
 
 a,
 a:visited {
     color: blue;
+    font-weight: bold;
+    font-size: 11px;
 }
 
 body {
@@ -49,6 +51,11 @@ body {
     -webkit-column-gap: 3px;
     -moz-column-gap: 3px;
     column-gap: 3px;
+    -webkit-column-break-inside: avoid;
+    -moz-column-break-inside:avoid;
+    -moz-page-break-inside:avoid;
+    page-break-inside: avoid;
+    break-inside: avoid-column;
 }
 
 menu ul {
@@ -61,6 +68,7 @@ menu ul {
     border-bottom: 1px solid;
     padding-bottom: 4px;
     padding-top: 6px;
+    font-size:14px;
 }
 
 .menu ul li:hover {
@@ -123,9 +131,12 @@ nav span {
     vertical-align: top;
     padding: 2px;
 }
-
+.index {
+}
 .index:after {
     content: "INDEX";
+        padding-right: 5px;
+
 }
 
 .navopen .index:after {
@@ -196,8 +207,6 @@ nav b {
 }
 
 button {
-    height: 70vh;
-    /*THIS SHOULD BE DYNAMIC*/
     width: 10vw;
     position: absolute;
     top: 0;
@@ -205,6 +214,10 @@ button {
     cursor: pointer;
 }
 
+.navopen button {
+    pointer-events:none;
+}
+
 button svg {
     opacity: 0;
     transition: 150ms all;
@@ -232,15 +245,6 @@ button.previous:active svg {
 }
 
 
-/*
-    button.next:hover {
-        background: rgba(255, 255, 255, 0.5);
-    }
-    
-    button.previous:hover {
-        background: rgba(255, 255, 255, 0.5);
-    }
-    */
 
 .cell {
     width: 100vw;
@@ -334,11 +338,14 @@ ul li {
 }
 
 @media (min-width: 1300px) {
+    .bottom {
+        padding:7px 0 8px 0;
+    }
     .texts {
         font-size: 13px;
         line-height: 16px;
     }
-    nav {
+    .headings, nav {
         font-size: 9px;
     }
 }
@@ -383,10 +390,7 @@ ul li {
     nav span div:nth-child(2) {
         display: none;
     }
-    .cell,
-    button {
-        height: 50vh;
-    }
+
     .five span {
         width: 50%;
         border-bottom: 1px solid;