Merge branch 'master' into ahoy

app/html/app.mcss

@@ -8,6 +8,19 @@ App {
   right: 0
 
   overflow: hidden
+
   min-height: 0px
-}
+  height: 100%
+  width: 100%
+
+  position: relative
 
+  div.Hypertabs {
+    position: absolute
+
+    top: var(--app-border-width)
+    bottom: var(--app-border-width)
+    left: var(--app-border-width)
+    right: var(--app-border-width)
+  }
+}

app/html/tabs.mcss

@@ -2,18 +2,6 @@
 /* NOTE there are some active styles in here still */
 
 Hypertabs {
-  position: fixed
-  top: 0
-  right: 0
-  left: 0
-  bottom: 0
-
-  display: flex
-  flex-direction: column
-
-  height: 100% /* needed to stop scroller blowing out */
-  overflow: hidden
-
   nav {
     display: flex
 
@@ -92,17 +80,4 @@ Hypertabs {
       margin: 0 .5rem
     }
   }
-
-  section.content {
-    display: flex
-
-    height: 100% /* needed to stop making nav weird */
-
-    div.page {
-      flex-grow: 1
-
-      display: flex /*hack to get give Scroller context it needs */
-    }
-  }
 }
-

app/styles/mcss/hypertabs.mcss

@@ -2,12 +2,8 @@ Hypertabs {
   display: flex
   flex-direction: column
 
-  top: var(--app-border-width)
-  bottom: var(--app-border-width)
-  left: var(--app-border-width)
-  right: var(--app-border-width)
-
   height: initial
+  overflow: hidden
 
   nav {
     height: 2.3rem
@@ -128,15 +124,20 @@ Hypertabs {
     // this brings the scroll-bar in
     padding: .5rem .4rem
 
-    height: 100% /* needed to stop making nav weird */
+    height: 100%
+    /* needed to stop making nav weird */
 
     display: flex
 
     div.page {
       flex-grow: 1
 
-      display: flex /*hack to get give Scroller context it needs */
+      display: flex
+      /*hack to get give Scroller context it needs */
+
+      top: 0
+      bottom: 0
+      /* stop that stupid thing where tab scrolls the whole page */
     }
   }
 }
-

package.json

@@ -64,7 +64,7 @@
     "lodash": "^4.17.10",
     "marama": "^1.2.2",
     "micro-css": "^2.0.1",
-    "mutant": "^3.22.1",
+    "mutant": "^3.22.3",
     "mutant-scroll": "^1.0.2",
     "open-external": "^0.1.1",
     "patch-drafts": "0.0.6",

styles/mcss.js

@@ -1,13 +1,13 @@
 const path = require('path')
-const { basename } = path
+// const { basename } = path
 const readDirectory = require('read-directory')
 const { each } = require('libnested')
 const nest = require('depnest')
 
 const contents = readDirectory.sync(path.join(__dirname, '..'), {
   extensions: false,
   filter: '**/*.mcss',
-  ignore: '**/node_modules/**'
+  ignore: ['**/node_modules/**', 'dist/**']
 })
 
 exports.gives = nest('styles.mcss')
@@ -17,8 +17,9 @@ exports.create = function (api) {
 
   function mcss (sofar = {}) {
     each(contents, (content, [filename]) => {
-      const name = basename(filename)
-      sofar[name] = content
+      // const name = basename(filename)
+      // sofar[name] = content
+      sofar[filename] = content
     })
     return sofar
   }