Skip to content

E
edx-platform
Commit 307ebed8 by Brittany Cheng
Options

reorganize css

parent 8346804a
Showing with 65 additions and 67 deletions
lms/static/sass/_discussion.scss
...@@ -24,33 +24,33 @@ $discussion_input_width: 100%; ...@@ -24,33 +24,33 @@ $discussion_input_width: 100%;
.discussion-title { .discussion-title {
@include discussion-font; @include discussion-font;
@include discussion-clickable; @include discussion-clickable;
display: inline-block;
font-size: $discussion_title_size; font-size: $discussion_title_size;
font-weight: bold; font-weight: bold;
margin-bottom: flex-gutter(6); margin-bottom: flex-gutter(6);
display: inline-block;
} }
.discussion-title-wrapper { .discussion-title-wrapper {
.discussion-watch-discussion, .discussion-unwatch-discussion { .discussion-watch-discussion, .discussion-unwatch-discussion {
display: none;
@include discussion-font; @include discussion-font;
margin-left: 5px; display: none;
font-size: $comment_info_size; font-size: $comment_info_size;
margin-left: 5px;
} }
} }
//SORTING //SORTING
.discussion-sort { .discussion-sort {
font-size: $comment_body_size;
float: right; float: right;
font-size: $comment_body_size;
margin-top: -2.5%; margin-top: -2.5%;
.discussion-sort-link { .discussion-sort-link {
&:hover { &:hover {
text-decoration: none;
color: #1C71DD; color: #1C71DD;
text-decoration: none;
} }
} }
.discussion-sort-link.sorted { .discussion-sort-link.sorted {
font-weight: bold;
color: #1C71DD; color: #1C71DD;
font-weight: bold;
} }
} }
//SEARCH //SEARCH
...@@ -89,26 +89,14 @@ $discussion_input_width: 100%; ...@@ -89,26 +89,14 @@ $discussion_input_width: 100%;
margin-bottom: 3%; margin-bottom: 3%;
} }
.discussion-search-within-board { .discussion-search-within-board {
font-style: normal;
font: inherit; font: inherit;
font-size: $comment_body_size; font-size: $comment_body_size;
font-style: normal;
} }
//BASIC BUTTON STYLES //BASIC BUTTON STYLES
.control-button { .control-button {
@include button; @include button;
@include discussion-font; @include discussion-font;
display: inline-block;
margin-bottom: 3%;
color: white;
font-weight: bold;
padding-top: 9px;
font-size: inherit;
width: inherit;
text-decoration: none;
border: 1px solid #6F6F6F;
-webkit-box-shadow: inset 0 1px 0 #A2A2A2,0 0 3px #CCC;
-moz-box-shadow: inset 0 1px 0 #a2a2a2,0 0 3px #ccc;
box-shadow: inset 0 1px 0 #A2A2A2,0 0 3px #CCC;
background-color: #959595; background-color: #959595;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #959595),color-stop(100%, #7B7B7B)); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #959595),color-stop(100%, #7B7B7B));
background-image: -webkit-linear-gradient(top, #959595,#7B7B7B); background-image: -webkit-linear-gradient(top, #959595,#7B7B7B);
...@@ -116,11 +104,20 @@ $discussion_input_width: 100%; ...@@ -116,11 +104,20 @@ $discussion_input_width: 100%;
background-image: -ms-linear-gradient(top, #959595,#7B7B7B); background-image: -ms-linear-gradient(top, #959595,#7B7B7B);
background-image: -o-linear-gradient(top, #959595,#7B7B7B); background-image: -o-linear-gradient(top, #959595,#7B7B7B);
background-image: linear-gradient(top, #959595,#7B7B7B); background-image: linear-gradient(top, #959595,#7B7B7B);
border: 1px solid #6F6F6F;
-webkit-box-shadow: inset 0 1px 0 #A2A2A2,0 0 3px #CCC;
-moz-box-shadow: inset 0 1px 0 #a2a2a2,0 0 3px #ccc;
box-shadow: inset 0 1px 0 #A2A2A2,0 0 3px #CCC;
color: white;
display: inline-block;
font-size: inherit;
font-weight: bold;
margin-bottom: 3%;
padding-top: 9px;
width: inherit;
text-decoration: none;
text-shadow: none; text-shadow: none;
&:hover { &:hover {
-webkit-box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC;
-moz-box-shadow: inset 0 1px 0 #bbb,0 0 3px #ccc;
box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC;
background-color: #A2A2A2; background-color: #A2A2A2;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #A2A2A2),color-stop(100%, #7B7B7B)); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #A2A2A2),color-stop(100%, #7B7B7B));
background-image: -webkit-linear-gradient(top, #A2A2A2,#7B7B7B); background-image: -webkit-linear-gradient(top, #A2A2A2,#7B7B7B);
...@@ -129,53 +126,55 @@ $discussion_input_width: 100%; ...@@ -129,53 +126,55 @@ $discussion_input_width: 100%;
background-image: -o-linear-gradient(top, #A2A2A2,#7B7B7B); background-image: -o-linear-gradient(top, #A2A2A2,#7B7B7B);
background-image: linear-gradient(top, #A2A2A2,#7B7B7B); background-image: linear-gradient(top, #A2A2A2,#7B7B7B);
border: 1px solid #555; border: 1px solid #555;
-webkit-box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC;
-moz-box-shadow: inset 0 1px 0 #bbb,0 0 3px #ccc;
box-shadow: inset 0 1px 0 #BBB,0 0 3px #CCC;
} }
} }
//FOLLOW BUTTON //FOLLOW BUTTON
.follow-wrapper { .follow-wrapper {
float: right; float: right;
.discussion-link { .discussion-link {
display: inline-block;
@include button; @include button;
text-decoration: none; background-color: #BEBEBE;
font-size: $comment_info_size; background-image: none;
padding: 5px 8px;
text-decoration: none;
border: none; border: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
background-color: #AAA; display: inline-block;
background-image: none; font-size: $comment_info_size;
padding: 5px 8px;
text-decoration: none;
text-shadow: none; text-shadow: none;
&:hover { &:hover {
background-color: #AAA;
background-image: none;
border: none; border: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
background-color: #BEBEBE;
background-image: none;
} }
} }
} }
//VOTES //VOTES
.discussion-votes { .discussion-votes {
text-align: center;
height: flex-grid(3);
float: left; float: left;
height: flex-grid(3);
margin: 1% 2%; margin: 1% 2%;
text-align: center;
.discussion-vote-count { .discussion-vote-count {
font-size: $comment_body_size;
@include discussion-font; @include discussion-font;
font-size: $comment_body_size;
} }
a.discussion-vote { a.discussion-vote {
display: block;
color: black; color: black;
font-weight: bold; display: block;
font-size: 15px; font-size: 15px;
font-weight: bold;
&:hover { &:hover {
text-decoration: none;
color: #1C71DD; color: #1C71DD;
text-decoration: none;
} }
&.discussion-vote-up { &.discussion-vote-up {
margin-bottom: 3px; margin-bottom: 3px;
...@@ -190,27 +189,26 @@ $discussion_input_width: 100%; ...@@ -190,27 +189,26 @@ $discussion_input_width: 100%;
} }
//CREATE NEW AND EDIT POSTS //CREATE NEW AND EDIT POSTS
.discussion-right-wrapper { .discussion-right-wrapper {
min-height: 40px;
float: left; float: left;
min-height: 40px;
width: 90%; width: 90%;
} }
.new-post-form, .discussion-thread-edit { .new-post-form, .discussion-thread-edit {
.title-input, .body-input { .title-input, .body-input {
font-style: normal;
font: inherit;
display: block !important; display: block !important;
font: inherit;
font-style: normal;
width: $discussion_input_width !important; width: $discussion_input_width !important;
} }
.discussion-errors { .discussion-errors {
display: block;
color: #8F0E0E; color: #8F0E0E;
display: block;
margin-left: -5%; margin-left: -5%;
} }
.new-post-body { .new-post-body {
margin-top: flex-gutter(); margin-top: flex-gutter();
} }
.tagsinput { .tagsinput {
margin-top: flex-gutter();
background: #FAFAFA; background: #FAFAFA;
border: 1px solid #C8C8C8; border: 1px solid #C8C8C8;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
...@@ -224,11 +222,13 @@ $discussion_input_width: 100%; ...@@ -224,11 +222,13 @@ $discussion_input_width: 100%;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
margin-top: flex-gutter();
vertical-align: top; vertical-align: top;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
} }
.discussion-content-edit, .discussion-reply-new, .new-post-form { .discussion-content-edit, .discussion-reply-new, .new-post-form {
margin: 10px 0 10px 0;
.new-post-control { .new-post-control {
margin-left: 80%; margin-left: 80%;
margin-top: 1%; margin-top: 1%;
...@@ -244,15 +244,14 @@ $discussion_input_width: 100%; ...@@ -244,15 +244,14 @@ $discussion_input_width: 100%;
@include button; @include button;
@include discussion-font; @include discussion-font;
color: white; color: white;
display: inline-block;
font-size: inherit;
font-weight: bold; font-weight: bold;
text-decoration: none;
margin-left: 5%; margin-left: 5%;
display: inline-block;
padding-top: 9px; padding-top: 9px;
font-size: inherit; text-decoration: none;
width: inherit; width: inherit;
} }
margin: 10px 0 10px 0;
} }
.new-post-form { .new-post-form {
margin: 10px 0 40px 0; margin: 10px 0 40px 0;
...@@ -268,15 +267,15 @@ $discussion_input_width: 100%; ...@@ -268,15 +267,15 @@ $discussion_input_width: 100%;
.thread-title { .thread-title {
@include discussion-font; @include discussion-font;
@include discussion-clickable; @include discussion-clickable;
display: block;
font-size: $comment_title_size; font-size: $comment_title_size;
font-weight: bold; font-weight: bold;
display: block;
} }
.thread-body, .content-body { .thread-body, .content-body {
@include discussion-font; @include discussion-font;
font-size: $comment_body_size; font-size: $comment_body_size;
margin-top: 3px;
margin-bottom: 4px; margin-bottom: 4px;
margin-top: 3px;
p { p {
@include discussion-font; @include discussion-font;
margin: 0; margin: 0;
...@@ -286,51 +285,51 @@ $discussion_input_width: 100%; ...@@ -286,51 +285,51 @@ $discussion_input_width: 100%;
display: inline-block; display: inline-block;
.thread-tag { .thread-tag {
@include discussion-font; @include discussion-font;
background: #CDE69C;
border: 1px solid #A5D24A; border: 1px solid #A5D24A;
-moz-border-radius: 2px; -moz-border-radius: 2px;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
float: left;
padding: 5px 7px;
text-decoration: none;
background: #CDE69C;
color: #638421; color: #638421;
float: left;
font-size: 13px;
margin-right: 7px; margin-right: 7px;
margin-bottom: 4px; margin-bottom: 4px;
font-size: 13px; padding: 5px 7px;
text-decoration: none;
&:hover { &:hover {
color: #1E4612;
border-color: #1E4612; border-color: #1E4612;
color: #1E4612;
} }
} }
} }
.info { .info {
@include discussion-font; @include discussion-font;
color: gray;
font-size: $comment_info_size; font-size: $comment_info_size;
font-style: italic; font-style: italic;
color: gray;
.discussion-reply { .discussion-reply {
margin-left: 4px; margin-left: 4px;
} }
.discussion-link { .discussion-link {
@include discussion-font; @include discussion-font;
margin-left: 2px;
color: #1d9dd9; color: #1d9dd9;
display: inline; display: inline;
margin-left: 2px;
} }
} }
.discussion-content { .discussion-content {
overflow: hidden;
border-top: lightgray 1px solid; border-top: lightgray 1px solid;
overflow: hidden;
padding: 2% 0; padding: 2% 0;
.discussion-reply-new { .discussion-reply-new {
@include discussion-font; @include discussion-font;
margin-left: 5%; margin-left: 5%;
.reply-body { .reply-body {
@include discussion-font; @include discussion-font;
width: 95%; display: block;
font-size: $comment_body_size; font-size: $comment_body_size;
margin-top: 10px; margin-top: 10px;
display: block; width: 95%;
} }
} }
} }
...@@ -342,12 +341,11 @@ $discussion_input_width: 100%; ...@@ -342,12 +341,11 @@ $discussion_input_width: 100%;
.comment { .comment {
.comment-body, .content-body { .comment-body, .content-body {
@include discussion-font; @include discussion-font;
color: black;
display: block;
font-size: $comment_body_size; font-size: $comment_body_size;
margin-top: 3px; margin-top: 3px;
display: block;
color: black;
} }
&.endorsed { &.endorsed {
> .discussion-content { > .discussion-content {
background-color: lightyellow; background-color: lightyellow;
...@@ -358,24 +356,24 @@ $discussion_input_width: 100%; ...@@ -358,24 +356,24 @@ $discussion_input_width: 100%;
} }
//PAGES //PAGES
.discussion-paginator { .discussion-paginator {
margin-top: 20px;
margin-bottom: 10px;
font-size: $comment_body_size; font-size: $comment_body_size;
margin-bottom: 10px;
margin-top: 20px;
text-align: center; text-align: center;
div { div {
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
margin: 0 5px; margin: 0 5px;
a { a {
background: #EEE;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-ms-border-radius: 3px; -ms-border-radius: 3px;
-o-border-radius: 3px; -o-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
padding: 4px 10px;
background: #EEE;
font-weight: normal;
color: black; color: black;
font-weight: normal;
padding: 4px 10px;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
background: #DDD; background: #DDD;
......
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