diff options
author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-04-29 12:19:31 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-04-29 00:19:31 -0700 |
commit | f9d2b1310b453c0d4e318ac2242570ed93dd7d14 (patch) | |
tree | 6a995ffce5d689a389b5adde19b0b4bf28d284ef /webapp/sass/layout | |
parent | 4ae72ad1a878fdf1fc3a25068e783e5a24432f08 (diff) | |
download | chat-f9d2b1310b453c0d4e318ac2242570ed93dd7d14.tar.gz chat-f9d2b1310b453c0d4e318ac2242570ed93dd7d14.tar.bz2 chat-f9d2b1310b453c0d4e318ac2242570ed93dd7d14.zip |
Reverting center channel margins and fixing the channel names (#2823)
Fixing margin for channel intro
Adjusting margins for preformatted text
Diffstat (limited to 'webapp/sass/layout')
-rw-r--r-- | webapp/sass/layout/_headers.scss | 7 | ||||
-rw-r--r-- | webapp/sass/layout/_markdown.scss | 4 | ||||
-rw-r--r-- | webapp/sass/layout/_navigation.scss | 4 | ||||
-rw-r--r-- | webapp/sass/layout/_post.scss | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index b4b6e9cbc..35fef8e08 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -67,7 +67,7 @@ .channel-intro { border-bottom: 1px solid $light-gray; - margin: 0 30px 35px; + margin: 0 18px 35px; padding: 0 0 5px; .intro-links { @@ -289,7 +289,8 @@ &:first-child { border-left: none; - padding-left: 1em; + padding-left: 15px; + padding-right: 1em; text-align: left !important; width: 100%; } @@ -315,7 +316,7 @@ font-size: 1.3em; font-weight: 600; margin: 0 4px 0 0; - max-width: calc(100% - 50px); + max-width: 100%; overflow: hidden; text-overflow: ellipsis; vertical-align: middle; diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss index cd5831653..cb29aa20e 100644 --- a/webapp/sass/layout/_markdown.scss +++ b/webapp/sass/layout/_markdown.scss @@ -29,8 +29,8 @@ pre { border: 1px solid rgba(221,221,221,0.2); border-radius: .25em; - margin: 0; - padding: 0px; + margin: 5px 0; + padding: 0; text-align: left; } diff --git a/webapp/sass/layout/_navigation.scss b/webapp/sass/layout/_navigation.scss index 2008b247a..70b9eb133 100644 --- a/webapp/sass/layout/_navigation.scss +++ b/webapp/sass/layout/_navigation.scss @@ -72,10 +72,10 @@ color: $white; display: inline-block; font-weight: 600; - margin-right: 3px; + margin-right: 5px; + max-width: calc(100% - 200px); overflow: hidden; vertical-align: top; - width: calc(100% - 200px); } .header-dropdown__icon { diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 374fa7324..3ba5926ef 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -359,7 +359,7 @@ body.ios { .post-create__container { form { margin: 0 auto; - padding: .5em 30px 0; + padding: .5em 15px 0; width: 100%; } @@ -604,7 +604,7 @@ body.ios { .post__content { display: table; margin: 0 auto; - padding: 0 15px; + padding: 0 5px; position: relative; table-layout: fixed; width: 100%; |