Commit 29d75057 by Brittany Cheng

fix font inheritance, update post control styles

parent 84fcb5ef
......@@ -64,8 +64,10 @@ Discussion =
<input type="text" class="thread-title-edit title-input" placeholder="Title" value="{{title}}"/>
<div class="thread-body-edit body-input">{{body}}</div>
<input class="thread-tags-edit" placeholder="Tags" value="{{tags}}" />
<a class="discussion-submit-update control-button" href="javascript:void(0)">Update</a>
<a class="discussion-cancel-update control-button" href="javascript:void(0)">Cancel</a>
<div class = "edit-post-control">
<a class="discussion-cancel-update" href="javascript:void(0)">Cancel</a>
<a class="discussion-submit-update control-button" href="javascript:void(0)">Update</a>
</div>
</form>
"""
......@@ -323,8 +325,9 @@ Discussion =
autocomplete:
remoteDataType: 'json'
interactive: true
defaultText: ""
defaultText: "Tag your post: press enter after each tag"
height: "30px"
width: "90%"
removeWithBackspace: true
$local(".discussion-submit-update").unbind("click").click -> handleSubmitEditThread(this)
$local(".discussion-cancel-update").unbind("click").click -> handleCancelEdit(this)
......
......@@ -42,6 +42,8 @@ $discussion_input_width: 90%;
@include discussion-font;
}
.search-input {
font: inherit;
font-style: normal;
float: left;
width: 72%;
}
......@@ -49,6 +51,10 @@ $discussion_input_width: 90%;
display: block;
margin-top: flex-gutter();
}
.discussion-search-within-board {
font-style: normal;
font: inherit;
}
}
.control-button {
@include button;
......@@ -117,7 +123,8 @@ $discussion_input_width: 90%;
}
.new-post-form, .discussion-thread-edit{
.title-input, .body-input {
@include discussion-font;
font-style: normal;
font: inherit;
display: block !important;
width: $discussion_input_width !important;
}
......@@ -149,7 +156,7 @@ $discussion_input_width: 90%;
}
}
.discussion-content-edit, .discussion-reply-new, .new-post-form {
.new-post-control {
.new-post-control, .edit-post-control {
margin-left: 70.5%;
margin-top: 1%;
}
......@@ -288,12 +295,12 @@ $discussion_input_width: 90%;
width: 100%;
background-color: Gainsboro;
border: 1px solid DarkGray;
font-style: normal;
font: inherit;
}
.wmd-preview
{
background-color: #c0e0ff;
background-color: #c0e0ff;
}
.wmd-button-row
......
......@@ -10,6 +10,6 @@ def url_for_search():
<div class="discussion-link" href="javascript:void(0)">Search posts</div>
<div class="search-within">
<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}" class="discussion-search-within-board">Search within board</label>
</div>
</form>
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