From c12d4166752073d00a99c117e6d06b6f8d038842 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Wed, 10 May 2023 07:22:06 -0700
Subject: [PATCH 1/7] remove condensed styles

---
 .../application/remote-access-helpers.coffee  |  4 ---
 app/assets/stylesheets/application.scss       |  1 -
 app/assets/stylesheets/condensed.scss         | 26 -------------------
 3 files changed, 31 deletions(-)
 delete mode 100644 app/assets/stylesheets/condensed.scss

diff --git a/app/assets/javascripts/application/remote-access-helpers.coffee b/app/assets/javascripts/application/remote-access-helpers.coffee
index d012b7bacc..658ce5f50f 100644
--- a/app/assets/javascripts/application/remote-access-helpers.coffee
+++ b/app/assets/javascripts/application/remote-access-helpers.coffee
@@ -40,10 +40,6 @@ $(document).ready ->
   # the below clause will that window
   # or (window.opener and window.name is 'oxlogin')
 
-  # we're being loaded inside an iframe or a popup
-  # Set a css class to adjusted to fit a narrow screen
-  $(document.body).addClass('condensed iframe')
-
   relayHeading()
 
   # notify the parent iframe of our size now and whenever it's changed
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index aa31f6cd3d..d9ab9a56be 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -20,7 +20,6 @@ $font-path: '/accounts/fonts';
 @import "misc";
 @import "application_js_hooks";
 @import "pagination";
-@import "condensed";
 
 
 /* Set a max-width, maintaining responsiveness */
diff --git a/app/assets/stylesheets/condensed.scss b/app/assets/stylesheets/condensed.scss
deleted file mode 100644
index bf887cb3ff..0000000000
--- a/app/assets/stylesheets/condensed.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-body.condensed {
-
-  background: white;
-
-  #application-header,
-  #application-footer,
-  #upper-corner-console,
-  .sign-out {
-    display: none;
-  }
-  #application-container {
-    margin: 0;
-    padding: 0;
-    background: white;
-  }
-  #application-body {
-    margin: 0;
-    padding: 0;
-  }
-  .ox-card {
-    width: 100%;
-    max-width: 100%;
-    background: white;
-  }
-
-}

From ca6048cf8d71e2eef5dc28dcc64e4c5fde63deb9 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Wed, 10 May 2023 15:34:46 -0700
Subject: [PATCH 2/7] update card padding and max width

---
 app/assets/stylesheets/controls/_card.scss | 19 ++++++++++++++++++-
 app/views/terms/pose.html.erb              |  5 +++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/controls/_card.scss b/app/assets/stylesheets/controls/_card.scss
index a4bccd8ba8..39d9013ed7 100644
--- a/app/assets/stylesheets/controls/_card.scss
+++ b/app/assets/stylesheets/controls/_card.scss
@@ -1,14 +1,19 @@
 .ox-card {
   $input-height: 50px;
   $input-border-color: darken($os_light_gray, 10%);
+  $card-padding: 50px;
 
   display: block;
   margin: auto;
   max-width: 570px;
   background-color: $os_light_gray;
-  padding: 30px 50px 50px 50px;
+  padding: 30px $card-padding $card-padding;
   font-size: 14px;
 
+  &.wide {
+    max-width: initial;
+  }
+
   h1, h2, h3, .minor-heading {
     font-family: $os_heading_font_family;
     font-weight: 700;
@@ -130,4 +135,16 @@
     }
   }
 
+  .footer {
+    margin: $card-padding $card-padding*-1 $card-padding*-1;
+    padding: 1.8rem $card-padding;
+    border-top: 1px solid #D5D5D5;
+    background: #F5F5F5;
+    display: flex;
+    justify-content: space-between;
+
+    &.checkbox {
+      align-self: center;
+    }
+  }
 }
diff --git a/app/views/terms/pose.html.erb b/app/views/terms/pose.html.erb
index 16032c39ac..37762ab218 100644
--- a/app/views/terms/pose.html.erb
+++ b/app/views/terms/pose.html.erb
@@ -1,4 +1,4 @@
-<%= ox_card(heading: @contract.title) do %>
+<%= ox_card(heading: @contract.title, classes: "wide") do %>
 
   <% if FinePrint.signed_any_version_of_contract?(current_user, @contract) %>
     <p><%= t :".contracts_changed_notice", contract_title: @contract.title %></p>
@@ -13,7 +13,8 @@
   <%= lev_form_for(
     :agreement,
     url: agree_to_terms_path(r: params[:r], token: params[:token]),
-    method: :post
+    method: :post,
+    html: { class: 'footer' }
   ) do |f| %>
     <div class="checkbox">
       <label>

