diff --git a/background.html b/background.html index caad89a6..97f6e43f 100644 --- a/background.html +++ b/background.html @@ -18,9 +18,11 @@
-
-
-
+
+
+
+
+
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index 85e0892e..fc3227d8 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -1,7 +1,3 @@ -.gutter { - padding: $header-height 0 0; -} - .conversation-stack, .new-conversation, .inbox, .gutter { height: 100%; @@ -14,11 +10,15 @@ .gutter { float: left; - margin: 10px 0; width: 300px; + .content { + height: 100%; + padding: 46px 0 10px; + } + .conversations { overflow-y: scroll; - height: calc(100% - 20px); + height: 100%; width: 100%; } } diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index 5f97e258..ba8a1f03 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -383,9 +383,6 @@ img.emoji { text-align: center; font-size: 19px; } -.gutter { - padding: 36px 0 0; } - .conversation-stack, .new-conversation, .inbox, .gutter { height: 100%; } @@ -396,11 +393,13 @@ img.emoji { .gutter { float: left; - margin: 10px 0; width: 300px; } + .gutter .content { + height: 100%; + padding: 46px 0 10px; } .gutter .conversations { overflow-y: scroll; - height: calc(100% - 20px); + height: 100%; width: 100%; } .socket-status {