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

This commit is contained in:
Martin Edenhofer 2016-05-12 11:25:15 +02:00
commit c093d9fd8a

View file

@ -8124,16 +8124,63 @@ output {
animation: pulsate 667ms ease-in-out infinite alternate; animation: pulsate 667ms ease-in-out infinite alternate;
} }
.richtext-content pre { .richtext-content {
padding: 15px; p, table, pre {
font-size: 13px; margin-bottom: 16px;
line-height: 1.45;
margin: 10px 0;
background: hsl(0,0%,97%); &:first-child {
white-space: pre-wrap; margin-top: 6px;
border-radius: 3px; }
border: none;
overflow: auto; &:last-child {
margin-bottom: 6px;
}
}
table {
border: none;
table-layout: auto;
display: block;
width: 100%;
overflow: auto;
word-break: keep-all;
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;
}
pre {
padding: 15px;
font-size: 13px;
line-height: 1.45;
background: hsl(0,0%,97%);
white-space: pre-wrap;
border-radius: 3px;
border: none;
overflow: auto;
}
} }
/* /*