Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add richtext-content class for richtext formating

Browse source 
and style <pre>
This commit is contained in:
Felix Niklas 2016-05-12 10:48:28 +02:00
parent 640e8cbbe8
commit a082e6ca14
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/views/generic/richtext.jst.eco
View file

@ -1,3 +1,3 @@
<div class="richtext form-control"> <div class="richtext form-control">
<div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="<%= @attribute.class %>"><%- @attribute.value %></div> <div contenteditable="true" id="<%= @attribute.id %>" data-name="<%= @attribute.name %>" class="richtext-content <%= @attribute.class %>"><%- @attribute.value %></div>
</div> </div>

2
app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
View file

@ -50,7 +50,7 @@
<div class="textBubble js-writeArea"> <div class="textBubble js-writeArea">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="js-textarea articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div> <div class="js-textarea richtext-content articleNewEdit-body" contenteditable="true" data-name="body"><%- @article.body %></div>
<!-- .textBubble grows with textarea (and expanding clone) --> <!-- .textBubble grows with textarea (and expanding clone) -->
<div class="textBubble-footer js-textSizeLimit"> <div class="textBubble-footer js-textSizeLimit">
<div class="textBubble-signatur"><span class="js-signature"></span></div> <div class="textBubble-signatur"><span class="js-signature"></span></div>

2
app/assets/javascripts/app/views/ticket_zoom/article_view.jst.eco
View file

@ -41,7 +41,7 @@
<div class="textBubble"> <div class="textBubble">
<div class="bubble-arrow"></div> <div class="bubble-arrow"></div>
<div class="textBubble-content" id="article-content-<%= @article.id %>" data-id="<%= @article.id %>"> <div class="textBubble-content" id="article-content-<%= @article.id %>" data-id="<%= @article.id %>">
<%- @article.html %> <div class="richtext-content"><%- @article.html %></div>
<div class="textBubble-overflowContainer hide"> <div class="textBubble-overflowContainer hide">
<div class="btn btn--text js-unfold"><%- @T('See more') %></div> <div class="btn btn--text js-unfold"><%- @T('See more') %></div>
</div> </div>

12
app/assets/stylesheets/zammad.scss
View file

@ -8124,6 +8124,18 @@ output {
animation: pulsate 667ms ease-in-out infinite alternate; animation: pulsate 667ms ease-in-out infinite alternate;
} }
.richtext-content pre {
padding: 15px;
font-size: 13px;
line-height: 1.45;
margin: 10px 0;
background: hsl(0,0%,97%);
white-space: pre-wrap;
border-radius: 3px;
border: none;
overflow: auto;
}
/* /*
---------------- ----------------