Merge pull request #2731 from mlorb/ml-sci-4567-v2

Fix Settings pages titles [SCI-4567]

app/assets/stylesheets/global_activities.scss

@@ -9,7 +9,6 @@
   display: flex;
   flex-direction: column;
   height: calc(100vh - 89px);
-  margin-top: 2em;
   padding: 0 15px;
 
   &.task-activities {
@@ -19,9 +18,8 @@
   .ga-top {
     .ga-title {
       border-bottom: 1px solid $color-gainsboro;
-      height: 35px;
+      margin-top: 14px;
-      margin: 20px -15px 0;
+      padding: 15px 0;
-      padding: 0 0 10px 15px;
       position: relative;
       width: calc(100% + 30px);
     }

app/assets/stylesheets/my_modules/protocols/index.scss

@@ -10,6 +10,10 @@
   padding: 10px;
 }
 
+.content-pane.protocols-repository-edit-view {
+  margin: 0;
+}
+
 .task-section {
   border-left: 3px solid $color-concrete;
   margin: 16px 0;

app/assets/stylesheets/settings/addons.scss

@@ -0,0 +1,11 @@
+.user-account-addons {
+  .content-pane {
+    margin: 0;
+    padding-top: 0;
+  }
+
+  .addons-title {
+    border-bottom: $border-tertiary;
+    padding-bottom: 15px;
+  }
+}

app/assets/stylesheets/settings/connected_accounts.scss

@@ -1,3 +1,14 @@
+.user-account-connected-accounts {
+  .tab-pane-settings {
+    padding-top: 0;
+  }
+
+  .connected-accounts-title {
+    border-bottom: $border-tertiary;
+    padding-bottom: 15px;
+  }
+}
+
 .connected-account {
   border: $border-default;
   border-radius: $border-radius-default;

app/assets/stylesheets/settings/preferences.scss

@@ -5,6 +5,16 @@
 @import "mixins";
 
 .user-account-preferences {
+  .content-pane {
+    margin: 0;
+    padding-top: 0;
+  }
+
+  .preferences-title {
+    border-bottom: $border-tertiary;
+    padding-bottom: 15px;
+  }
+
   .time-zone-container {
     margin-bottom: 10px;
     max-width: 450px;

app/assets/stylesheets/shared/content_pane.scss

@@ -10,7 +10,7 @@
 
   .content-header {
     align-items: center;
-    border-bottom: $border-default;
+    border-bottom: $border-tertiary;
     display: flex;
     height: 5em;
 

app/assets/stylesheets/steps.scss

@@ -61,9 +61,9 @@
     }
 
     span.step-number {
-      font-size: 24px;
+      font-size: 16px;
       font-weight: bold;
-      margin: 0 10px;
+      margin: 0 5px 0 10px;
       min-width: fit-content;
     }
 

app/views/steps/_step.html.erb

@@ -11,7 +11,7 @@
           <span class="fas fa-caret-square-down collapse-step-icon"></span>
         </a>
 
-        <span class="step-number"><%= step.position + 1 %></span>
+        <span class="step-number"><%= step.position + 1 %>.</span>
 
         <a class="step-panel-collapse-link step-name-link"
            href="#step-panel-<%= step.id || step.position %>"

app/views/users/settings/account/addons/index.html.erb

@@ -2,12 +2,12 @@
 <% provide(:container_class, "no-second-nav-container") %>
 
 <%= render partial: 'users/settings/sidebar.html.erb' %>
-<div class="tab-content">
+<div class="tab-content user-account-addons">
   <div class="tab-pane content-pane active" role="tabpanel">
 
     <div class="row">
       <div class="col-xs-12 col-sm-12">
-        <h1><%= t('users.settings.account.addons.title') %></h1>
+        <h1 class="addons-title"><%= t('users.settings.account.addons.title') %></h1>
         <div data-hook="settings-addons-container">
           <em data-hook="settings-addons-no-addons">
             <%= t('users.settings.account.addons.no_addons') %>

app/views/users/settings/account/connected_accounts/index.html.erb

@@ -1,12 +1,13 @@
 <% provide(:head_title, t("users.settings.account.connected_accounts.head_title")) %>
+<% provide(:container_class, "no-second-nav-container") %>
 
 <%= render partial: "users/settings/sidebar.html.erb" %>
-<div class="tab-content">
+<div class="tab-content user-account-connected-accounts">
   <div class="tab-pane tab-pane-settings active" role="tabpanel">
 
     <div class="row">
       <div class="col-xs-12 col-sm-12">
-        <h1><%= t('users.settings.account.connected_accounts.title') %></h1>
+        <h1 class="connected-accounts-title"><%= t('users.settings.account.connected_accounts.title') %></h1>
 
         <% if @linked_accounts.any? %>
           <% @linked_accounts.each do |provider| %>

app/views/users/settings/account/preferences/index.html.erb

@@ -7,7 +7,7 @@
 
     <div class="row">
       <div class="col-xs-12 col-sm-12">
-        <h1><%= t('users.settings.account.preferences.title') %></h1>
+        <h1 class="preferences-title"><%= t('users.settings.account.preferences.title') %></h1>
         <div class="time-zone-container">
           <%= label_tag t("users.settings.account.preferences.edit.time_zone_label") %>
           <div class="time-zone-selector-container">

config/locales/en.yml

@@ -1090,7 +1090,7 @@ en:
         import_items: 'Import items'
         export_items: 'Export items'
         rename: "Rename inventory"
-        copy: "Copy inventory"
+        copy: "Duplicate inventory"
         delete: "Delete inventory"
         archive: 'Archive inventory'
         restore: 'Restore inventory'
@@ -1687,7 +1687,7 @@ en:
       account:
         preferences:
           head_title: "Settings | My preferences"
-          title: "Preferences"
+          title: "My preferences"
           edit:
             time_zone_label: "Time zone"
             time_zone_sublabel: "Time zone setting affects all time & date fields throughout application."