Commit 52d5de5b by Andy Armstrong

More discussion styles

parent 13eee1c1
<header class="wrapper-response-header"> <header class="response-header">
<div class="response-header-content"> <div class="response-header-content">
<%= author_display %> <%= author_display %>
<p class="posted-details"> <p class="posted-details">
......
<div class="discussion-post"> <div class="discussion-post">
<header class="wrapper-post-header"> <header class="post-header">
<% if (!readOnly) { %> <% if (!readOnly) { %>
<div class="post-header-actions post-extended-content"> <div class="post-header-actions post-extended-content">
<%= <%=
......
...@@ -43,16 +43,16 @@ ...@@ -43,16 +43,16 @@
@mixin discussion-wmd-preview-container { @mixin discussion-wmd-preview-container {
@include border-radius(0, 0, $forum-border-radius, $forum-border-radius); @include border-radius(0, 0, $forum-border-radius, $forum-border-radius);
box-sizing: border-box; box-sizing: border-box;
border: 1px solid $gray-l1; border: 1px solid $forum-color-border;
border-top: none; border-top: none;
width: 100%; width: 100%;
background: $gray-l4; background: $forum-color-background-light;
box-shadow: 0 1px 3px $shadow-l1 inset; box-shadow: 0 1px 3px $shadow-l1 inset;
} }
@mixin discussion-new-post-wmd-preview-container { @mixin discussion-new-post-wmd-preview-container {
@include discussion-wmd-preview-container; @include discussion-wmd-preview-container;
border-color: $gray-d3; border-color: $forum-color-border;
box-shadow: 0 1px 3px $shadow-d1 inset; box-shadow: 0 1px 3px $shadow-d1 inset;
} }
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
@mixin discussion-wmd-preview { @mixin discussion-wmd-preview {
padding: ($baseline/2) $baseline; padding: ($baseline/2) $baseline;
width: auto; width: auto;
color: $gray-d3; color: $forum-color-background-light;
ol, ul { // Fix up the RTL-only _reset.scss, but only in specific places ol, ul { // Fix up the RTL-only _reset.scss, but only in specific places
@include padding-left($baseline*2); @include padding-left($baseline*2);
......
...@@ -118,7 +118,7 @@ li[class*=forum-nav-thread-label-] { ...@@ -118,7 +118,7 @@ li[class*=forum-nav-thread-label-] {
// ------- // -------
.discussion-module { .discussion-module {
.wrapper-post-header { .post-header {
margin-bottom: 0 !important; // overrides default header styling margin-bottom: 0 !important; // overrides default header styling
padding-bottom: 0 !important; // overrides default header styling padding-bottom: 0 !important; // overrides default header styling
...@@ -135,3 +135,17 @@ li[class*=forum-nav-thread-label-] { ...@@ -135,3 +135,17 @@ li[class*=forum-nav-thread-label-] {
} }
} }
} }
// overrides courseware styling to keep views consistent everywhere
.discussion-article {
.response-header {
line-height: 1 !important;
font-size: $forum-base-font-size !important;
margin-bottom: 0 !important;
padding-bottom: 0 !important;
}
p {
margin-bottom: 0 !important;
}
}
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
} }
// +base - single response element // +base - single response element
.container .discussion-response { .discussion-response {
.response-header-content { .response-header-content {
// CASE: larger username for responses // CASE: larger username for responses
......
...@@ -16,7 +16,10 @@ ...@@ -16,7 +16,10 @@
.post-header-actions { .post-header-actions {
@include float(right); @include float(right);
} }
}
// post article
.discussion-article {
.posted-details { .posted-details {
@extend %t-copy-sub2; @extend %t-copy-sub2;
margin: ($baseline/5) 0; margin: ($baseline/5) 0;
...@@ -129,7 +132,9 @@ ...@@ -129,7 +132,9 @@
} }
.discussion-response .response-body { .discussion-response .response-body {
@include padding-right($baseline); //ensures content doesn't overlap on post or response actions. @include padding(($baseline/2), $baseline, 0, 0); //ensures content doesn't overlap on post or response actions.
margin-bottom: 0.2em;
font-size: $forum-base-font-size;
} }
// +post - individual element styling // +post - individual element styling
...@@ -221,11 +226,6 @@ ...@@ -221,11 +226,6 @@
font-size: $forum-large-font-size; font-size: $forum-large-font-size;
} }
} }
.response-body {
margin-bottom: 0.2em;
font-size: $forum-base-font-size;
}
} }
.discussion-reply-new { .discussion-reply-new {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment