From 396b626bdcbfaa100accc37249841fa647e6caa0 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Thu, 31 Oct 2013 09:35:49 -0400 Subject: [PATCH] topic vertical alignment fixes, admin logs table width fix --- app/assets/stylesheets/common/admin/admin_base.scss | 1 - app/assets/stylesheets/desktop/onebox.scss | 2 +- app/assets/stylesheets/desktop/topic-list.scss | 1 + app/assets/stylesheets/desktop/topic-post.scss | 9 ++++++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 7ed5e07b6b9..930c4621ca6 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -752,7 +752,6 @@ table.api-keys { } .screened-emails, .screened-urls, .screened-ip-addresses { - width: 900px; .email, .url { width: 300px; } diff --git a/app/assets/stylesheets/desktop/onebox.scss b/app/assets/stylesheets/desktop/onebox.scss index 3ec03708fcb..3c128a6bff5 100644 --- a/app/assets/stylesheets/desktop/onebox.scss +++ b/app/assets/stylesheets/desktop/onebox.scss @@ -17,7 +17,7 @@ a.loading-onebox { > .source { margin-bottom: 10px; margin-right: 10px; - padding: 10px 0; + padding: 0 0 10px 0; display: block; color: $black; position: relative; diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 43aaf4cdd53..3fa8ea7cb9b 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -16,6 +16,7 @@ .btn { float: right; margin-left: 8px; + margin-bottom: 10px; font-size: 16px; font-weight: normal; } diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 15adcbd8657..374f2db5691 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -333,8 +333,6 @@ a.star { } &:active { - - @include box-shadow(inset 0 1px 3px rgba($black, 0.2)); } @@ -501,6 +499,8 @@ iframe { .contents .cooked { padding-right: 30px; h1, h2, h3 {margin: 10px 0;} + ul, ol {margin: 15px 0;} + li p {margin: 3px 0;} } .modal-body { @@ -599,6 +599,9 @@ position: relative; } + + + blockquote { /* solo quotes */ margin: 14px 0; padding: 12px; @@ -672,7 +675,7 @@ blockquote { /* solo quotes */ float: left; position: relative; width: 720px; - padding: 10px 0 15px 20px; + padding: 10px 10px 15px 20px; } .posts-wrapper {