From 1be49524af9cd2580871448fccb08f36b5717d29 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Thu, 11 May 2023 08:32:21 -0700
Subject: [PATCH 3/7] update terms footer, use new styles for button and
 checkbox

---
 app/assets/stylesheets/controls/_buttons.scss | 32 +++++++++++++++++++
 app/assets/stylesheets/controls/_card.scss    | 17 +++++++++-
 app/assets/stylesheets/ox-controls.scss       |  7 ++++
 app/views/terms/pose.html.erb                 |  4 +--
 config/locales/en.yml                         |  2 +-
 config/locales/pl.yml                         |  2 +-
 6 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/controls/_buttons.scss b/app/assets/stylesheets/controls/_buttons.scss
index 14b69abf14..f2697ad5a9 100644
--- a/app/assets/stylesheets/controls/_buttons.scss
+++ b/app/assets/stylesheets/controls/_buttons.scss
@@ -32,6 +32,38 @@ button {
 
   &.primary {
     @include ox-button($os_orange);
+
+    &.new-style {
+      font-size: 1.6rem;
+      line-height: 2rem;
+      -moz-osx-font-smoothing: grayscale;
+      -webkit-font-smoothing: antialiased;
+      display: inline-flex;
+      flex-direction: row;
+      justify-content: center;
+      align-items: center;
+      height: 4rem;
+      padding: 0 3rem;
+      background: #D4450C;
+      color: #FFFFFF;
+      border: 0;
+      border-radius: 5px;
+      box-shadow: 0px 0.2rem 0.4rem rgba(0, 0, 0, 0.2);
+      transition: all 0.2s ease-in-out;
+      text-decoration: none;
+      user-select: none;
+      white-space: nowrap;
+      text-transform: none;
+
+      &:not([disabled]) {
+        &:hover {
+          background: #be3c08;
+        }
+        &:active {
+          background: #b03808;
+        }
+      }
+    }
   }
 
 }
diff --git a/app/assets/stylesheets/controls/_card.scss b/app/assets/stylesheets/controls/_card.scss
index 39d9013ed7..12a4ae887a 100644
--- a/app/assets/stylesheets/controls/_card.scss
+++ b/app/assets/stylesheets/controls/_card.scss
@@ -143,8 +143,23 @@
     display: flex;
     justify-content: space-between;
 
-    &.checkbox {
+    .checkbox {
       align-self: center;
+
+      label {
+        display: flex;
+        align-items: center;
+        padding: 0;
+
+        input[type="checkbox"] {
+          margin: 0 1.6rem 0 0;
+          position: initial;
+        }
+      }
+    }
+
+    input[type=submit] {
+      margin-right: 0;
     }
   }
 }
diff --git a/app/assets/stylesheets/ox-controls.scss b/app/assets/stylesheets/ox-controls.scss
index b1243d9f7b..1714d2a944 100644
--- a/app/assets/stylesheets/ox-controls.scss
+++ b/app/assets/stylesheets/ox-controls.scss
@@ -33,3 +33,10 @@
     top: 50%;
   }
 }
+
+
+input[type="checkbox"].new-style {
+  accent-color: #026AA1;
+  width: 2rem;
+  height: 2rem;
+}
diff --git a/app/views/terms/pose.html.erb b/app/views/terms/pose.html.erb
index 37762ab218..4009f104be 100644
--- a/app/views/terms/pose.html.erb
+++ b/app/views/terms/pose.html.erb
@@ -18,12 +18,12 @@
   ) do |f| %>
     <div class="checkbox">
       <label>
-        <%= f.check_box :i_agree %> <%= t :".have_read_terms_and_agree" %>
+        <%= f.check_box :i_agree, class: 'new-style' %> <%= t :".have_read_terms_and_agree" %>
       </label>
     </div>
 
     <%= f.hidden_field :contract_id, value: @contract.id %>
-    <%= f.submit (t :".agree"), id: "agreement_submit", class: 'primary' %>
+    <%= f.submit (t :".agree"), id: "agreement_submit", class: 'primary new-style' %>
   <% end %>
 
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b86034d696..b86d9a60d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -487,7 +487,7 @@ en:
       page_heading: Site Terms & Policies
 
     pose:
-      agree: I agree
+      agree: Accept and continue
       contract_acceptance_required: >-
         To continue, please review and agree to the following site terms by
         clicking the agreement button at the bottom of this page.
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 28ed883d2e..ce96db2c74 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -436,7 +436,7 @@ pl:
       page_heading: Regulaminy użytkowania serwisu
 
     pose:
-      agree: Zgadzam się
+      agree: Zaakceptuj i kontynuuj
       contract_acceptance_required: >-
         Aby kontynuować, zapoznaj się z treścią poniższych regulaminów
         i zaakceptuj je klikając „Zgadzam się” na końcu tej strony.

