From 78603259c1cee63c080e346c8f3b11619945ec90 Mon Sep 17 00:00:00 2001 From: lilia Date: Thu, 18 Feb 2016 20:12:01 -0800 Subject: [PATCH] Center conversation tile in the main pane Also fixes a visual bug with debug log and other overlays which wouldn't cover the right edge of a very wide window. // FREEBIE --- stylesheets/_conversation.scss | 3 ++- stylesheets/_global.scss | 3 --- stylesheets/_index.scss | 4 +--- stylesheets/manifest.css | 11 ++++------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index 30a7302c..56713ef1 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -15,8 +15,9 @@ } .conversation { + max-width: 950px; background-color: #ffffff; - margin: 10px; + margin: 10px auto; padding: 20px 20px 10px; border-radius: 10px; height: calc(100% - 20px); diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss index dcf8d5ab..6372fc1e 100644 --- a/stylesheets/_global.scss +++ b/stylesheets/_global.scss @@ -29,7 +29,6 @@ body { } #header { - max-width: 1300px; position: fixed; top: 1px; width: calc(100% - 2px); @@ -92,8 +91,6 @@ button.back { position: relative; float: right; height: 36px; - padding-right: 8px; - .hamburger { width: $header-height; diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index a2ac4f49..b3146e8a 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -50,8 +50,7 @@ } .conversation-stack { - padding-left: 300px; - padding-top: $header-height; + padding: $header-height 10px 0px 310px; .conversation { display: none; } @@ -163,7 +162,6 @@ input.search { } .index { - max-width: 1300px; color: $grey_d; background: #2eace0; diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index a8fb9e18..8e36a788 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -38,7 +38,6 @@ body { display: none; } #header { - max-width: 1300px; position: fixed; top: 1px; width: calc(100% - 2px); @@ -86,8 +85,7 @@ button.back { .menu { position: relative; float: right; - height: 36px; - padding-right: 8px; } + height: 36px; } .menu .hamburger { width: 36px; height: 36px; @@ -433,8 +431,7 @@ img.emoji { background: url("/images/error_red.png") no-repeat left center; } .conversation-stack { - padding-left: 300px; - padding-top: 36px; } + padding: 36px 10px 0px 310px; } .conversation-stack .conversation { display: none; } .conversation-stack .conversation:first-child { @@ -516,7 +513,6 @@ input.search { opacity: 1; } .index { - max-width: 1300px; color: #454545; background: #2eace0; } .index .gutter .new-group-update-form { @@ -626,8 +622,9 @@ input.search { color: #999; } .conversation { + max-width: 950px; background-color: #ffffff; - margin: 10px; + margin: 10px auto; padding: 20px 20px 10px; border-radius: 10px; height: calc(100% - 20px);