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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2016-05-12 16:54:43 +02:00
commit 85a8d5fe02
2 changed files with 88 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4430,12 +4430,6 @@ footer {
p {
margin: 0;
}
blockquote,
pre {
margin: 0px;
padding: 8px 12px 8px 12px;
}
}
.ticket-article-item.state--folde-out .textBubble {
@ -5278,7 +5272,7 @@ footer {
}
& > .box {
flex: 1;
width: calc(50% - 47px);
margin: 34px;
}
@ -5288,6 +5282,7 @@ footer {
}
.boxFade {
width: 94px;
top: 34px;
height: 100%;
position: absolute;
@ -8125,10 +8120,17 @@ output {
}
.richtext-content {
p, table, pre {
p,
table,
pre,
blockquote {
margin-bottom: 16px;
}
& > p,
& > table,
& > pre,
& > blockquote {
&:first-child {
margin-top: 6px;
}
@ -8165,6 +8167,11 @@ output {
}
}
blockquote {
padding: 8px 12px;
border-left: 5px solid #eee;
}
code {
border: none;
background: hsl(0,0%,97%);
@ -8172,7 +8179,7 @@ output {
}
pre {
padding: 15px;
padding: 12px 15px;
font-size: 13px;
line-height: 1.45;
background: hsl(0,0%,97%);

65
app/models/channel/email_build.rb
View file

@ -115,7 +115,7 @@ module Channel::EmailBuild
content_disposition: attachment.preferences['Content-Disposition'] || 'attachment',
content_type: attachment.preferences['Content-Type'],
mime_type: attachment.preferences['Mime-Type'],
content: attachment.content,
content: attachment.content
}
end
end
@ -147,37 +147,74 @@ Check if string is a complete html document. If not, add head and css styles.
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<style type="text/css">
body {
width:90% !important;
-webkit-text-size-adjust:90%;
-ms-text-size-adjust:90%;
width: 90% !important;
-webkit-text-size-adjust: 90%;
-ms-text-size-adjust: 90%;
#{css};
}
img {
outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;
outline: none;
text-decoration: none;
-ms-interpolation-mode: bicubic;
}
a img {
border:none;
border: none;
}
table td {
border-collapse: collapse;
}
table {
border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;
border-collapse: collapse;
mso-table-lspace: 0pt;
mso-table-rspace: 0pt;
border: none;
table-layout: auto;
display: block;
width: 100%;
overflow: auto;
word-break: keep-all;
}
p, table, div, td {
max-width: 600px;
}
p {
margin: 0;
p,
table,
pre,
blockquote {
margin: 0 0 16px;
}
td, th {
padding: 7px 12px;
border: 1px solid hsl(0,0%,87%);
}
th {
font-weight: bold;
text-align: center;
}
tbody tr:nth-child(even) {
background: hsl(0,0%,97%);
}
col {
width: auto;
}
code {
border: none;
background: hsl(0,0%,97%);
white-space: normal;
}
blockquote {
border-left: 2px solid blue;
margin: 0px;
padding: 8px 12px 8px 12px;
padding: 8px 12px;
border-left: 5px solid #eee;
}
pre {
margin: 0px;
padding: 8px 12px 8px 12px;
padding: 12px 15px;
font-size: 13px;
line-height: 1.45;
background: hsl(0,0%,97%);
white-space: pre-wrap;
border-radius: 3px;
border: none;
overflow: auto;
}
</style>
<head>