Commit f04365c0 by Brian Talbot

Merge pull request #920 from edx/talbs/verified-UIedits

Verification: UI Edits
parents e415d2c2 59a7a47b
...@@ -469,15 +469,11 @@ ...@@ -469,15 +469,11 @@
@include clearfix(); @include clearfix();
width: flex-grid(12,12); width: flex-grid(12,12);
.wrapper-sts, .sts-track { .sts-course, .sts-track {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
} }
.wrapper-sts {
width: flex-grid(9,12);
}
.sts-track { .sts-track {
width: flex-grid(3,12); width: flex-grid(3,12);
text-align: right; text-align: right;
...@@ -495,19 +491,36 @@ ...@@ -495,19 +491,36 @@
} }
} }
.sts { .sts-label {
@extend .t-title7; @extend .t-title7;
display: block; display: block;
margin-bottom: ($baseline/2);
border-bottom: ($baseline/10) solid $m-gray-l4;
padding-bottom: ($baseline/2);
color: $m-gray; color: $m-gray;
} }
.sts-course { .sts-course {
@extend .t-title; @extend .t-title;
width: flex-grid(9,12);
text-transform: none;
}
.sts-course-org, .sts-course-number {
@extend .t-title5;
@extend .t-weight4;
display: inline-block;
}
.sts-course-org {
margin-right: ($baseline/4);
}
.sts-course-name {
@include font-size(28); @include font-size(28);
@include line-height(28); @include line-height(28);
@extend .t-weight4; @extend .t-weight4;
display: block; display: block;
text-transform: none;
} }
} }
} }
......
...@@ -18,21 +18,26 @@ ...@@ -18,21 +18,26 @@
<section class="wrapper cart-list"> <section class="wrapper cart-list">
<header class="page-header"> <header class="page-header">
<h2 class="title"> <h2 class="title">
<span class="wrapper-sts"> <span class="sts-label">${_("You are now registered for: ")}</span>
<span class="sts">${_("You are now registered for")}</span>
<span class="sts-course">${course_name} (${course_org}, ${course_num})</span> <span class="wrapper-sts">
</span> <span class="sts-course">
<span class="sts-track"> <span class="sts-course-org">${course_org}</span>
<span class="sts-track-value"> <span class="sts-course-number">${course_num}</span>
<span class="context">${_("Registered as: ")}</span> ${_("ID Verified")} <span class="sts-course-name">${course_name}</span>
</span> </span>
</span>
</h2> <span class="sts-track">
</header> <span class="sts-track-value">
<span class="context">${_("Registering as: ")}</span> ${_("ID Verified")}
</span>
<div class="wrapper-progress"> </span>
</span>
</h2>
</header>
<div class="wrapper-progress">
<section class="progress"> <section class="progress">
<h3 class="sr title">${_("Your Progress")}</h3> <h3 class="sr title">${_("Your Progress")}</h3>
...@@ -194,8 +199,18 @@ ...@@ -194,8 +199,18 @@
</div> </div>
% endif % endif
</div> </div>
<div class="copy">
<p>${_("Billed To")}:
<span class="name-first">${order.bill_to_first}</span> <span class="name-last">${order.bill_to_last}</span><br />
<span class="address-street1">${order.bill_to_street1}</span> <span class="address-street2">${order.bill_to_street2}</span><br />
<span class="address-city">${order.bill_to_city}</span>, <span class="address-state">${order.bill_to_state}</span> <span class="address-postalcode">${order.bill_to_postalcode}</span><br />
<span class="address-country">${order.bill_to_country.upper()}</span>
</p>
</div>
</li> </li>
<%doc>
<li class="info-item billing-info"> <li class="info-item billing-info">
<h4 class="title">${_("Billing Information")}</h4> <h4 class="title">${_("Billing Information")}</h4>
...@@ -245,6 +260,7 @@ ...@@ -245,6 +260,7 @@
</table> </table>
</div> </div>
</li> </li>
</%doc>
</ul> </ul>
</article> </article>
</div> </div>
......
...@@ -2,13 +2,19 @@ ...@@ -2,13 +2,19 @@
<header class="page-header"> <header class="page-header">
<h2 class="title"> <h2 class="title">
<span class="sts-label">${_("You are registering for")}</span>
<span class="wrapper-sts"> <span class="wrapper-sts">
<span class="sts">${_("You are registering for")}</span> <span class="sts-course">
<span class="sts-course">${course_name} (${course_org}, ${course_num})</span> <span class="sts-course-org">${course_org}</span>
</span> <span class="sts-course-number">${course_num}</span>
<span class="sts-track"> <span class="sts-course-name">${course_name}</span>
<span class="sts-track-value"> </span>
<span class="context">${_("Registering as: ")}</span> ${_("ID Verified")}
<span class="sts-track">
<span class="sts-track-value">
<span class="context">${_("Registering as: ")}</span> ${_("ID Verified")}
</span>
</span> </span>
</span> </span>
</h2> </h2>
......
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