Commit 3d389c09 by Brittany Cheng

new post control button and link styles

parent b3474fbf
...@@ -35,8 +35,10 @@ Discussion = ...@@ -35,8 +35,10 @@ Discussion =
<input type="text" class="new-post-title title-input" placeholder="Title"/> <input type="text" class="new-post-title title-input" placeholder="Title"/>
<div class="new-post-body body-input"></div> <div class="new-post-body body-input"></div>
<input class="new-post-tags" placeholder="Tags"/> <input class="new-post-tags" placeholder="Tags"/>
<a class="discussion-submit-post control-button" href="javascript:void(0)">Submit</a> <div class = "new-post-control">
<a class="discussion-cancel-post control-button" href="javascript:void(0)">Cancel</a> <a class="discussion-cancel-post" href="javascript:void(0)">Cancel</a>
<a class="discussion-submit-post control-button" href="javascript:void(0)">Submit</a>
</div>
</form> </form>
""" """
...@@ -452,7 +454,7 @@ Discussion = ...@@ -452,7 +454,7 @@ Discussion =
interactive: true interactive: true
defaultText: "Tag your post: press enter after each tag" defaultText: "Tag your post: press enter after each tag"
height: "30px" height: "30px"
width: "85%" width: "90%"
removeWithBackspace: true removeWithBackspace: true
$local(".discussion-submit-post").click -> $local(".discussion-submit-post").click ->
handleSubmitNewPost(this) handleSubmitNewPost(this)
......
...@@ -50,7 +50,16 @@ $discussion_input_width: 90%; ...@@ -50,7 +50,16 @@ $discussion_input_width: 90%;
margin-top: flex-gutter(); margin-top: flex-gutter();
} }
} }
.control-button {
@include button;
@include discussion-font;
color: white;
font-weight: bold;
padding-top: 9px;
font-size: inherit;
width: inherit;
text-decoration: none;
}
.discussion-title { .discussion-title {
@include discussion-font; @include discussion-font;
@include discussion-clickable; @include discussion-clickable;
...@@ -106,7 +115,7 @@ $discussion_input_width: 90%; ...@@ -106,7 +115,7 @@ $discussion_input_width: 90%;
float: left; float: left;
width: 85%; width: 85%;
} }
.new-post-form, .discussion-thread-edit { .new-post-form, .discussion-thread-edit{
.title-input, .body-input { .title-input, .body-input {
@include discussion-font; @include discussion-font;
display: block !important; display: block !important;
...@@ -138,24 +147,24 @@ $discussion_input_width: 90%; ...@@ -138,24 +147,24 @@ $discussion_input_width: 90%;
vertical-align: top; vertical-align: top;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
}
.discussion-content-edit, .discussion-reply-new, .new-post-form {
.new-post-control {
margin-left: 70.5%;
margin-top: 1%;
}
.control-button { .control-button {
@include button; @include button;
@include discussion-font; @include discussion-font;
color: white; color: white;
margin-top: 10px;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
margin-left: 3%;
display: inline-block; display: inline-block;
margin-left: 76%;
padding-top: 9px; padding-top: 9px;
font-size: inherit; font-size: inherit;
width: inherit; width: inherit;
} }
}
.discussion-content-edit, .discussion-reply-new, .new-post-form {
.control-button {
display: inline-block;
}
margin: 10px 0 10px 0; margin: 10px 0 10px 0;
} }
.thread { .thread {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<a class="discussion-title" href="javascript:void(0)">Discussion</a> <a class="discussion-title" href="javascript:void(0)">Discussion</a>
</div> </div>
${search_bar} ${search_bar}
<a class="discussion-new-post control-button" href="javascript:void(0)">New Post</a> <div class="discussion-new-post control-button" href="javascript:void(0)">New Post</div>
</div> </div>
% for thread in threads: % for thread in threads:
${renderer.render_thread(course_id, thread, edit_thread=False, show_comments=False)} ${renderer.render_thread(course_id, thread, edit_thread=False, show_comments=False)}
......
...@@ -7,7 +7,7 @@ def url_for_search(): ...@@ -7,7 +7,7 @@ def url_for_search():
<form action="${url_for_search()}" method="get" class="discussion-search-form"> <form action="${url_for_search()}" method="get" class="discussion-search-form">
<input class="search-input" type="text" value="${text}" id="keywords" autocomplete="off"/> <input class="search-input" type="text" value="${text}" id="keywords" autocomplete="off"/>
<a class="discussion-link" href="javascript:void(0)">Search posts</a> <div class="discussion-link" href="javascript:void(0)">Search posts</div>
<div class="search-within"> <div class="search-within">
<input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/> <input type="checkbox" id="discussion-search-within-board-${discussion_id}" class="discussion-search-within-board" checked/>
<label for="discussion-search-within-board-${discussion_id}">Search within board</label> <label for="discussion-search-within-board-${discussion_id}">Search within board</label>
......
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