diff --git a/lms/static/sass/views/_shoppingcart.scss b/lms/static/sass/views/_shoppingcart.scss index 5a9cb3e021..f14029a51f 100644 --- a/lms/static/sass/views/_shoppingcart.scss +++ b/lms/static/sass/views/_shoppingcart.scss @@ -225,7 +225,7 @@ $light-border: 1px solid $gray-l5; color: $dark-gray1; } - ul.steps { + .steps { @extend %ui-no-list; border-top: $steps-border; border-bottom: $steps-border; @@ -262,9 +262,15 @@ $light-border: 1px solid $gray-l5; } &:after { - @include right(-$baseline*2); - @include ltr {content: "\f178";} - @include rtl {content: "\f177";} + @include ltr { + right: -($baseline*2); + content: "\f178"; + } + + @include rtl { + left: -($baseline*2); + content: "\f177"; + } position: absolute; top: ($baseline*1.3); color: $light-gray; @@ -298,6 +304,38 @@ $light-border: 1px solid $gray-l5; color: $light-gray2; } + .course-title-info { + display: inline-block; + width: 60%; + } + + .course-meta-info { + @include float(right); + @include text-align(right); + display: inline-block; + width: 35%; + } + + .course-registration-title, + .course-dates-title { + @extend %t-title6; + display: block; + padding: 0; + text-transform: uppercase; + color: $light-gray2; + } + + .course-display-name, + .course-display-dates { + @extend %t-title4; + display: block; + color: $dark-gray2; + } + + .course-display-dates { + @include clearfix(); + } + h1 { @include float(left); @extend %t-title4; @@ -866,6 +904,7 @@ $light-border: 1px solid $gray-l5; span { @include padding-left($baseline*3); text-transform: capitalize; + letter-spacing: 0; .blue-link { @extend %t-copy-sub1; @@ -887,7 +926,7 @@ $light-border: 1px solid $gray-l5; color: $dark-gray1; h2 { - font-family: $sans-serif; + @extend %t-title5; } } @@ -999,7 +1038,7 @@ $light-border: 1px solid $gray-l5; h2 { @include text-align(center); - @extend %t-title4; + @extend %t-title5; @extend %t-strong; margin-top: $baseline; margin-bottom: ($baseline/4); @@ -1040,7 +1079,7 @@ $light-border: 1px solid $gray-l5; content: none !important; } - ul.steps, a.blue.pull-right, .bordered-bar span.pull-right, .left.nav-global.authenticated { + .steps, .blue.pull-right, .bordered-bar .pull-right, .left.nav-global.authenticated { display: none; } diff --git a/lms/templates/shoppingcart/cybersource_form.html b/lms/templates/shoppingcart/cybersource_form.html index fec4231628..7a176b5a2a 100644 --- a/lms/templates/shoppingcart/cybersource_form.html +++ b/lms/templates/shoppingcart/cybersource_form.html @@ -1,7 +1,7 @@ <%! from django.utils.translation import ugettext as _ %>
% for pk, pv in params.iteritems(): - + % endfor diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html index 6be626c5c7..85c4022ffb 100644 --- a/lms/templates/shoppingcart/receipt.html +++ b/lms/templates/shoppingcart/receipt.html @@ -282,7 +282,7 @@ from microsite_configuration import microsite % endif -
+ % for item, course in shoppingcart_items: % if loop.index > 0 :
@@ -294,8 +294,13 @@ from microsite_configuration import microsite alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Image"/>
-

${_("Registration for")}: - + +

+ ${_('Registration for:')} + ${ course.display_name } +

+

+ <% course_start_time = course.start_datetime_text() course_end_time = course.end_datetime_text() @@ -304,19 +309,17 @@ from microsite_configuration import microsite ${_("Course Dates")}: %endif -

- -

${course.display_name}

- - % if course_start_time: - ${course_start_time} - %endif - - - % if course_end_time: - ${course_end_time} - %endif - -
+ + % if course_start_time: + ${course_start_time} + %endif + - + % if course_end_time: + ${course_end_time} + %endif + +

+
% if item.status == "purchased":
diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html index bb47a47181..2cbfac71f2 100644 --- a/lms/templates/shoppingcart/shopping_cart.html +++ b/lms/templates/shoppingcart/shopping_cart.html @@ -71,10 +71,14 @@ from django.utils.translation import ungettext
## Translators: "Registration for:" is followed by a course name -

${_('Registration for:')} - ${_('Course Dates:')} +

+ ${_('Registration for:')} + ${ course.display_name }

-

${ course.display_name }

${course.start_datetime_text()} - ${course.end_datetime_text()} +

+ ${_('Course Dates:')} + ${ course.start_datetime_text() } - ${ course.end_datetime_text() } +


@@ -98,19 +102,29 @@ from django.utils.translation import ungettext % endif
-
- +
+
- +
- + + - +
- +
@@ -122,10 +136,11 @@ from django.utils.translation import ungettext
% if not discount_applied: -
+
+ - +
% else:
@@ -147,31 +162,37 @@ from django.utils.translation import ungettext
% if order_type == 'business':
- -

- ${_('After this purchase is complete, a receipt is generated with relative billing details and registration codes for students.')} -

+ +

+ ${_('After this purchase is complete, a receipt is generated with relative billing details and registration codes for students.')} +