Style notice.

lms/static/js/toggle_login_modal.js

@@ -48,6 +48,7 @@
           })
 
           $(modal_id).fadeTo(200,1);
+          $(modal_id).find(".notice").hide().html("");
           var notice = $(this).data('notice')
           if(notice !== undefined) {
             $(modal_id).find(".notice").show().html(notice);

lms/static/sass/shared/_modal.scss

@@ -115,7 +115,20 @@
       padding: 12px;
     }
 
+<<<<<<< HEAD
     .activation-message, .message {
+=======
+    .notice {
+      background: $yellow;
+      border: 1px solid darken($yellow, 60%);
+      color: darken($yellow, 60%);
+      display: none;
+      margin-bottom: 20px;
+      padding: 12px;
+    }
+
+    .activation-message {
+>>>>>>> cb49d9c... Style notice.
       padding: 0 40px 10px;
 
       p {

lms/templates/signup_modal.html

@@ -9,9 +9,10 @@
         <hr>
       </header>
 
-      <div class="notice"></div>
       <form id="enroll_form" method="post" data-remote="true" action="/create_account">
+        <div class="notice"></div>
         <div id="enroll_error" class="modal-form-error" name="enroll_error"></div>
+        <div id="enroll_error" name="enroll_error"></div>
         <label>E-mail</label>
         <input name="email" type="email" placeholder="E-mail">
         <label>Password</label>