resolve show.jade merge conflict

This commit is contained in:
Nathan Leniz
2015-03-08 18:50:28 +09:00
24 changed files with 163 additions and 58 deletions

View File

@@ -27,6 +27,8 @@ li, .wrappable {
html {
position: relative;
min-height: 100%;
// hack to prevent horizontal overflow problem on showHTML view
overflow-x: hidden;
}
body.full-screen-body-background {