From d695de24dcf7b913e22127b1cecebc9618fe67c8 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Wed, 13 Aug 2014 10:30:36 -0400 Subject: [PATCH] Studio: addressing course re-run PR feedback --- cms/static/js/views/course_rerun.js | 4 ++-- cms/static/sass/views/_course-create.scss | 6 ++++++ cms/static/sass/views/_dashboard.scss | 14 +++++++++++--- cms/templates/index.html | 4 ++-- .../ux/reference/course-create-rerun.html | 2 +- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/cms/static/js/views/course_rerun.js b/cms/static/js/views/course_rerun.js index 962277e1aa..7361a8303a 100644 --- a/cms/static/js/views/course_rerun.js +++ b/cms/static/js/views/course_rerun.js @@ -52,7 +52,7 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"], ); // Go into creating re-run state $('.rerun-course-save').addClass('is-disabled').addClass('is-processing').html( - '' + gettext('Processing Re-run Request') + '' + gettext('Processing Re-run Request') ); $('.action-cancel').addClass('is-hidden'); }; @@ -176,4 +176,4 @@ require(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape"], } }); }); - }); \ No newline at end of file + }); diff --git a/cms/static/sass/views/_course-create.scss b/cms/static/sass/views/_course-create.scss index 7b0a500a5f..3b6ce18371 100644 --- a/cms/static/sass/views/_course-create.scss +++ b/cms/static/sass/views/_course-create.scss @@ -73,6 +73,12 @@ .rerun-course-save { @include blue-button; + + .icon { + display: inline-block; + vertical-align: middle; + margin-right: ($baseline/4); + } } .rerun-course-cancel { diff --git a/cms/static/sass/views/_dashboard.scss b/cms/static/sass/views/_dashboard.scss index 8ca15e4a36..3933a999d3 100644 --- a/cms/static/sass/views/_dashboard.scss +++ b/cms/static/sass/views/_dashboard.scss @@ -236,7 +236,7 @@ @extend %t-strong; margin: ($baseline/2); - [class^="icon-"] { + .icon { margin-right: ($baseline/4); } } @@ -295,6 +295,14 @@ .courses { margin: $baseline 0; + .title { + @extend %t-title6; + margin-bottom: $baseline; + border-bottom: 1px solid $gray-l3; + padding-bottom: ($baseline/2); + color: $gray-l2; + } + .title { @extend %t-title6; margin-bottom: $baseline; @@ -333,12 +341,12 @@ .value { - .copy, *[class^="icon"] { + .copy, .icon { display: inline-block; vertical-align: middle; } - *[class^="icon"] { + .icon { @extend %t-icon4; margin-right: ($baseline/2); } diff --git a/cms/templates/index.html b/cms/templates/index.html index d4f475b63c..82497ed0b0 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -162,7 +162,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
This re-run processing status:
- + Configuring as re-run
@@ -200,7 +200,7 @@ require(["domReady!", "jquery", "jquery.form", "js/index"], function(doc, $) {
This re-run processing status:
- + Configuration Error
diff --git a/cms/templates/ux/reference/course-create-rerun.html b/cms/templates/ux/reference/course-create-rerun.html index 89055cd080..b05ee661fe 100644 --- a/cms/templates/ux/reference/course-create-rerun.html +++ b/cms/templates/ux/reference/course-create-rerun.html @@ -328,7 +328,7 @@ TODO: