Skip to content

E
edx-platform
Commit 0decade2 by Jose Antonio Gonzlez
Options

Merge remote-tracking branch 'upstream/master' into… 

Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]
parents 93464298 ea488f84
Showing with 42 additions and 43 deletions
common/static/common/templates/discussion/thread-type.underscore
<div class="post-field"> <div class="post-field">
<label class="field-label"> <fieldset>
<legend class="field-label">
<span class="field-label-text"> <span class="field-label-text">
<% // Translators: This is the label for a control to select a forum post type %> <% // Translators: This is the label for a control to select a forum post type %>
<%- gettext("Post type") %> <%- gettext("Post type") %>
</span> </span>
<div class="field-help" id="field_help_post_type"> </legend>
<%- gettext("Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)") %> <div class="field-help" id="field_help_post_type">
</div> <%- gettext("Questions raise issues that need answers. Discussions share ideas and start conversations. (Required)") %>
<div class="field-label"> </div>
<fieldset class="field-input"> <div class="field-label">
<legend class="sr"><%- gettext("Post type") %></legend> <label for="<%= form_id %>-post-type-question" class="post-type-label">
<label for="<%= form_id %>-post-type-question" class="post-type-label"> <input aria-describedby="field_help_post_type" type="radio" name="<%= form_id %>-post-type" class="field-input input-radio" id="<%= form_id %>-post-type-question" value="question">
<input aria-describedby="field_help_post_type" type="radio" name="<%= form_id %>-post-type" class="field-input input-radio" id="<%= form_id %>-post-type-question" value="question"> <span class="field-input-label">
<span class="field-input-label"> <span class="icon fa fa-question" aria-hidden="true"></span>
<span class="icon fa fa-question" aria-hidden="true"></span> <% // Translators: This is a forum post type %>
<% // Translators: This is a forum post type %> <%- gettext("Question") %>
<%- gettext("Question") %> </span>
</span> </label>
</label> <label for="<%= form_id %>-post-type-discussion" class="post-type-label">
<label for="<%= form_id %>-post-type-discussion" class="post-type-label"> <input aria-describedby="field_help_post_type" type="radio" name="<%= form_id %>-post-type" class="field-input input-radio" id="<%= form_id %>-post-type-discussion" value="discussion" checked>
<input aria-describedby="field_help_post_type" type="radio" name="<%= form_id %>-post-type" class="field-input input-radio" id="<%= form_id %>-post-type-discussion" value="discussion" checked> <span class="field-input-label">
<span class="field-input-label"> <span class="icon fa fa-comments" aria-hidden="true"></span>
<span class="icon fa fa-comments" aria-hidden="true"></span> <% // Translators: This is a forum post type %>
<% // Translators: This is a forum post type %> <%- gettext("Discussion") %>
<%- gettext("Discussion") %> </span>
</span> </label>
</label> </div>
</fieldset> </fieldset>
</div>
</label>
</div>
common/static/common/templates/discussion/topic.underscore
<label class="field-label"> <div class="field-label">
<span class="field-label-text"> <label for="topic" class="field-label-text">
<%- gettext("Topic area") %> <%- gettext("Topic area") %>
</span> </label>
<div class="field-help" id="field_help_topic_area"> <div class="field-help" id="field_help_topic_area">
<%- gettext("Add your post to a relevant topic to help others find it. (Required)") %> <%- gettext("Add your post to a relevant topic to help others find it. (Required)") %>
</div> </div>
<div class="field-input"> </div>
<select class="post-topic field-input" aria-describedby="field_help_topic_area wrapper-visibility-message" required> <div class="field-input">
<%= edx.HtmlUtils.ensureHtml(topics_html) %> <select id="topic" class="post-topic field-input" aria-describedby="field_help_topic_area wrapper-visibility-message" required>
</select> <%= edx.HtmlUtils.ensureHtml(topics_html) %>
</div> </select>
</label> </div>
lms/static/sass/_header.scss
...@@ -102,12 +102,12 @@ ...@@ -102,12 +102,12 @@
font-weight: $font-weight-normal; font-weight: $font-weight-normal;
display: inline-block; display: inline-block;
margin-bottom: -1*$baseline/2; margin-bottom: -1*$baseline/2;
border-bottom: 4px solid transparent; border-bottom: 4px hidden theme-color("dark");
cursor: pointer; cursor: pointer;
&.active, &.active,
&:hover { &:hover {
border-bottom-color: theme-color("dark"); border-bottom-style: solid;
} }
&:hover { &:hover {
......
lms/static/sass/course/layout/_courseware_header.scss
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
display: block; display: block;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
border-bottom: 4px solid transparent; border-bottom: 4px hidden theme-color("primary");
&:hover, &:hover,
&:focus, &:focus,
&.active { &.active {
color: theme-color("primary"); color: theme-color("primary");
border-bottom-color: theme-color("primary"); border-bottom-style: solid;
background-color: transparent; background-color: transparent;
} }
} }
......
lms/static/sass/discussion/views/_create-edit-post.scss
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
} }
.field-label-text { .field-label-text {
margin: $baseline 0 0 0;
display: block; display: block;
} }
...@@ -67,7 +66,7 @@ ...@@ -67,7 +66,7 @@
line-height: 1.5; line-height: 1.5;
&#field_help_post_type { &#field_help_post_type {
@include margin($baseline / 2, 0, $baseline * 0.75, 0); @include margin($baseline / 4, 0, $baseline * 0.75, 0);
} }
&#new-post-editor-description { &#new-post-editor-description {
......
openedx/features/course_bookmarks/static/course_bookmarks/js/views/bookmark_button.js
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
}, },
complete: function() { complete: function() {
view.$el.prop('disabled', false); view.$el.prop('disabled', false);
view.$el.focus();
} }
}); });
}, },
...@@ -78,6 +79,7 @@ ...@@ -78,6 +79,7 @@
}, },
complete: function() { complete: function() {
view.$el.prop('disabled', false); view.$el.prop('disabled', false);
view.$el.focus();
} }
}); });
}, },
...@@ -105,7 +107,7 @@ ...@@ -105,7 +107,7 @@
} }
this.messageView.showMessage(errorMsg); this.messageView.showMessage(errorMsg);
// Hide message automatically after some interval // Hide message automatically after some interval
setTimeout(_.bind(function() { setTimeout(_.bind(function() {
this.messageView.hideMessage(); this.messageView.hideMessage();
}, this), this.showBannerInterval); }, this), this.showBannerInterval);
......
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