Commit 58510cee authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-5607-ebremner-bibcite-content-moderation' into '1.0.x'

ISTWCMS-5607: fixing content moderation block on references

See merge request !75
parents b938bf5c a6b01dd3
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
font-family: Typ1451-Regular,verdana,sans-serif; font-family: Typ1451-Regular,verdana,sans-serif;
width: 100%; width: 100%;
} }
.cke_editable .caption > * { .cke_editable .caption > * {
display: inline-block; display: inline-block;
} }
.cke_editable .caption { .cke_editable .caption {
width: 98%; width: 98%;
} }
...@@ -32,101 +34,162 @@ kbd > kbd { ...@@ -32,101 +34,162 @@ kbd > kbd {
background: #575757; background: #575757;
color: #ffffff; color: #ffffff;
} }
/*list types*/ /*list types*/
ul { ul {
list-style-type: disc; list-style-type: disc;
margin: 0 0 1rem; margin: 0 0 1rem;
padding: 0 0 0 1.5rem; } padding: 0 0 0 1.5rem;
}
[dir='rtl'] ul { [dir='rtl'] ul {
padding: 0 1.5rem 0 0; } padding: 0 1.5rem 0 0;
}
ul ul { ul ul {
list-style-type: circle; list-style-type: circle;
margin: 0.5rem 0 0; } margin: 0.5rem 0 0;
}
ul ul li > ul { ul ul li > ul {
list-style-type: disc; } list-style-type: disc;
}
.disc { .disc {
list-style: disc; } list-style: disc;
}
.disc ul { .disc ul {
list-style-type: disc; } list-style-type: disc;
}
.disc ul li > ul { .disc ul li > ul {
list-style-type: disc; } list-style-type: disc;
}
.square { .square {
list-style: square; } list-style: square;
}
.square ul { .square ul {
list-style-type: square; } list-style-type: square;
}
.square ul li > ul { .square ul li > ul {
list-style-type: square; } list-style-type: square;
}
.circle { .circle {
list-style-type: circle; } list-style-type: circle;
}
.circle ul { .circle ul {
list-style-type: circle; } list-style-type: circle;
}
.circle ul li > ul { .circle ul li > ul {
list-style-type: circle; } list-style-type: circle;
}
ol { ol {
margin: 0 0 1rem; margin: 0 0 1rem;
padding: 0 0 0 1.5rem; } padding: 0 0 0 1.5rem;
}
[dir='rtl'] ol { [dir='rtl'] ol {
padding: 0 1.5rem 0 0; } padding: 0 1.5rem 0 0;
}
ol ol { ol ol {
list-style-type: lower-alpha; list-style-type: lower-alpha;
margin: 0.5rem 0 0; } margin: 0.5rem 0 0;
}
ol ol li ol { ol ol li ol {
list-style-type: lower-roman; } list-style-type: lower-roman;
}
.lower-alpha { .lower-alpha {
list-style-type: lower-alpha; } list-style-type: lower-alpha;
}
.lower-alpha li ol { .lower-alpha li ol {
list-style-type: lower-alpha; } list-style-type: lower-alpha;
}
.upper-alpha { .upper-alpha {
list-style-type: upper-alpha; } list-style-type: upper-alpha;
}
.upper-alpha li ol { .upper-alpha li ol {
list-style-type: upper-alpha; } list-style-type: upper-alpha;
}
.lower-roman { .lower-roman {
list-style-type: lower-roman; } list-style-type: lower-roman;
}
.lower-roman li ol { .lower-roman li ol {
list-style-type: lower-roman; } list-style-type: lower-roman;
}
.upper-roman { .upper-roman {
list-style-type: upper-roman; } list-style-type: upper-roman;
}
.upper-roman li ol { .upper-roman li ol {
list-style-type: upper-roman; } list-style-type: upper-roman;
}
.decimal { .decimal {
list-style: decimal outside none; list-style: decimal outside none;
margin: 0; margin: 0;
padding: 0 0 1rem 1rem; } padding: 0 0 1rem 1rem;
}
.decimal li { .decimal li {
counter-increment: item; counter-increment: item;
display: table; display: table;
margin: 0.5rem 0; } margin: 0.5rem 0;
}
.decimal li::before { .decimal li::before {
content: counters(item, ".") ". "; content: counters(item, ".") ". ";
display: table-cell; display: table-cell;
padding-right: 0.6rem; } padding-right: 0.6rem;
}
.decimal li li { .decimal li li {
margin: 0.5rem 0; } margin: 0.5rem 0;
}
.decimal li li li::before { .decimal li li li::before {
content: counters(item, ".") " "; } content: counters(item, ".") " ";
}
.decimal li ol { .decimal li ol {
counter-reset: item; counter-reset: item;
list-style: square outside none; list-style: square outside none;
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
padding: 0; } padding: 0;
}
li { li {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
padding-left: 0.5rem; } padding-left: 0.5rem;
}
li:last-child { li:last-child {
margin-bottom: 0; } margin-bottom: 0;
}
li > *:last-child { li > *:last-child {
margin-bottom: 0; } margin-bottom: 0;
}
@media print { @media print {
li { li {
page-break-inside: avoid; } } page-break-inside: avoid;
}
}
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
{% set links = [] %} {% set links = [] %}
{% for row in rows %} {% for row in rows %}
{% if row.element['#field_name'] == 'related_files' %} {% if row.element['#type'] and row.element['#type'] == 'form' %}
{{ row.element }}
{% elseif row.element['#field_name'] == 'related_files' %}
{% set related_files = row %} {% set related_files = row %}
{% elseif row.element.links %} {% elseif row.element.links %}
{% set links = row %} {% set links = row %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment