Skip to content

E
edx-platform
Commit 3561b5c7 by Chris Rodriguez
Options

PR feedback and receiept template updates

parent 8f8f1184
Showing with 38 additions and 34 deletions
lms/static/sass/views/_shoppingcart.scss
...@@ -309,11 +309,16 @@ $light-border: 1px solid $gray-l5; ...@@ -309,11 +309,16 @@ $light-border: 1px solid $gray-l5;
color: $light-gray2; color: $light-gray2;
} }
.course-display-name, .course-title-info {
.course-display-dates { display: inline-block;
@extend %t-title4; width: 60%;
display: block; }
color: $dark-gray2;
.course-meta-info {
@include float(right);
@include text-align(right);
display: inline-block;
width: 35%;
} }
.course-registration-title, .course-registration-title,
...@@ -325,20 +330,15 @@ $light-border: 1px solid $gray-l5; ...@@ -325,20 +330,15 @@ $light-border: 1px solid $gray-l5;
color: $light-gray2; color: $light-gray2;
} }
.course-display-name,
.course-display-dates { .course-display-dates {
@include clearfix(); @extend %t-title4;
} display: block;
color: $dark-gray2;
.course-title-info {
display: inline-block;
width: 60%;
} }
.course-meta-info { .course-display-dates {
@include float(right); @include clearfix();
@include text-align(right);
display: inline-block;
width: 35%;
} }
h1 { h1 {
...@@ -907,6 +907,7 @@ $light-border: 1px solid $gray-l5; ...@@ -907,6 +907,7 @@ $light-border: 1px solid $gray-l5;
span { span {
@include padding-left($baseline*3); @include padding-left($baseline*3);
text-transform: capitalize; text-transform: capitalize;
letter-spacing: 0;
.blue-link { .blue-link {
@extend %t-copy-sub1; @extend %t-copy-sub1;
...@@ -928,7 +929,7 @@ $light-border: 1px solid $gray-l5; ...@@ -928,7 +929,7 @@ $light-border: 1px solid $gray-l5;
color: $dark-gray1; color: $dark-gray1;
h2 { h2 {
font-family: $sans-serif; @extend %t-title5;
} }
} }
...@@ -1033,7 +1034,7 @@ $light-border: 1px solid $gray-l5; ...@@ -1033,7 +1034,7 @@ $light-border: 1px solid $gray-l5;
h2 { h2 {
@include text-align(center); @include text-align(center);
@extend %t-title4; @extend %t-title5;
@extend %t-strong; @extend %t-strong;
margin-top: $baseline; margin-top: $baseline;
margin-bottom: ($baseline/4); margin-bottom: ($baseline/4);
......
lms/templates/shoppingcart/receipt.html
...@@ -280,7 +280,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -280,7 +280,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
</div> </div>
</div> </div>
% endif % endif
<hr class="border"/>
% for item, course in shoppingcart_items: % for item, course in shoppingcart_items:
% if loop.index > 0 : % if loop.index > 0 :
<hr> <hr>
...@@ -292,8 +292,13 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -292,8 +292,13 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Image"/> alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Image"/>
</div> </div>
<div class="data-input"> <div class="data-input">
<h3>${_("Registration for")}:
<span class="pull-right"> <h3 class="course-title-info" id="course-title">
<span class="course-registration-title">${_('Registration for:')}</span>
<span class="course-display-name">${ course.display_name }</span>
</h3>
<p class="course-meta-info" aria-describedby="course-title">
<span class="course-dates-title">
<% <%
course_start_time = course.start_datetime_text() course_start_time = course.start_datetime_text()
course_end_time = course.end_datetime_text() course_end_time = course.end_datetime_text()
...@@ -302,19 +307,17 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -302,19 +307,17 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
${_("Course Dates")}: ${_("Course Dates")}:
%endif %endif
</span> </span>
</h3> <span class="course-display-dates">
% if course_start_time:
<h1>${course.display_name}</h1> ${course_start_time}
<span class="pull-right"> %endif
% if course_start_time: -
${course_start_time} % if course_end_time:
%endif ${course_end_time}
- %endif
% if course_end_time: </span>
${course_end_time} </p>
%endif <hr>
</span>
<hr/>
<div class="three-col"> <div class="three-col">
% if item.status == "purchased": % if item.status == "purchased":
<div class="col-1"> <div class="col-1">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment