Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix saving notification CSS. #379

Merged
merged 1 commit into from
Jul 12, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/djangoapps/contentstore/features/section.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def i_save_a_new_section_release_date(_step):

@step('I see a "saving" notification')
def i_see_a_saving_notification(step):
saving_css = '.wrapper-notification-saving'
saving_css = '.wrapper-notification-mini'
assert world.is_css_present(saving_css)


Expand Down
4 changes: 2 additions & 2 deletions cms/static/sass/elements/_system-feedback.scss
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
}
}

&.wrapper-notification-saving {
&.wrapper-notification-mini {
box-shadow: 0 -1px 3px $shadow, inset 0 3px 1px $pink;
}

Expand Down Expand Up @@ -434,7 +434,7 @@
}
}

&.saving {
&.mini {

[class^="icon"] {
@include animation(rotateCW $tmg-s3 linear infinite);
Expand Down
4 changes: 2 additions & 2 deletions cms/templates/js/system-feedback.underscore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="wrapper wrapper-<%= type %> wrapper-<%= type %>-<%= intent %>
<% if(obj.shown) { %>is-shown<% } else { %>is-hiding<% } %>
<% if(_.contains(['help', 'saving'], intent)) { %>wrapper-<%= type %>-status<% } %>"
<% if(_.contains(['help', 'mini'], intent)) { %>wrapper-<%= type %>-status<% } %>"
id="<%= type %>-<%= intent %>"
aria-hidden="<% if(obj.shown) { %>false<% } else { %>true<% } %>"
aria-labelledby="<%= type %>-<%= intent %>-title"
Expand All @@ -9,7 +9,7 @@
>
<div class="<%= type %> <%= intent %> <% if(obj.actions) { %>has-actions<% } %>">
<% if(obj.icon) { %>
<% var iconClass = {"warning": "warning-sign", "confirmation": "ok", "error": "warning-sign", "announcement": "bullhorn", "step-required": "exclamation-sign", "help": "question-sign", "saving": "cog"} %>
<% var iconClass = {"warning": "warning-sign", "confirmation": "ok", "error": "warning-sign", "announcement": "bullhorn", "step-required": "exclamation-sign", "help": "question-sign", "mini": "cog"} %>
<i class="icon-<%= iconClass[intent] %>"></i>
<% } %>

Expand Down