Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'discussion2' of github.com:dementrock/mitx

Browse Source
This commit is contained in:
Rocky Duan
2012-08-02 15:02:20 -04:00
parent fd1e91aef2 10c1366510
commit 7b66cae380
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/static/coffee/src/discussion.coffee
View File

@@ -51,8 +51,10 @@ Discussion =
<label for="discussion-auto-watch-{{id}}">follow this thread</label>
{{/showWatchCheckbox}}
<br />
<a class="discussion-submit-reply control-button" href="javascript:void(0)">Submit</a>
<a class="discussion-cancel-reply control-button" href="javascript:void(0)">Cancel</a>
<div class = "reply-post-control">
<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>
"""

6
lms/static/sass/_discussion.scss
View File

@@ -148,7 +148,7 @@ $discussion_input_width: 100%;
.discussion-right-wrapper {
min-height: 40px;
float: left;
width: 85%;
width: 90%;
}
.new-post-form, .discussion-thread-edit {
.title-input, .body-input {
@@ -193,6 +193,9 @@ $discussion_input_width: 100%;
margin-left: 80%;
margin-top: 1%;
}
.reply-post-control {
margin-left: 79%;
}
.control-button {
@include button;
@include discussion-font;
@@ -274,6 +277,7 @@ $discussion_input_width: 100%;
border-top: lightgray 1px solid;
padding: 2% 0;
.discussion-reply-new {
@include discussion-font;
margin-left: $comment_margin_left;
.reply-body {
@include discussion-font;