Redesign 2023 remaining work

app/assets/stylesheets/custom.scss

@@ -59,6 +59,14 @@ ul {
   vertical-align: top;
 }
 
+.code-of-conduct ul {
+  list-style: disc;
+
+  li::marker {
+    color: $primary;
+  }
+}
+
 h1 {
   text-transform: uppercase;
   font-weight: bold;
@@ -211,25 +219,30 @@ h1 {
   pointer-events: none;
 }
 
+.code_of_conduct_box {
+  // flex: 1;
+  // font-size: small;
+  // padding-top: 0.3rem;
+  // color: $green;
+  border: 1px solid $primary;
+  border-radius: 4px;
+  padding: 0.375rem 0.75rem;
+  cursor: pointer;
+}
+
 .modal-footer.contact {
   align-items: flex-start;
   padding-left: 0rem;
   padding-top: 0rem;
   padding-bottom: 1rem;
-  padding-right: 1rem;
+  padding-right: 0rem;
+  border-top: none;
 
   .btn {
     margin-top: 1rem;
   }
-  .code_of_conduct_link {
-    flex: 1;
-    font-size: small;
-    padding-top: 0.3rem;
-    color: $red;
-  }
 }
 
-
 // overwrite bootstrap
 
 textarea, input {
@@ -280,8 +293,12 @@ textarea, input {
   .btn-primary {
     width: 100%;
   }
-  .col-sm-2 {
-    max-width: none;
+  div {
+    width: 100%;
+
+    @media (min-width: 576px) {
+      width: auto;
+    }
   }
 }
 

app/views/contact/_form.html.erb

@@ -4,9 +4,13 @@
   <%= invisible_captcha %>
   <%= f.input :subject, label: t(".subject"), required: false, input_html: { class: 'form-control mb-3' }, error_html: { style: 'float:right'} %>
   <%= f.input :body, as: :text, label: t(".body"), required: false, input_html: { class: 'form-control mb-3' }, error_html: { style: 'float:right'} %>
+  <div class="code_of_conduct_box">
+    <span><%= t(".read_code_of_conduct_prefix")%></span>
+    <%=link_to t(".read_code_of_conduct_link"), code_of_conduct_path, target: "_blank"
+    %><span><%= t(".read_code_of_conduct_suffix") %></span>
+  </div>
 
   <div class="modal-footer contact">
-    <%= link_to t(".read_code_of_conduct"), code_of_conduct_path, target: "_blank", class: 'code_of_conduct_link' %>
     <%= f.submit t(".send"), class: "btn btn-primary"%>
   </div>
 <% end %>

app/views/pages/code_of_conduct.de.html.erb

@@ -1,4 +1,4 @@
-<div class="container bg--white pb-5">
+<div class="container bg--white pb-5 code-of-conduct">
   <h1 class="display-4 py-5">Code of Conduct</h1>
   <p>Speakerinnen.org will die Sichtbarkeit von Frauen überall da steigern, wo öffentlich gesprochen wird.
   Auf dieser Plattform können sich deshalb Frauen mit ihren vielfältigen Erfahrungen, ihrem Wissen und ihren

app/views/pages/code_of_conduct.en.html.erb

@@ -1,4 +1,4 @@
-<div class="container bg--white pb-5">
+<div class="container bg--white pb-5 code-of-conduct">
   <h1 class="display-4 py-5">Code of Conduct</h1>
   <p>The aim of Speakerinnen.org is to increase the visibility of women wherever public speaking takes place.
     Here female speakers can present their diverse experiences, backgrounds, and knowledge to media and event

app/views/shared/_search_form.html.erb

@@ -4,7 +4,10 @@
       <%= search_field_tag('search', params[:search], id: "home_search", class: 'form-control typeahead ',
             type: 'text', placeholder: t(:search_placeholder, scope: 'pages.home')) %>
     </div>
-    <div class="col-sm-2">
-      <%= submit_tag(t(:"search_speaker#{'_' + current_region.to_s if current_region}", scope: 'pages.home'), class: 'btn btn-primary' ) %>
+    <div class="col-s-4 col-lm-2">
+      <button type="submit" class="btn btn-primary">
+        <i class="fa fa-search"></i>
+        <%=t(:"search_speaker#{'_' + current_region.to_s if current_region}", scope: 'pages.home')%>
+      </button>
     </div>
   <% end %>

config/locales/contact.de.yml

@@ -10,7 +10,9 @@ de:
       send: "Senden"
       body: "Deine Nachricht"
       body_placeholder: "Bitte gib ein paar Details zu Deiner Anfrage: Wo, wann, was und andere relevante Informationen."
-      read_code_of_conduct: "Entspricht diese Mail unserem Verhaltenscodex? Danke für eine wertschätzende und freundliche Kommunikation!"
+      read_code_of_conduct_prefix: "Entspricht diese Mail unserem"
+      read_code_of_conduct_link: "Verhaltenscodex"
+      read_code_of_conduct_suffix: "? Danke für eine wertschätzende und freundliche Kommunikation!"
       notice: "Yay! Deine E-Mail wurde gesendet."
       error: "Bitte fülle alle Felder aus, damit die Speakerin alle Informationen bekommt, die sie benötigt."
       error_email_for_us: "Bitte fülle alle Felder aus."

config/locales/contact.en.yml

@@ -10,7 +10,9 @@ en:
       send: "Send"
       body: "Your message"
       body_placeholder: "Please give a few details about your request: where, when, what, and other relevant information."
-      read_code_of_conduct: "Does this mail comply with our code of conduct? Thank you for an respectful and friendly communication!"
+      read_code_of_conduct_prefix: "Does this mail comply with our"
+      read_code_of_conduct_link: "code of conduct"
+      read_code_of_conduct_suffix: "? Thank you for a respectful and friendly communication!"
       notice: "Yay! Your message was sent."
       error: "Please fill all fields so that the speaker can have all the details she needs."
       error_email_for_us: "Please fill all fields."

spec/system/searching_for_profiles_spec.rb

@@ -26,7 +26,7 @@
       end
 
       it 'shows button search' do
-        expect(page).to have_selector(".container #{form_selector} input[type='submit']")
+        expect(page).to have_selector(".container #{form_selector} button[type='submit']")
       end
     end