Skip to content

Commit

Permalink
Merge branch 'ahoy' into new_installer
Browse files Browse the repository at this point in the history
  • Loading branch information
mixmix committed May 16, 2019
2 parents 4d38506 + f598ea6 commit 2953eb9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
3 changes: 2 additions & 1 deletion app/html/app.mcss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ App {
background: var(--app-border-background)

overflow: hidden

min-height: 0px
height: 100%
width: 100%

Expand All @@ -16,4 +18,3 @@ App {
right: var(--app-border-width)
}
}

21 changes: 18 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,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",
Expand Down

0 comments on commit 2953eb9

Please sign in to comment.