From fb3b904b8ffbe65ba11ed68252cdb441421b9a2b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 4 Feb 2012 17:36:15 +0000
Subject: Better handling of issue update conflicts (#8691).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'public')

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ea4fc0410..d0043fa11 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -518,7 +518,7 @@ input#principal_search, input#user_search {width:100%}
 * html div#tab-content-members fieldset div { height: 450px; }
 
 /***** Flash & error messages ****/
-#errorExplanation, div.flash, .nodata, .warning {
+#errorExplanation, div.flash, .nodata, .warning, .conflict {
     padding: 4px 4px 4px 30px;
     margin-bottom: 12px;
     font-size: 1.1em;
@@ -541,7 +541,7 @@ div.flash.notice {
     color: #005f00;
 }
 
-div.flash.warning {
+div.flash.warning, .conflict {
     background: url(../images/warning.png) 8px 5px no-repeat;
     background-color: #FFEBC1;
     border-color: #FDBF3B;
@@ -561,6 +561,8 @@ span.error {padding-left:20px; background:url(../images/exclamation.png) no-repe
 #errorExplanation ul { font-size: 0.9em;}
 #errorExplanation h2, #errorExplanation p { display: none; }
 
+.conflict-details {font-size:80%;}
+
 /***** Ajax indicator ******/
 #ajax-indicator {
 position: absolute; /* fixed not supported by IE */
-- 
cgit v1.2.3