Commit 39dc6a63 by Brittany Cheng

cleanup css

parent ed8595ad
...@@ -25,10 +25,13 @@ form label { ...@@ -25,10 +25,13 @@ form label {
} }
.discussion { .discussion {
.discussion-non-content { .discussion-non-content {
margin-left: flex-gutter(); margin-left: flex-gutter();
} }
//TITLE //TITLE
.discussion-title { .discussion-title {
@include discussion-font; @include discussion-font;
@include discussion-clickable; @include discussion-clickable;
...@@ -37,6 +40,7 @@ form label { ...@@ -37,6 +40,7 @@ form label {
font-weight: bold; font-weight: bold;
margin-bottom: flex-gutter(6); margin-bottom: flex-gutter(6);
} }
.discussion-title-wrapper { .discussion-title-wrapper {
.discussion-watch-discussion, .discussion-unwatch-discussion { .discussion-watch-discussion, .discussion-unwatch-discussion {
@include discussion-font; @include discussion-font;
...@@ -45,36 +49,46 @@ form label { ...@@ -45,36 +49,46 @@ form label {
margin-left: 5px; margin-left: 5px;
} }
} }
.blank { .blank {
margin: 2%; margin: 2%;
} }
//SORTING //SORTING
.discussion-sort { .discussion-sort {
float: right; float: right;
font-size: $comment_body_size; font-size: $comment_body_size;
margin-top: -2.5%; margin-top: -2.5%;
.discussion-sort-link { .discussion-sort-link {
&:hover { &:hover {
color: #1C71DD; color: #1C71DD;
text-decoration: none; text-decoration: none;
} }
} }
.discussion-sort-link.sorted { .discussion-sort-link.sorted {
color: #1C71DD; color: #1C71DD;
font-weight: bold; font-weight: bold;
} }
} }
//SEARCH //SEARCH
.search-wrapper-inline { .search-wrapper-inline {
display: inline-block; display: inline-block;
margin-bottom: 6%; margin-bottom: 6%;
margin-top: 3%; margin-top: 3%;
width: 80%; width: 80%;
} }
.discussion-search-form { .discussion-search-form {
display: inline-block; display: inline-block;
margin-bottom: 1%; margin-bottom: 1%;
width: flex-grid(12); width: flex-grid(12);
.discussion-link { .discussion-link {
@include button; @include button;
color: white; color: white;
...@@ -85,9 +99,11 @@ form label { ...@@ -85,9 +99,11 @@ form label {
padding-top: 9px; padding-top: 9px;
text-decoration: none; text-decoration: none;
} }
.discussion-search-text { .discussion-search-text {
@include discussion-font; @include discussion-font;
} }
.search-input { .search-input {
float: left; float: left;
font: inherit; font: inherit;
...@@ -95,16 +111,20 @@ form label { ...@@ -95,16 +111,20 @@ form label {
width: 72%; width: 72%;
} }
} }
.search-within { .search-within {
display: block; display: block;
margin-bottom: 3%; margin-bottom: 3%;
} }
.discussion-search-within-board { .discussion-search-within-board {
font: inherit; font: inherit;
font-size: $comment_body_size; font-size: $comment_body_size;
font-style: normal; font-style: normal;
} }
//BASIC BUTTON STYLES //BASIC BUTTON STYLES
.control-button { .control-button {
@include button; @include button;
@include discussion-font; @include discussion-font;
...@@ -128,6 +148,7 @@ form label { ...@@ -128,6 +148,7 @@ form label {
width: inherit; width: inherit;
text-decoration: none; text-decoration: none;
text-shadow: none; text-shadow: none;
&:hover { &:hover {
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));
...@@ -142,9 +163,12 @@ form label { ...@@ -142,9 +163,12 @@ form label {
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 {
@include button; @include button;
background-color: #BEBEBE; background-color: #BEBEBE;
...@@ -158,6 +182,7 @@ form label { ...@@ -158,6 +182,7 @@ form label {
padding: 5px 8px; padding: 5px 8px;
text-decoration: none; text-decoration: none;
text-shadow: none; text-shadow: none;
&:hover { &:hover {
background-color: #AAA; background-color: #AAA;
background-image: none; background-image: none;
...@@ -168,49 +193,62 @@ form label { ...@@ -168,49 +193,62 @@ form label {
} }
} }
} }
//VOTES //VOTES
.discussion-votes { .discussion-votes {
float: left; float: left;
height: flex-grid(3); height: flex-grid(3);
margin: 1% 2%; margin: 1% 2%;
text-align: center; text-align: center;
.discussion-vote-count { .discussion-vote-count {
@include discussion-font; @include discussion-font;
font-size: $comment_body_size; font-size: $comment_body_size;
} }
a.discussion-vote { a.discussion-vote {
color: black; color: black;
display: block; display: block;
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
&:hover { &:hover {
color: #1C71DD; color: #1C71DD;
text-decoration: none; text-decoration: none;
} }
&.discussion-vote-up { &.discussion-vote-up {
margin-bottom: 3px; margin-bottom: 3px;
} }
&.discussion-vote-down { &.discussion-vote-down {
margin-top: 5px; margin-top: 5px;
} }
&.voted { &.voted {
color: #1C71DD; color: #1C71DD;
} }
} }
} }
//CREATE NEW AND EDIT POSTS //CREATE NEW AND EDIT POSTS
.discussion-right-wrapper { .discussion-right-wrapper {
float: left; float: left;
min-height: 40px; 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 {
display: block !important; display: block !important;
font: inherit; font: inherit;
font-style: normal; font-style: normal;
width: $discussion_input_width !important; width: $discussion_input_width !important;
} }
.new-post-similar-posts-wrapper { .new-post-similar-posts-wrapper {
@include border-radius(3px); @include border-radius(3px);
border: 1px solid #EEE; border: 1px solid #EEE;
...@@ -219,9 +257,11 @@ form label { ...@@ -219,9 +257,11 @@ form label {
margin-top: 1%; margin-top: 1%;
padding: 1% 1.5%; padding: 1% 1.5%;
} }
.hide-similar-posts { .hide-similar-posts {
float: right; float: right;
} }
.new-post-similar-posts { .new-post-similar-posts {
font: inherit; font: inherit;
.similar-post { .similar-post {
...@@ -229,9 +269,11 @@ form label { ...@@ -229,9 +269,11 @@ form label {
line-height: 150%; line-height: 150%;
} }
} }
.new-post-body { .new-post-body {
margin-top: flex-gutter(); margin-top: flex-gutter();
} }
.tagsinput { .tagsinput {
background: #FAFAFA; background: #FAFAFA;
border: 1px solid #C8C8C8; border: 1px solid #C8C8C8;
...@@ -251,8 +293,10 @@ form label { ...@@ -251,8 +293,10 @@ form label {
-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; margin: 10px 0 10px 0;
.discussion-errors { .discussion-errors {
color: #8F0E0E; color: #8F0E0E;
display: block; display: block;
...@@ -262,21 +306,26 @@ form label { ...@@ -262,21 +306,26 @@ form label {
margin-left: -3%; margin-left: -3%;
padding-left: 2em; padding-left: 2em;
} }
a:hover { a:hover {
color: #1C71DD; color: #1C71DD;
text-decoration: none; text-decoration: none;
}; };
.new-post-control { .new-post-control {
margin-left: 80%; margin-left: 80%;
margin-top: 1%; margin-top: 1%;
} }
.reply-post-control { .reply-post-control {
margin-left: 73%; margin-left: 73%;
} }
.edit-post-control { .edit-post-control {
margin-left: 79%; margin-left: 79%;
margin-top: 1%; margin-top: 1%;
} }
.control-button { .control-button {
@include button; @include button;
@include discussion-font; @include discussion-font;
...@@ -288,27 +337,35 @@ form label { ...@@ -288,27 +337,35 @@ form label {
padding-top: 9px; padding-top: 9px;
text-decoration: none; text-decoration: none;
width: inherit; width: inherit;
&:hover { &:hover {
color: white; color: white;
} }
} }
} }
.new-post-form { .new-post-form {
margin: 10px 0 40px 0; margin: 10px 0 40px 0;
} }
.discussion-reply-new { .discussion-reply-new {
.discussion-auto-watch { .discussion-auto-watch {
margin-left: 2%; margin-left: 2%;
} }
} }
//THREAD STYLES //THREAD STYLES
.thread { .thread {
//display: none; //display: none;
.search-highlight { .search-highlight {
display: inline; display: inline;
font-weight: bold; font-weight: bold;
background-color: lightyellow; background-color: lightyellow;
} }
.thread-title { .thread-title {
@include discussion-font; @include discussion-font;
@include discussion-clickable; @include discussion-clickable;
...@@ -316,19 +373,23 @@ form label { ...@@ -316,19 +373,23 @@ form label {
font-size: $comment_title_size; font-size: $comment_title_size;
font-weight: bold; font-weight: bold;
} }
.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-bottom: 4px; margin-bottom: 4px;
margin-top: 3px; margin-top: 3px;
min-height: 35px; min-height: 35px;
p { p {
@include discussion-font; @include discussion-font;
margin: 0; margin: 0;
} }
} }
.thread-tags { .thread-tags {
display: inline-block; display: inline-block;
.thread-tag { .thread-tag {
@include discussion-font; @include discussion-font;
background: #CDE69C; background: #CDE69C;
...@@ -341,53 +402,65 @@ form label { ...@@ -341,53 +402,65 @@ form label {
margin: 5px 7px 5px 0; margin: 5px 7px 5px 0;
padding: 5px 7px; padding: 5px 7px;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
border-color: #1E4612; border-color: #1E4612;
color: #1E4612; color: #1E4612;
} }
} }
} }
.info { .info {
@include discussion-font; @include discussion-font;
color: gray; color: gray;
font-size: $comment_info_size; font-size: $comment_info_size;
font-style: italic; font-style: italic;
margin-top: 2%; margin-top: 2%;
a { a {
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: #1C71DD; color: #1C71DD;
} }
} }
.comment-time { .comment-time {
display: inline; display: inline;
float: right; float: right;
margin-right: -4%; margin-right: -4%;
} }
.comment-count { .comment-count {
display: inline; display: inline;
} }
.discussion-reply { .discussion-reply {
margin-left: 4px; margin-left: 4px;
} }
.discussion-link { .discussion-link {
@include discussion-font; @include discussion-font;
color: #1d9dd9; color: #1d9dd9;
display: inline; display: inline;
margin-left: 2px; margin-left: 2px;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
color: #1C71DD; color: #1C71DD;
} }
} }
} }
.discussion-content { .discussion-content {
border-top: lightgray 1px solid; border-top: lightgray 1px solid;
overflow: hidden; overflow: hidden;
padding: 1.5% 0; padding: 1.5% 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;
display: block; display: block;
...@@ -397,12 +470,16 @@ form label { ...@@ -397,12 +470,16 @@ form label {
} }
} }
} }
//COMMENT STYLES //COMMENT STYLES
.comments { .comments {
//display: none; //display: none;
margin-left: $comment_margin_left; margin-left: $comment_margin_left;
overflow: hidden; overflow: hidden;
.comment { .comment {
.comment-body, .content-body { .comment-body, .content-body {
@include discussion-font; @include discussion-font;
color: black; color: black;
...@@ -410,7 +487,9 @@ form label { ...@@ -410,7 +487,9 @@ form label {
font-size: $comment_body_size; font-size: $comment_body_size;
margin-top: 3px; margin-top: 3px;
} }
&.endorsed { &.endorsed {
> .discussion-content { > .discussion-content {
background-color: lightyellow; background-color: lightyellow;
} }
...@@ -418,16 +497,20 @@ form label { ...@@ -418,16 +497,20 @@ form label {
} }
} }
} }
//PAGES //PAGES
.discussion-paginator { .discussion-paginator {
font-size: $comment_body_size; font-size: $comment_body_size;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 20px; 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; background: #EEE;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
...@@ -439,6 +522,7 @@ form label { ...@@ -439,6 +522,7 @@ form label {
font-weight: normal; font-weight: normal;
padding: 4px 10px; 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