summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-10-03 00:32:33 +0000
committerGo MAEDA <maeda@farend.jp>2019-10-03 00:32:33 +0000
commitcffc5d6a12add6b058fbfb79b807637f138a3061 (patch)
treea7c4c5168b18fbc964579029f1f4a0489dfd93e6
parent3ce678510e96fa0ce5459e6b7731878347f686b2 (diff)
downloadredmine-cffc5d6a12add6b058fbfb79b807637f138a3061.tar.gz
redmine-cffc5d6a12add6b058fbfb79b807637f138a3061.zip
Add styles for Textile/Markdown attachments preview (#29752).
Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@18585 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/common/_markup.html.erb2
-rw-r--r--public/stylesheets/application.css7
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/common/_markup.html.erb b/app/views/common/_markup.html.erb
index dc6c7f474..14786a87c 100644
--- a/app/views/common/_markup.html.erb
+++ b/app/views/common/_markup.html.erb
@@ -1,3 +1,3 @@
-<div class="wiki">
+<div class="filecontent wiki">
<%= Redmine::WikiFormatting.to_html(markup_text_formatting, Redmine::CodesetUtil.to_utf8_by_setting(markup_text)).html_safe %>
</div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5f8ade106..28465feb4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1740,6 +1740,13 @@ img {
max-width: 100%;
}
+.filecontent-container > .filecontent.wiki {
+ position: relative;
+ padding: 1em;
+ border: 1px solid #e4e4e4;
+ border-radius: 3px;
+}
+
/* Fixes for IE 11 */
@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
select::-ms-expand {