Merge remote-tracking branch 'upstream/pull/2471'

diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss
index 6bbaecbe480f40a8a03473f69d3ba28ae37af1ae..96d37415f33054d54b3615d9c3342106b1a75659 100644 (file)
--- a/app/assets/stylesheets/_bootstrap-custom.scss
+++ b/app/assets/stylesheets/_bootstrap-custom.scss
@@ -29,7 +29,7 @@
 // @import "bootstrap/pagination";
 @import "bootstrap/badge";
 // @import "bootstrap/jumbotron";
-// @import "bootstrap/alert";
+@import "bootstrap/alert";
 // @import "bootstrap/progress";
 // @import "bootstrap/media";
 // @import "bootstrap/list-group";

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1e9b3b531506720629ac532ae85578ee186a619d..1c8fe29512c54929ecf9352f8cb07d76d0f0d114 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2842,12 +2842,6 @@ input.richtext_title[type="text"] {
 }
 
 .report-disclaimer {
-  background: #fff1f0;
-  color: #d85030;
-  border-color: rgba(216, 80, 48, 0.3);
-  padding: 10px 20px;
-  margin-bottom: $lineheight;
-
   ul {
     padding-left: $lineheight;
     margin-bottom: 0;

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index f152049ef51737d42d7a56ffeacf1bca6e05a7ac..599456db2ed1b37250408f9257a2e946b1068d38 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -2,7 +2,7 @@
   <h1><%= t ".title_html", :link => link_to(reportable_title(@report.issue.reportable), reportable_url(@report.issue.reportable)) %></h1>
 <% end %>
 
-<div class="report-disclaimer">
+<div class="alert alert-warning report-disclaimer">
   <%= t(".disclaimer.intro") %>
   <ul>
     <li> <%= t(".disclaimer.not_just_mistake") %> </li>