Commit c263484b by Brittany Cheng

reorganize css

parent ddebcc46
...@@ -20,33 +20,67 @@ $discussion_input_width: 100%; ...@@ -20,33 +20,67 @@ $discussion_input_width: 100%;
.discussion-non-content { .discussion-non-content {
margin-left: flex-gutter(); margin-left: flex-gutter();
} }
//TITLE
.discussion-title {
@include discussion-font;
@include discussion-clickable;
font-size: $discussion_title_size;
font-weight: bold;
margin-bottom: flex-gutter(6);
display: inline-block;
}
.discussion-title-wrapper {
.discussion-watch-discussion, .discussion-unwatch-discussion {
display: none;
@include discussion-font;
margin-left: 5px;
font-size: $comment_info_size;
}
}
//SORTING
.discussion-sort {
font-size: $comment_body_size;
float: right;
margin-top: -2.5%;
.discussion-sort-link {
&:hover {
text-decoration: none;
color: #1C71DD;
}
}
.discussion-sort-link.sorted {
font-weight: bold;
color: #1C71DD;
}
}
//SEARCH
.search-wrapper-inline { .search-wrapper-inline {
width: 80%;
display: inline-block; display: inline-block;
margin-top: 3%;
margin-bottom: 6%; margin-bottom: 6%;
margin-top: 3%;
width: 80%;
} }
.discussion-search-form { .discussion-search-form {
margin-bottom: 1%;
display: inline-block; display: inline-block;
margin-bottom: 1%;
width: flex-grid(12); width: flex-grid(12);
.discussion-link { .discussion-link {
@include button; @include button;
display: inline-block;
margin-left: 1%;
color: white; color: white;
display: inline-block;
font-size: inherit;
font-weight: bold; font-weight: bold;
text-decoration: none; margin-left: 1%;
padding-top: 9px; padding-top: 9px;
font-size: inherit; text-decoration: none;
} }
.discussion-search-text { .discussion-search-text {
@include discussion-font; @include discussion-font;
} }
.search-input { .search-input {
float: left;
font: inherit; font: inherit;
font-style: normal; font-style: normal;
float: left;
width: 72%; width: 72%;
} }
} }
...@@ -59,6 +93,7 @@ $discussion_input_width: 100%; ...@@ -59,6 +93,7 @@ $discussion_input_width: 100%;
font: inherit; font: inherit;
font-size: $comment_body_size; font-size: $comment_body_size;
} }
//BASIC BUTTON STYLES
.control-button { .control-button {
@include button; @include button;
@include discussion-font; @include discussion-font;
...@@ -96,22 +131,7 @@ $discussion_input_width: 100%; ...@@ -96,22 +131,7 @@ $discussion_input_width: 100%;
border: 1px solid #555; border: 1px solid #555;
} }
} }
.discussion-title { //FOLLOW BUTTON
@include discussion-font;
@include discussion-clickable;
font-size: $discussion_title_size;
font-weight: bold;
margin-bottom: flex-gutter(6);
display: inline-block;
}
.discussion-title-wrapper {
.discussion-watch-discussion, .discussion-unwatch-discussion {
display: none;
@include discussion-font;
margin-left: 5px;
font-size: $comment_info_size;
}
}
.follow-wrapper { .follow-wrapper {
float: right; float: right;
.discussion-link { .discussion-link {
...@@ -138,6 +158,7 @@ $discussion_input_width: 100%; ...@@ -138,6 +158,7 @@ $discussion_input_width: 100%;
} }
} }
} }
//VOTES
.discussion-votes { .discussion-votes {
text-align: center; text-align: center;
height: flex-grid(3); height: flex-grid(3);
...@@ -167,6 +188,7 @@ $discussion_input_width: 100%; ...@@ -167,6 +188,7 @@ $discussion_input_width: 100%;
} }
} }
} }
//CONTAINERS FOR NEW AND EDITED POSTS
.discussion-right-wrapper { .discussion-right-wrapper {
min-height: 40px; min-height: 40px;
float: left; float: left;
...@@ -206,21 +228,6 @@ $discussion_input_width: 100%; ...@@ -206,21 +228,6 @@ $discussion_input_width: 100%;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
} }
.discussion-sort {
font-size: $comment_body_size;
float: right;
margin-top: -2.5%;
.discussion-sort-link {
&:hover {
text-decoration: none;
color: #1C71DD;
}
}
.discussion-sort-link.sorted {
font-weight: bold;
color: #1C71DD;
}
}
.discussion-content-edit, .discussion-reply-new, .new-post-form { .discussion-content-edit, .discussion-reply-new, .new-post-form {
.new-post-control { .new-post-control {
margin-left: 80%; margin-left: 80%;
...@@ -255,6 +262,7 @@ $discussion_input_width: 100%; ...@@ -255,6 +262,7 @@ $discussion_input_width: 100%;
margin-left: 2%; margin-left: 2%;
} }
} }
//THREAD STYLES
.thread { .thread {
//display: none; //display: none;
.thread-title { .thread-title {
...@@ -326,6 +334,7 @@ $discussion_input_width: 100%; ...@@ -326,6 +334,7 @@ $discussion_input_width: 100%;
} }
} }
} }
//COMMENT STYLES
.comments { .comments {
//display: none; //display: none;
margin-left: $comment_margin_left; margin-left: $comment_margin_left;
...@@ -347,6 +356,7 @@ $discussion_input_width: 100%; ...@@ -347,6 +356,7 @@ $discussion_input_width: 100%;
} }
} }
} }
//PAGES
.discussion-paginator { .discussion-paginator {
margin-top: 20px; margin-top: 20px;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -375,7 +385,7 @@ $discussion_input_width: 100%; ...@@ -375,7 +385,7 @@ $discussion_input_width: 100%;
} }
} }
//editor styles //EDITOR STYLES
.wmd-panel .wmd-panel
{ {
......
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