From 2c44f724f44e60efa7075cea38141b7c7bab3957 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Mon, 21 Apr 2014 11:54:57 -0400 Subject: [PATCH] fixing the composer that I just re-broke --- app/assets/stylesheets/common/base/compose.scss | 9 --------- app/assets/stylesheets/desktop/compose.scss | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index b55dadffd87..b436a3d14d8 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -87,15 +87,6 @@ div.ac-wrap { display: none; } -@media screen and (min-width: 1550px) { - #reply-control { - .wmd-controls { - width: 1450px; - left: auto; - right: auto; - } - } -} .auto-close-fields { input { diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index def3cad79f9..dd22b1eed2c 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -372,10 +372,11 @@ } } .wmd-controls { - left: auto; - right: auto; + left: 30px; + right: 30px; position: absolute; bottom: 48px; + top: 50px; // this removes the topmost margin; // if we don't have this, all posts would have extra space at the top @@ -462,3 +463,13 @@ padding-left: 20px; padding-right: 20px; } + +@media screen and (min-width: 1550px) { + #reply-control { + .wmd-controls { + width: 1450px; + left: auto; + right: auto; + } + } +}