From 4e79d064a0beb2516279754522bd1784747188b0 Mon Sep 17 00:00:00 2001 From: Frances Botsford Date: Thu, 16 May 2013 13:22:49 -0400 Subject: [PATCH] removed symbolset, replaced with fontawesome for alerts, notifications, and all references in js files --- cms/static/js/views/settings/main_settings_view.js | 2 +- cms/static/sass/elements/_footer.scss | 4 ++-- cms/static/sass/elements/_icons.scss | 6 +++--- cms/static/sass/views/_account.scss | 4 ++-- cms/templates/js/system-feedback.underscore | 6 +++--- cms/templates/settings_advanced.html | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cms/static/js/views/settings/main_settings_view.js b/cms/static/js/views/settings/main_settings_view.js index 982f232495..2f6239cb59 100644 --- a/cms/static/js/views/settings/main_settings_view.js +++ b/cms/static/js/views/settings/main_settings_view.js @@ -16,7 +16,7 @@ CMS.Views.Settings.Details = CMS.Views.ValidatingView.extend({ }, initialize : function() { - this.fileAnchorTemplate = _.template(' 📄<%= filename %>'); + this.fileAnchorTemplate = _.template(' <%= filename %>'); // fill in fields this.$el.find("#course-name").val(this.model.get('location').get('name')); this.$el.find("#course-organization").val(this.model.get('location').get('org')); diff --git a/cms/static/sass/elements/_footer.scss b/cms/static/sass/elements/_footer.scss index 24cf415ea1..a357b2f6ca 100644 --- a/cms/static/sass/elements/_footer.scss +++ b/cms/static/sass/elements/_footer.scss @@ -48,7 +48,7 @@ padding: ($baseline/2) ($baseline*0.75); background: transparent; - .ss-icon { + [class^="icon-"] { @include transition(top .25s ease-in-out .25s); @include font-size(15); display: inline-block; @@ -60,7 +60,7 @@ &:hover, &:active { color: $gray-d2; - .ss-icon { + [class^="icon-"] { color: $gray-d2; } } diff --git a/cms/static/sass/elements/_icons.scss b/cms/static/sass/elements/_icons.scss index 2bc73d8b8d..a75c97ea76 100644 --- a/cms/static/sass/elements/_icons.scss +++ b/cms/static/sass/elements/_icons.scss @@ -5,12 +5,12 @@ } -.ss-icon { - +[class^="icon-"] { + } .icon-inline { display: inline-block; vertical-align: middle; margin-right: ($baseline/4); -} \ No newline at end of file +} diff --git a/cms/static/sass/views/_account.scss b/cms/static/sass/views/_account.scss index c23cd53093..f1fd2bbcc4 100644 --- a/cms/static/sass/views/_account.scss +++ b/cms/static/sass/views/_account.scss @@ -272,9 +272,9 @@ body.signup, body.signin { background: $yellow-d1; color: $white; - .ss-icon { + [class^="icon-"] { position: relative; - top: 3px; + top: 1px; @include font-size(16); display: inline-block; margin-right: ($baseline/2); diff --git a/cms/templates/js/system-feedback.underscore b/cms/templates/js/system-feedback.underscore index 09d59700c5..b8ef1b8dc8 100644 --- a/cms/templates/js/system-feedback.underscore +++ b/cms/templates/js/system-feedback.underscore @@ -9,8 +9,8 @@ >
<% if(obj.icon) { %> - <% var iconText = {"warning": "⚠", "confirmation": "✓", "error": "⚠", "announcement": "📢", "step-required": "", "help": "❓", "saving": "⚙"} %> - <%= iconText[intent] %> + <% var iconClass = {"warning": "warning-sign", "confirmation": "ok", "error": "warning-sign", "announcement": "bullhorn", "step-required": "exclamation-sign", "help": "question-sign", "saving": "cog"} %> + <% } %>
@@ -40,7 +40,7 @@ <% if(obj.closeIcon) { %> - ␡ + close <%= type %> <% } %> diff --git a/cms/templates/settings_advanced.html b/cms/templates/settings_advanced.html index 858dc9cbf0..0400d95694 100644 --- a/cms/templates/settings_advanced.html +++ b/cms/templates/settings_advanced.html @@ -110,7 +110,7 @@ editor.render();