Fixed up success page and forms

13 files changed, 95 insertions, 107 deletions

diff --git a/src/26.html b/src/26.html
index 0a703fe..c854cf2 100644
--- a/src/26.html
+++ b/src/26.html
@@ -28,8 +28,8 @@
                         <div class="floating-page">
                           <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
                           <h3>How it works</h3>
+                          <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                           <ul>
-                            Sed do eiusmod tempor incididunt ut labore et dolore:
                               <li>cursus euismod quis viverra</li>
                               <li>nibh cras pulvinar mattis nunc.</li>
                           </ul>
@@ -39,7 +39,7 @@
                           </p>
                           <h3>Your privacy</h3>
                           <p>Pretium lectus quam id leo in vitae. Turpis massa tincidunt dui ut.</p>
-                          <label class="btn primary">Start adding documents</label>
+                          <label class="btn btn--primary">Start adding documents</label>
                           <label class="btn btn--secondary">Cancel</label>
                         </div>
                     </div>
diff --git a/src/27.html b/src/27.html
index aa1c894..8609b40 100644
--- a/src/27.html
+++ b/src/27.html
@@ -28,12 +28,12 @@
                         <div class="upload-box">
                           <div class="upload-box__title">Lorem ipsum dolor sit amet, consectetur elit.</div>
                           <p class="upload-box__small-text">Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
-                          <button class="btn tertiary small">Add file</label>
+                          <label class="btn btn--tertiary small">Add file</label>
                         </div>
                         <div class="upload-box">
                           <div class="upload-box__title">Cursus euismod</div>
                           <p class="upload-box__small-text">Quis viverra nibh cras pulvinar mattis nunc. Bibendum neque egestas.</p>
-                          <button class="btn tertiary small">Add file</label>
+                          <label class="btn btn--tertiary small">Add file</label>
                         </div>
 
                         <div class="spacer"></div>
diff --git a/src/29.html b/src/29.html
index 9bf6410..334fba5 100644
--- a/src/29.html
+++ b/src/29.html
@@ -43,13 +43,13 @@
                           <div class="side-panel">
                             <h3>What you need to know</h3>
                             <h4>Lorem ipsum dolor sit amet.</h4>
+                            <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                             <ul>
-                              Sed do eiusmod tempor incididunt ut labore et dolore:
                                 <li>cursus euismod quis viverra</li>
                                 <li>nibh cras pulvinar mattis nunc.</li>
                             </ul>
+                            <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                             <ul>
-                              Sed do eiusmod tempor incididunt ut labore et dolore:
                                 <li>cursus euismod quis viverra</li>
                                 <li>nibh cras pulvinar mattis nunc.</li>
                             </ul>
diff --git a/src/30.html b/src/30.html
index 8d0289c..b9b6a00 100644
--- a/src/30.html
+++ b/src/30.html
@@ -43,13 +43,13 @@
                           <div class="side-panel">
                             <h3>What you need to know</h3>
                             <h4>Lorem ipsum dolor sit amet.</h4>
+                            <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                             <ul>
-                              Sed do eiusmod tempor incididunt ut labore et dolore:
                                 <li>cursus euismod quis viverra</li>
                                 <li>nibh cras pulvinar mattis nunc.</li>
                             </ul>
+                            <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                             <ul>
-                              Sed do eiusmod tempor incididunt ut labore et dolore:
                                 <li>cursus euismod quis viverra</li>
                                 <li>nibh cras pulvinar mattis nunc.</li>
                             </ul>
diff --git a/src/31.html b/src/31.html
index 97c4d59..8edf6db 100644
--- a/src/31.html
+++ b/src/31.html
@@ -57,13 +57,13 @@
                           <div class="side-panel">
                             <h3>What you need to know</h3>
                             <h4>Lorem ipsum dolor sit amet.</h4>
+                            <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                             <ul>
-                              Sed do eiusmod tempor incididunt ut labore et dolore:
                                 <li>cursus euismod quis viverra</li>
                                 <li>nibh cras pulvinar mattis nunc.</li>
                             </ul>
+                            <p>Sed do eiusmod tempor incididunt ut labore et dolore:</p>
                             <ul>
-                              Sed do eiusmod tempor incididunt ut labore et dolore:
                                 <li>cursus euismod quis viverra</li>
                                 <li>nibh cras pulvinar mattis nunc.</li>
                             </ul>
diff --git a/src/34.html b/src/34.html
index f5b3153..0bec110 100644
--- a/src/34.html
+++ b/src/34.html
@@ -28,8 +28,7 @@
                     <div class="documentlodgementservice generic">
                         <!-- ADD YOUR PAGE IN HERE -->
                         <div class="full-on-mobile" >
-                          <div class="floating-page ">
-
+                          <div class="floating-page floating-page--large">
                             <div role="region" aria-live="assertive" class="success_error_page_container">
                               <div aria-hidden="true" class="success_error_page_container__logo success_error_page_container__logo--success"></div>
                               <div>
