From 3b84d7713124bfa9114b67e0724eb25a70461b83 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 7 May 2013 10:25:41 -0400 Subject: [PATCH 1/3] edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment --- lms/static/sass/_shame.scss | 32 ++++++++++--------- lms/static/sass/base/_base.scss | 4 +-- .../courseware/mktg_coming_soon.html | 2 +- .../courseware/mktg_course_about.html | 4 +-- lms/templates/mktg_iframe.html | 8 +++++ 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/lms/static/sass/_shame.scss b/lms/static/sass/_shame.scss index d40b1d3fc1..3caf4c78ce 100644 --- a/lms/static/sass/_shame.scss +++ b/lms/static/sass/_shame.scss @@ -16,11 +16,12 @@ display: block; padding: $baseline/2 $baseline*2.5; text-transform: lowercase; - color: $white !important; + color: $white; letter-spacing: 0.1rem; cursor: pointer; text-align: center; border: none !important; + text-decoration: none; text-shadow: none; letter-spacing: 0.1rem; font-size: 17px; @@ -63,23 +64,24 @@ } } - // register actions .action { - } + // not registered (default) + &.action-register { + @extend .btn-primary; + } - // not registered (default) - .action-register { - @extend .btn-primary; - } + // not open for registration/coming soon + &.isnot-open { + @extend .btn-secondary; + color: #d8d9dc; + pointer-events: none !important; + outline: none; + } - // not signed in - .is-not-signedin { - @extend .btn-primary; - } - - // already registered - .is-registered { - @extend .btn-secondary; + // already registered + &.is-registered { + @extend .btn-secondary; + } } } diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index b819776890..bb0880130c 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -88,7 +88,7 @@ a:link, a:visited { width: flex-grid(12); margin: 0 auto; padding-bottom: ($baseline*2); - background: rgb(255,255,255); + background: rgb(255,255,255); } .container { @@ -210,4 +210,4 @@ mark { .sr { @include text-sr(); -} \ No newline at end of file +} diff --git a/lms/templates/courseware/mktg_coming_soon.html b/lms/templates/courseware/mktg_coming_soon.html index 4e1b9185ee..c9d2060526 100644 --- a/lms/templates/courseware/mktg_coming_soon.html +++ b/lms/templates/courseware/mktg_coming_soon.html @@ -23,7 +23,7 @@ diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html index 1c9e0cb4bb..9c3a986ee0 100644 --- a/lms/templates/courseware/mktg_course_about.html +++ b/lms/templates/courseware/mktg_course_about.html @@ -69,11 +69,11 @@ Registered for ${course.number} %else: - Register for ${course.number}
+ Register for ${course.number}
%endif %else: - Register for ${course.number} + Register for ${course.number} %endif diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html index d37264825a..48fb022552 100644 --- a/lms/templates/mktg_iframe.html +++ b/lms/templates/mktg_iframe.html @@ -24,6 +24,14 @@ % if not course: <%include file="google_analytics.html" /> % endif + + + From 126c9f9f3792deb938c319c3e161718294e676e4 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 7 May 2013 11:00:21 -0400 Subject: [PATCH 2/3] edx.org - further revision to iframe register button states: coming soon styling --- lms/static/sass/_shame.scss | 26 ++++++++++++++++++-------- lms/templates/mktg_iframe.html | 5 ++++- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lms/static/sass/_shame.scss b/lms/static/sass/_shame.scss index 3caf4c78ce..d0eb5b54de 100644 --- a/lms/static/sass/_shame.scss +++ b/lms/static/sass/_shame.scss @@ -53,6 +53,17 @@ } } + .btn-tertiary { + @extend .btn; + background: $m-blue-l1; + color: $m-blue; + + // no hover state conventions to follow from marketing :/ + &:hover, &:active { + + } + } + // nav list .list-actions { list-style: none; @@ -71,17 +82,16 @@ @extend .btn-primary; } - // not open for registration/coming soon - &.isnot-open { - @extend .btn-secondary; - color: #d8d9dc; - pointer-events: none !important; - outline: none; - } - // already registered &.is-registered { @extend .btn-secondary; } + + // coming soon + &.isnot-open { + @extend .btn-tertiary; + pointer-events: none !important; + outline: none; + } } } diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html index 48fb022552..828cdfd04c 100644 --- a/lms/templates/mktg_iframe.html +++ b/lms/templates/mktg_iframe.html @@ -28,7 +28,10 @@ From 9a01bb5e527148c8eb0c1f56b4116836f9e683e0 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 7 May 2013 11:02:02 -0400 Subject: [PATCH 3/3] edx.org - adding back js-dependent register class to register button --- lms/templates/courseware/mktg_course_about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html index 9c3a986ee0..5eb98574d6 100644 --- a/lms/templates/courseware/mktg_course_about.html +++ b/lms/templates/courseware/mktg_course_about.html @@ -69,7 +69,7 @@ Registered for ${course.number} %else: - Register for ${course.number}
+ Register for ${course.number}
%endif %else: