From 981f8678dfc96a1a787d8929d0033b9e4a7afb46 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mlorber@biosistemika.com>
Date: Tue, 21 Jan 2020 15:21:40 +0100
Subject: [PATCH] Fix alerts style

---
 app/assets/javascripts/application.js.erb     |  6 ++--
 .../shared_styles/elements/alerts.scss        | 31 ++++++++++++++++---
 .../stylesheets/themes/repositories.scss      |  2 +-
 .../_protocol_status_bar_buttons.html.erb     |  2 +-
 .../index/_import_results_modal.html.erb      |  4 +--
 .../index/_results_modal_body.html.erb        |  2 +-
 .../_delete_repository_modal.html.erb         |  2 +-
 .../_delete_column_modal_body.html.erb        |  3 +-
 app/views/shared/_flash_alerts.html.erb       |  2 +-
 .../_destroy_user_team_modal_body.html.erb    |  2 +-
 .../_leave_user_team_modal_body.html.erb      |  2 +-
 11 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 6d88c770d..aa1eb62ae 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -228,13 +228,13 @@ var HelperModule = (function(){
       fasSign = ' fa-check-circle ';
     } else if (type === 'danger') {
       alertType = ' alert-danger ';
-      fasSign = ' fa-exclamation-circle ';
+      fasSign = ' fa-exclamation-triangle ';
     } else if (type === 'info') {
       alertType = ' alert-info ';
-      fasSign = ' fa-exclamation-circle ';
+      fasSign = ' fa-info-circle ';
     } else if (type === 'warning') {
       alertType = ' alert-warning ';
-      fasSign = ' fa-exclamation-circle ';
+      fasSign = ' fa-exclamation-triangle ';
     }
     var htmlSnippet = '<div id="alert-flash" class="alert alert' + alertType +
                       'alert-dismissable alert-floating">' +
diff --git a/app/assets/stylesheets/shared_styles/elements/alerts.scss b/app/assets/stylesheets/shared_styles/elements/alerts.scss
index ccc39bc46..3e64f62a6 100644
--- a/app/assets/stylesheets/shared_styles/elements/alerts.scss
+++ b/app/assets/stylesheets/shared_styles/elements/alerts.scss
@@ -1,12 +1,15 @@
 .alert {
-  align-items: center;
   border-radius: 0;
-  display: flex;
-  height: 52px;
   margin-bottom: 0;
   opacity: .86;
-  padding: 9px;
   width: 100%;
+}
+
+.alert-floating {
+  align-items: center;
+  display: flex;
+  height: 52px;
+  padding: 9px;
 
   .fas {
     font-size: $font-size-h2;
@@ -23,3 +26,23 @@
     top: 0;
   }
 }
+
+.alert:not(.alert-floating) {
+  color: $color-volcano;
+
+  &.alert-danger .fas {
+    color: $brand-danger;
+  }
+
+  &.alert-warning .fas {
+    color: $brand-warning;
+  }
+
+  &.alert-info .fas {
+    color: $brand-info;
+  }
+
+  &.alert-success .fas {
+    color: $brand-success;
+  }
+}
diff --git a/app/assets/stylesheets/themes/repositories.scss b/app/assets/stylesheets/themes/repositories.scss
index 26d5d388d..a43094af5 100644
--- a/app/assets/stylesheets/themes/repositories.scss
+++ b/app/assets/stylesheets/themes/repositories.scss
@@ -32,7 +32,7 @@
 .custom-alert-info {
   background-color: $state-info-bg;
   border: 1px solid $state-info-border;
-  color: $state-info-text;
+  color: $color-volcano;
   margin: 10px 0;
   opacity: .86;
   padding: 15px;
diff --git a/app/views/my_modules/protocols/_protocol_status_bar_buttons.html.erb b/app/views/my_modules/protocols/_protocol_status_bar_buttons.html.erb
index df680f898..ba61a99a5 100644
--- a/app/views/my_modules/protocols/_protocol_status_bar_buttons.html.erb
+++ b/app/views/my_modules/protocols/_protocol_status_bar_buttons.html.erb
@@ -106,7 +106,7 @@
       <a type="button" class="btn btn-warning link-button" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
         <span class="fas fa-book"></span>
         &nbsp;
-        <span class="fas fa-exclamation-circle"></span>
+        <span class="fas fa-exclamation-triangle"></span>
       </a>
       <a type="button" class="btn btn-warning dropdown-toggle link-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <span class="caret"></span>
diff --git a/app/views/protocols/index/_import_results_modal.html.erb b/app/views/protocols/index/_import_results_modal.html.erb
index 4df31cbb4..c4e95d997 100644
--- a/app/views/protocols/index/_import_results_modal.html.erb
+++ b/app/views/protocols/index/_import_results_modal.html.erb
@@ -19,7 +19,7 @@
 <!-- (THIS IS UGLY) -->
 <div data-template="import-result-message-error" style="display: none;">
   <div class="alert alert-danger" style="margin-bottom: 15px;" role="alert">
-    <span class="fas fa-exclamation-circle"></span>
+    <span class="fas fa-exclamation-triangle"></span>
     <span data-val="message"></span>
   </div>
 </div>
@@ -57,4 +57,4 @@
     &nbsp;
     <span data-val="message2"></span>
   </li>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/protocols/index/_results_modal_body.html.erb b/app/views/protocols/index/_results_modal_body.html.erb
index a97ab534d..fc0f0af78 100644
--- a/app/views/protocols/index/_results_modal_body.html.erb
+++ b/app/views/protocols/index/_results_modal_body.html.erb
@@ -5,7 +5,7 @@
 
 <% if failed.count > 0 %>
   <div class="alert alert-danger" style="margin-bottom: 15px;" role="alert">
-    <span class="fas fa-exclamation-circle"></span>
+    <span class="fas fa-exclamation-triangle"></span>
     <%= t("protocols.index.#{en_action}.message_failed", nr: failed.count) %>
   </div>
 <% end %>
diff --git a/app/views/repositories/_delete_repository_modal.html.erb b/app/views/repositories/_delete_repository_modal.html.erb
index 4a2a4c762..79621fbaf 100644
--- a/app/views/repositories/_delete_repository_modal.html.erb
+++ b/app/views/repositories/_delete_repository_modal.html.erb
@@ -10,7 +10,7 @@
       <div class="modal-body">
         <p><%= t("repositories.index.modal_delete.message_html", name: @repository.name) %></p>
         <div class="alert alert-danger" role="alert">
-          <span class="fas fa-exclamation-circle"></span>
+          <span class="fas fa-exclamation-triangle"></span>
           &nbsp;
           <%= t("repositories.index.modal_delete.alert_heading") %>
           <ul>
diff --git a/app/views/repository_columns/_delete_column_modal_body.html.erb b/app/views/repository_columns/_delete_column_modal_body.html.erb
index 72c98f703..764e23599 100644
--- a/app/views/repository_columns/_delete_column_modal_body.html.erb
+++ b/app/views/repository_columns/_delete_column_modal_body.html.erb
@@ -11,7 +11,8 @@
   <div class="delete-content"
     <p><%= t("repositories.modal_delete_column.message", column: @repository_column.name) %></p>
     <div class="alert alert-danger" role="alert">
-      <span class="fas fa-exclamation-circle"></span>
+      <span class="fas fa-exclamation-triangle"></span>
+      &nbsp;
       <%= t("repositories.modal_delete_column.alert_heading") %>
       <ul>
         <li><%= t("repositories.modal_delete_column.alert_line_1", nr: @repository_column.repository_cells.count) %></li>
diff --git a/app/views/shared/_flash_alerts.html.erb b/app/views/shared/_flash_alerts.html.erb
index a2121f550..6e05d6185 100644
--- a/app/views/shared/_flash_alerts.html.erb
+++ b/app/views/shared/_flash_alerts.html.erb
@@ -15,7 +15,7 @@
   <% end %>
   <% if alert and !alert.empty? or flash[:error]%>
   <div id="alert-flash" class="alert alert-danger alert-dismissable alert-floating">
-      <span class="fas fa-exclamation-circle"></span>
+      <span class="fas fa-exclamation-triangle"></span>
       <span class="message"><%= alert || sanitize_input(flash[:error]) %></span>
       <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
   </div>
diff --git a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
index b77e2f226..535b0401d 100644
--- a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
@@ -8,7 +8,7 @@
            team: user_team.team.name) %></p>
   <% if user_team.user.confirmed? %>
     <div class="alert alert-danger" role="alert">
-      <span class="fas fa-exclamation-circle"></span>
+      <span class="fas fa-exclamation-triangle"></span>
       &nbsp;
       <%= t("users.settings.user_teams.destroy_uo_alert_heading") %>
       <ul>
diff --git a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
index 3701a7aa3..3fe325a4b 100644
--- a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
@@ -6,7 +6,7 @@
   <%= hidden_field_tag :leave, true %>
   <p><%= t("users.settings.user_teams.leave_uo_message", team: user_team.team.name) %></p>
   <div class="alert alert-danger" role="alert">
-    <span class="fas fa-exclamation-circle"></span>
+    <span class="fas fa-exclamation-triangle"></span>
     &nbsp;
     <%= t("users.settings.user_teams.leave_uo_alert_heading") %>
     <ul>