From 94875ed7eb93d9d0bc9f187b7b3f95d2ad0a2b02 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Thu, 11 May 2023 09:42:37 -0700
Subject: [PATCH 4/7] fix footer at mobile dimensions

---
 app/assets/stylesheets/controls/_card.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/controls/_card.scss b/app/assets/stylesheets/controls/_card.scss
index 12a4ae887a..04341a05bb 100644
--- a/app/assets/stylesheets/controls/_card.scss
+++ b/app/assets/stylesheets/controls/_card.scss
@@ -142,10 +142,14 @@
     background: #F5F5F5;
     display: flex;
     justify-content: space-between;
+    gap: 4rem;
 
-    .checkbox {
-      align-self: center;
+    @media (max-width: $screen-sm - ($card-padding * 2)) {
+      flex-direction: column;
+      gap: 1.6rem;
+    }
 
+    .checkbox {
       label {
         display: flex;
         align-items: center;
@@ -154,6 +158,7 @@
         input[type="checkbox"] {
           margin: 0 1.6rem 0 0;
           position: initial;
+          flex-shrink: 0;
         }
       }
     }

From 1c0565ab57c6bb3bd696d83ec36abc98d645ad42 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Tue, 16 May 2023 09:19:22 -0700
Subject: [PATCH 5/7] update terms checkbox language to match figma

---
 config/locales/en.yml | 2 +-
 config/locales/pl.yml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b86d9a60d6..63f9224611 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -497,7 +497,7 @@ en:
         There have been changes to the %{contract_title}. Please review them and
         then click the agreement button at the bottom of this page to continue.
       have_read_terms_and_agree: >-
-        I have read and agree to the terms listed above.
+        I have read and agree to these terms of use.
 
   legacy:
     users:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index ce96db2c74..cac0c0ba8a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -444,8 +444,7 @@ pl:
         Zapisy regulaminu %{contract_title} zmieniły się. Prosimy zapoznać się
         z nową wersją, a następnie kliknąć „Zgadzam się” na końcu tej strony.
       have_read_terms_and_agree: >-
-        Zapoznałem/am się z przedstawionymi powyżej regulaminami i zgadzam
-        się na zawarte w nich warunki.
+        Przeczytałem i zgadzam się z tymi warunkami użytkowania.
 
   legacy:
     users:

From 44f6c54ceaf5741be05a01b6ffb133ee30b55f23 Mon Sep 17 00:00:00 2001
From: Josiah Ivey <josiah.ivey@gmail.com>
Date: Tue, 16 May 2023 15:24:38 -0700
Subject: [PATCH 6/7] Revert "update terms checkbox language to match figma"

This reverts commit 1c0565ab57c6bb3bd696d83ec36abc98d645ad42.
---
 config/locales/en.yml | 2 +-
 config/locales/pl.yml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 63f9224611..b86d9a60d6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -497,7 +497,7 @@ en:
         There have been changes to the %{contract_title}. Please review them and
         then click the agreement button at the bottom of this page to continue.
       have_read_terms_and_agree: >-
-        I have read and agree to these terms of use.
+        I have read and agree to the terms listed above.
 
   legacy:
     users:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index cac0c0ba8a..ce96db2c74 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -444,7 +444,8 @@ pl:
         Zapisy regulaminu %{contract_title} zmieniły się. Prosimy zapoznać się
         z nową wersją, a następnie kliknąć „Zgadzam się” na końcu tej strony.
       have_read_terms_and_agree: >-
-        Przeczytałem i zgadzam się z tymi warunkami użytkowania.
+        Zapoznałem/am się z przedstawionymi powyżej regulaminami i zgadzam
+        się na zawarte w nich warunki.
 
   legacy:
     users:

From 075103d13e347b065a18f2b7d9d363c0cb63423d Mon Sep 17 00:00:00 2001
From: Michael Volo <volo@rice.edu>
Date: Thu, 1 Jun 2023 10:25:18 -0500
Subject: [PATCH 7/7] Fix email address in Polish educator pending screen
 (#1186)

---
 config/locales/pl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 28ed883d2e..1a800b781b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -87,7 +87,7 @@ pl:
     educator_pending_cs_verification_description: >-
       Twój dostęp do instruktora jest w toku.
        Sprawdzimy Twój status instruktora w ciągu 3-4 dni roboczych.
-       Aktualizacje Twojego statusu weryfikacji zostaną wysłane na adres <b>% {email_addess} </b>.
+       Aktualizacje Twojego statusu weryfikacji zostaną wysłane na adres <b>%{email_addess}</b>.
        W międzyczasie możesz uzyskać dostęp do wszystkich książek i zasobów
        z wyjątkiem tych, które wymagają weryfikacji instruktora.
     join_as_student_description: >-