@@ -37,24 +36,27 @@
                               </div>
                             </div>
                             <hr class="success_error_page_container__hr"/>
-                            <div class="success-page-text">
-                              <p>Your Medicare Entitlement Statement and any supporting documents you added are uploaded and we've notified Medicare.</p>
-                              <p>Your document upload reference number is MCA01728394</p>
-                            </div>
-                            <div class="info-box info">
-                              <div class="info-box--info-icon"></div>
-                              <div class="info-box--info-content">
-                                <div>
-                                  <p>For information about your privacy, go to the:</p>
-                                  <ul> 
-                                    <li>myGov privacy notice</li> 
-                                    <li>%dynamic-service-privacy-policy%</li> 
-                                  </ul>
+                            <div class="success_error_page_content">
+                              <div>
+                                <p>Your Medicare Entitlement Statement and any supporting documents you added are uploaded and we've notified Medicare.</p>
+                                <p>Your document upload reference number is MCA01728394</p>
+                              </div>
+                              <div class="callout-box--info">
+                                <div class="callout-box--info-icon"></div>
+                                <div class="callout-box--info-content">
+                                  <div>
+                                    <p class="bold">For information about your privacy, go to the:</p>
+                                    <ul> 
+                                      <li>myGov privacy notice</li> 
+                                      <li>%dynamic-service-privacy-policy%</li> 
+                                    </ul>
+                                  </div>
                                 </div>
                               </div>
+                              <label class="btn btn--primary" href="https://test3.beta.my.gov.au/en">Return to home</label>
                             </div>
+
                             
-                            <label class="btn btn--primary" href="https://test3.beta.my.gov.au/en">Return to home</label>
 
                           </div>
                         </div>
