From 571ebb1fcdb24daa19f886db2c4d126206e682d2 Mon Sep 17 00:00:00 2001 From: Frances Botsford Date: Thu, 16 May 2013 10:29:33 -0400 Subject: [PATCH] removed symbolset, replaced with fontawesome for view live, expand collape, zoom buttons --- cms/static/js/base.js | 4 ++-- cms/static/sass/_base.scss | 10 +++++----- cms/static/sass/views/_index.scss | 4 ++-- cms/static/sass/views/_outline.scss | 2 +- cms/templates/edit-tabs.html | 2 +- cms/templates/howitworks.html | 16 ++++++++-------- cms/templates/index.html | 2 +- cms/templates/overview.html | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cms/static/js/base.js b/cms/static/js/base.js index c8371fcf64..352988080b 100644 --- a/cms/static/js/base.js +++ b/cms/static/js/base.js @@ -209,8 +209,8 @@ function toggleSections(e) { $section = $('.courseware-section'); sectionCount = $section.length; $button = $(this); - $labelCollapsed = $('up Collapse All Sections'); - $labelExpanded = $('down Expand All Sections'); + $labelCollapsed = $(' Collapse All Sections'); + $labelExpanded = $(' Expand All Sections'); var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded; $button.toggleClass('is-activated').html(buttonLabel); diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 6d466f06a4..96a78d2807 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -767,12 +767,12 @@ hr.divide { display: block; } - .icon-view { - @include font-size(15); + .icon-eye-open { + @include font-size(16); display: inline-block; vertical-align: middle; - margin-right: ($baseline/2); - margin-top: ($baseline/5); + margin-right: 8px; + margin-top: -3px; line-height: 0; } } @@ -887,7 +887,7 @@ body.js { @extend .text-sr; } - .ss-icon { + [class^="icon-"] { @include font-size(18); color: $white; } diff --git a/cms/static/sass/views/_index.scss b/cms/static/sass/views/_index.scss index 9049a13693..b8aaa773ef 100644 --- a/cms/static/sass/views/_index.scss +++ b/cms/static/sass/views/_index.scss @@ -164,11 +164,11 @@ body.index { right: ($baseline/2); opacity: 0; - .ss-icon { + [class^="icon-"] { @include font-size(18); @include border-top-radius(3px); display: inline-block; - padding: ($baseline/4) ($baseline/2); + padding: ($baseline/2); background: $blue; color: $white; text-align: center; diff --git a/cms/static/sass/views/_outline.scss b/cms/static/sass/views/_outline.scss index 02b9d09db4..4d41d3e437 100644 --- a/cms/static/sass/views/_outline.scss +++ b/cms/static/sass/views/_outline.scss @@ -533,7 +533,7 @@ body.course.outline { display: block; } - .ss-icon { + [class^="icon-"] { @include font-size(11); @include border-radius(20px); position: relative; diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 292d94a7c9..77eb1cb9b8 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -76,7 +76,7 @@ - ␡ + close modal diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index 6c0029c425..b5acc66339 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -28,7 +28,7 @@ Studio Helps You Keep Your Courses Organized
Studio Helps You Keep Your Courses Organized
- + @@ -62,7 +62,7 @@ Learning is More than Just Lectures
Learning is More than Just Lectures
- + @@ -96,7 +96,7 @@ Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.
- + @@ -132,7 +132,7 @@

Sign Up for Studio Today!

- + diff --git a/cms/templates/overview.html b/cms/templates/overview.html index fc5606344a..082ec401bd 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -115,13 +115,13 @@

Page Actions