From e0194e69a515b5abb008409c526a1418c0984d66 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Wed, 2 Jul 2014 09:44:03 -0400 Subject: [PATCH] adding background to topic-list, making max-width larger on extra-info-wrapper, and changing viewport config --- app/assets/stylesheets/common/base/_topic-list.scss | 1 + app/assets/stylesheets/common/foundation/base.scss | 10 +++++++++- app/assets/stylesheets/desktop/topic-post.scss | 11 +++++------ app/views/layouts/_head.html.erb | 5 +++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 023c1c0f1ab..772394f2c49 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -18,6 +18,7 @@ border-collapse: separate; border-spacing: 0; border-top: 1px solid scale-color-diff(); + background: rgba($secondary, .8); > tbody > tr { &:nth-child(even) { diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss index 6b9f570fbbf..557d840098f 100644 --- a/app/assets/stylesheets/common/foundation/base.scss +++ b/app/assets/stylesheets/common/foundation/base.scss @@ -11,7 +11,15 @@ html { background-color: $secondary; overflow-y: scroll; -webkit-font-smoothing: subpixel-antialiased; -} + height: 100%; + body { + height: 100%; + #main { + height: 100%; + } + } + } + // Links // -------------------------------------------------- diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 75cceb0bc8b..22bd7f1a7c8 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -537,10 +537,9 @@ iframe { .extra-info-wrapper { float: left; - width: 78%; - max-width: 800px; + max-width: 875px; .topic-statuses { - i { color: $header_primary; } + i { color: $header_primary; } .unpinned { color: $header_primary; } } .topic-link { color: $header_primary; } @@ -549,14 +548,14 @@ iframe { @include medium-width { .extra-info-wrapper { - max-width: 740px; + max-width: 770px; } } @include small-width { .extra-info-wrapper { - max-width: 680px; + max-width: 720px; } } @@ -564,7 +563,7 @@ iframe { h1 { margin: 5px 0 0 0; font-size: 1.6em; - line-height: 1.2em; + line-height: 1.3em; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 180569c3958..24f57c524f0 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,5 +1,6 @@ - + + @@ -11,4 +12,4 @@ <%= render partial: "common/special_font_face" %> <%= render partial: "common/discourse_stylesheet" %> - <%= discourse_csrf_tags %> \ No newline at end of file + <%= discourse_csrf_tags %>