diff --git a/src/css/bigstyle.css b/src/css/bigstyle.css
index b3e3e98..764fb0a 100644
--- a/src/css/bigstyle.css
+++ b/src/css/bigstyle.css
@@ -4618,7 +4618,7 @@ fieldset .input-group:first-child {
   margin-top: 0.75em;
 }
 .page-mygov-auth-account div .error-message::before {
-  content: url("styles/resources/assets/icons/error-oct-red.svg");
+  content: url("../img/error.png");
   position: relative;
   left: 0px;
   top: 0px;
@@ -5227,10 +5227,10 @@ fieldset .input-group:first-child {
   margin-bottom: 1.125rem;
 }
 .success_error_page_container__logo--success {
-  background: var(--white) url("styles/resources/assets/icons/ia/check-large-green.svg") no-repeat center;
+  background: var(--white) url("../img/success.png") no-repeat center;
 }
 .success_error_page_container__logo--error {
-  background: var(--white) url("styles/resources/assets/icons/ia/error-oct-icon-red-68.svg") no-repeat center;
+  background: var(--white) url("../img/error.png") no-repeat center;
 }
 @media (max-width: 639px) {
   .success_error_page_container__logo {
@@ -7190,12 +7190,12 @@ fieldset .input-group:first-child {
   justify-content: center;
   width: 3.25rem;
   height: 3.5rem;
-  background: var(--callout-info-bg-color) url("styles/resources/assets/icons/ia/info-icon.svg") no-repeat center;
+  background: var(--callout-info-bg-color) url("../img/info.png") no-repeat center;
   background-size: 1.5rem;
 }
 @media (max-width: 639px) {
   .page-mygov-auth-account .callout-box--info-icon {
-    background-image: url("styles/resources/assets/icons/ia/info-icon.svg");
+    background-image: url("../img/info.png");
     background-size: 1rem;
   }
 }
diff --git a/src/css/floatingpage.css b/src/css/floatingpage.css
index 820e6c1..66575ca 100644
--- a/src/css/floatingpage.css
+++ b/src/css/floatingpage.css
@@ -2,12 +2,16 @@
     .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .floating-page {
         background-color: var(--white);
         padding: 3rem;
-        margin: 0 0;
-        box-shadow: 0px 2px 6px #10182040;
+        margin: 0;
+        box-shadow: 0 2px 6px #10182040;
         border-radius: 5px;
-        max-width: 80rem;
+        max-width: 850px;
     }
     .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .floating-page > :first-child {
         margin-top: 0;
     }
+    .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .floating-page--large {
+        margin: 0 auto;
+        max-width: 1280px;
+    }
 }
\ No newline at end of file
diff --git a/src/css/forms.css b/src/css/forms.css
index f090e3b..200da2e 100644
--- a/src/css/forms.css
+++ b/src/css/forms.css
@@ -1,56 +1,3 @@
-/* .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .checkbox-group {
-    display: flex;
-    width: 100%;
-    padding: 0.5rem;
-}
-.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .checkbox-group input[type="checkbox"] {
-    background-color: transparent;
-    border: 2px solid var(--black);
-    border-radius: 3px;
-    padding: 0;
-    height: 1rem;
-    width: 1rem;
-    margin-top: 0.25rem;
-    -webkit-appearance: none;
-    appearance: none;
-    flex-shrink: 0;
-    flex-grow: 0;
-    cursor: pointer;
-}
-.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .checkbox-group input[type="checkbox"]:checked {
-    border: 2px solid var(--black);
-    background-color: var(--light-navy);
-    background-image: url(../img/check.png);
-    background-size: contain;
-}
-.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .checkbox-group input[type="checkbox"]:indeterminate {
-    border: 2px solid var(--black);
-    background-color: var(--light-navy);
-    background-image: url(../img/indeterminate.png);
-    background-size: contain;
-}
-.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .checkbox-group label {
-    column-gap: 1rem;
-    padding-left: 1rem;
-    margin: 0;
-    font-weight: normal;
-    font-size: var(--font-size-16);
-}
-.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .checkbox-group:focus {
-    outline: 2px solid var(--dark-grey);
-    border-radius: 3px;
-} */
-
-/* .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice label.checkbox {
-    padding: 8px;
-} */
-
-/* .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice label.checkbox:focus {
-    outline: 2px solid var(--dark-grey);
-    outline-offset: -4px;
-    border-radius: 3px;
-} */
-
 .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice div.checkbox .error-message {
     margin: 0 0 4px 0;
     padding: 0;
@@ -64,18 +11,8 @@
     margin-bottom: 40px;
 }
 
-/* .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice label.checkbox--error:before {
-    content: " ";
-    position: absolute;
-    top: 4px;
-    left: 4px;
-    right: 4px;
-    bottom: 4px;
-    border-radius: var(--input-border-radius);
-    border: 2px solid var(--error-color);
-} */
-
 .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice div.checkbox {
+    top: 8px;
     display: none;
 }
 .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice label.checkbox--error + div.checkbox {
@@ -86,6 +23,9 @@
     align-items: center;
 }
 
-.fieldset--title__hidden {
+fieldset {
     padding: 8px 0;
+}
+fieldset .button-container {
+    margin-top: 16px;
 }
\ No newline at end of file
diff --git a/src/css/infobox.css b/src/css/infobox.css
index d98d079..f521d8c 100644
--- a/src/css/infobox.css
+++ b/src/css/infobox.css
@@ -33,6 +33,7 @@
 
 /* Block sized info boxes */
 
+/*
 .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .info-box.message {
     background-color: #f7f7f7;
     padding: 0.75rem;
@@ -60,3 +61,4 @@
 .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .info-box.warning .info-box__icon {
     background-image: url(../img/warning.png);
 }
+*/
\ No newline at end of file
diff --git a/src/css/sidepanel.css b/src/css/sidepanel.css
index b8a654a..247db9d 100644
--- a/src/css/sidepanel.css
+++ b/src/css/sidepanel.css
@@ -9,9 +9,9 @@
     flex-wrap: wrap;
 }
 
-/* .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .side-panel p {
-    margin: 8px 0 4px 0;
-} */
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice p + ul {
+    margin-top: -1em;
+}
 
 /* Tablet or Desktop (at least 48em) */
 
diff --git a/src/css/style.css b/src/css/style.css
index ef27873..d69f000 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -52,14 +52,23 @@
     padding: 0;
     list-style-position: inside;
 }
-.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice p + ul {
-    margin-top: -1em;
-}
 .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .file-size {
     font-size: var(--font-size-14);
     color: var(--light-grey);
     font-weight: bold;
 }
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice hr {
+    border-top: 1px solid #DDDDDD;
+    margin: 60px 0;
+}
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .left-right-box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .left-right-box * {
+    display: inline-block;
+}
 
 /* Desktop (at least 64em) */
 
diff --git a/src/css/success.css b/src/css/success.css
index 53494d2..8ffef40 100644
--- a/src/css/success.css
+++ b/src/css/success.css
@@ -1,4 +1,35 @@
-.success_error_page_container__hr {
-    width: 70%;
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .success_error_page_container__hr {
+    max-width: 700px;
     margin: 40px auto;
+}
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .success_error_page_container__logo {
+    background-size: cover;
+    width: 70px;
+    height: 70px;
+}
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .success_error_page_container h1 {
+    font-size: 46px;
+    margin: 0;
+}
+
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .success_error_page_container {
+    margin-top: 0;
+}
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .callout-box--info ul {
+    margin: 0 16px;
+}
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .callout-box--info * {
+    font-size: var(--font-size-16);
+}
+
+@media only screen and (max-width: 1024px) {
+    .page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .success_error_page_container h1 {
+        font-size: var(--font-size-24);
+    }
+}
+
+.page-mygov-auth-account .authenticated-body-container__page .documentlodgementservice .success_error_page_content {
+    display: block;
+    max-width: 550px;
+    margin: 0 auto;
 }
\ No newline at end of file