fix merge conflict with _variables.scss

lms/templates/courseware/mktg_course_about.html

@@ -53,7 +53,7 @@
         %elif allow_registration:
           <a class="action action-register register" href="#">Register for <strong>${course.number}</strong></a>
         %else:
-          <div class="action registration-closed">Registration Is Closed</div>
+          <div class="action registration-closed is-disabled">Registration Is Closed</div>
         %endif
     </li>
   </ul>

lms/templates/register.html

@@ -69,7 +69,7 @@
         $submitButton.
           removeClass('is-disabled').
           removeProp('disabled').
-          html('Create my ${settings.PLATFORM_NAME} Account');
+          html('Create My ${settings.PLATFORM_NAME} Account');
       }
       else {
         $submitButton.
@@ -141,32 +141,32 @@
         </div>
 
         <ol class="list-input">
-          
+
           % if ask_for_email:
 
           <li class="field required text" id="field-email">
             <label for="email">E-mail</label>
             <input class="" id="email" type="email" name="email" value="" placeholder="example: username@domain.com" />
           </li>
-          
+
           % endif
-          
+
           <li class="field required text" id="field-username">
             <label for="username">Public Username</label>
             <input id="username" type="text" name="username" value="${extauth_username}" placeholder="example: JaneDoe" required aria-required="true" />
             <span class="tip tip-input">Will be shown in any discussions or forums you participate in</span>
           </li>
-          
+
           % if ask_for_fullname:
-          
+
           <li class="field required text" id="field-name">
             <label for="name">Full Name</label>
             <input id="name" type="text" name="name" value="" placeholder="example: Jane Doe" />
             <span class="tip tip-input">Needed for any certificates you may earn <strong>(cannot be changed later)</strong></span>
           </li>
-          
+
           % endif
-          
+
         </ol>
 
         % endif
@@ -282,7 +282,7 @@
         </a>
       </p>
     </div>
-      
+
     % endif
 
     ## TODO: Use a %block tag or something to allow themes to

lms/templates/seq_module.html

@@ -3,7 +3,7 @@
     <ul class="sequence-nav-buttons">
       <li class="prev"><a href="#">Previous</a></li>
     </ul>
-    
+
     <div class="sequence-list-wrapper">
       <ol id="sequence-list">
         % for idx, item in enumerate(items):
@@ -16,7 +16,7 @@
            data-id="${item['id']}"
            data-element="${idx+1}"
            href="javascript:void(0);">
-            <p class="sr">${item['title']}, ${item['type']}</p>
+            <p>${item['title']}<span class="sr">, ${item['type']}</span></p>
           </a>
         </li>
         % endfor