Commit 19b6e675 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.0.x' into prod/1.0.x

parents bcbc4daa 58510cee
......@@ -7,9 +7,11 @@
font-family: Typ1451-Regular,verdana,sans-serif;
width: 100%;
}
.cke_editable .caption > * {
display: inline-block;
}
.cke_editable .caption {
width: 98%;
}
......@@ -32,101 +34,162 @@ kbd > kbd {
background: #575757;
color: #ffffff;
}
/*list types*/
ul {
list-style-type: disc;
margin: 0 0 1rem;
padding: 0 0 0 1.5rem; }
padding: 0 0 0 1.5rem;
}
[dir='rtl'] ul {
padding: 0 1.5rem 0 0; }
padding: 0 1.5rem 0 0;
}
ul ul {
list-style-type: circle;
margin: 0.5rem 0 0; }
margin: 0.5rem 0 0;
}
ul ul li > ul {
list-style-type: disc; }
list-style-type: disc;
}
.disc {
list-style: disc; }
list-style: disc;
}
.disc ul {
list-style-type: disc; }
list-style-type: disc;
}
.disc ul li > ul {
list-style-type: disc; }
list-style-type: disc;
}
.square {
list-style: square; }
list-style: square;
}
.square ul {
list-style-type: square; }
list-style-type: square;
}
.square ul li > ul {
list-style-type: square; }
list-style-type: square;
}
.circle {
list-style-type: circle; }
list-style-type: circle;
}
.circle ul {
list-style-type: circle; }
list-style-type: circle;
}
.circle ul li > ul {
list-style-type: circle; }
list-style-type: circle;
}
ol {
margin: 0 0 1rem;
padding: 0 0 0 1.5rem; }
padding: 0 0 0 1.5rem;
}
[dir='rtl'] ol {
padding: 0 1.5rem 0 0; }
padding: 0 1.5rem 0 0;
}
ol ol {
list-style-type: lower-alpha;
margin: 0.5rem 0 0; }
margin: 0.5rem 0 0;
}
ol ol li ol {
list-style-type: lower-roman; }
list-style-type: lower-roman;
}
.lower-alpha {
list-style-type: lower-alpha; }
list-style-type: lower-alpha;
}
.lower-alpha li ol {
list-style-type: lower-alpha; }
list-style-type: lower-alpha;
}
.upper-alpha {
list-style-type: upper-alpha; }
list-style-type: upper-alpha;
}
.upper-alpha li ol {
list-style-type: upper-alpha; }
list-style-type: upper-alpha;
}
.lower-roman {
list-style-type: lower-roman; }
list-style-type: lower-roman;
}
.lower-roman li ol {
list-style-type: lower-roman; }
list-style-type: lower-roman;
}
.upper-roman {
list-style-type: upper-roman; }
list-style-type: upper-roman;
}
.upper-roman li ol {
list-style-type: upper-roman; }
list-style-type: upper-roman;
}
.decimal {
list-style: decimal outside none;
margin: 0;
padding: 0 0 1rem 1rem; }
padding: 0 0 1rem 1rem;
}
.decimal li {
counter-increment: item;
display: table;
margin: 0.5rem 0; }
margin: 0.5rem 0;
}
.decimal li::before {
content: counters(item, ".") ". ";
display: table-cell;
padding-right: 0.6rem; }
padding-right: 0.6rem;
}
.decimal li li {
margin: 0.5rem 0; }
margin: 0.5rem 0;
}
.decimal li li li::before {
content: counters(item, ".") " "; }
content: counters(item, ".") " ";
}
.decimal li ol {
counter-reset: item;
list-style: square outside none;
list-style-type: none;
margin: 0;
padding: 0; }
padding: 0;
}
li {
margin-bottom: 0.5rem;
padding-left: 0.5rem; }
padding-left: 0.5rem;
}
li:last-child {
margin-bottom: 0; }
margin-bottom: 0;
}
li > *:last-child {
margin-bottom: 0; }
margin-bottom: 0;
}
@media print {
li {
page-break-inside: avoid; } }
page-break-inside: avoid;
}
}
{#
/**
* @file
* Theme override for a field.
*/
#}
{%
set classes = [
'uw-field',
'uw-field--name-' ~ field_name|clean_class,
'uw-field--type-' ~ field_type|clean_class,
'uw-field--label-' ~ label_display,
]
%}
{%
set title_classes = [
'uw-field__label',
label_display == 'visually_hidden' ? 'visually-hidden',
]
%}
{% for item in items %}{% if loop.index0 > 0 %},&nbsp;{% endif %}<a href="{{ file_url(item.content['#file'].uri.value) }}">{{ item.content['#file'].filename.value }}</a>{% endfor %}
{#
/**
* @file bibcite-reference-table.html.twig
* Theme implementation to present Reference data in table.
*
* Available variables:
* - title_prefix: Additional output populated by modules, intended to be
* displayed in front of the main title tag that appears in the template.
* - title_suffix: Additional output populated by modules, intended to be
* displayed after the main title tag that appears in the template.
* - content: All reference items. Use {{ content }} to print them all,
* or print a subset such as {{ content.field_example }}. Use
* {{ content|without('field_example') }} to temporarily suppress the printing
* of a given child element.
* - attributes: HTML attributes for the container element.
* - bibcite_reference: The bibcite_reference entity with limited access to object properties and methods.
* - view_mode: View mode; for example, "teaser" or "full".
* - rows: Data rows.
*
* @see template_preprocess_bibcite_reference_table()
*
* @ingroup themeable
*/
#}
{% set new_rows = [] %}
{% set related_files = [] %}
{% set links = [] %}
{% for row in rows %}
{% if row.element['#type'] and row.element['#type'] == 'form' %}
{{ row.element }}
{% elseif row.element['#field_name'] == 'related_files' %}
{% set related_files = row %}
{% elseif row.element.links %}
{% set links = row %}
{% else %}
{% set new_rows = new_rows | merge([row]) %}
{% endif %}
{% endfor %}
{% if related_files | length > 0 %}
{% set new_rows = new_rows | merge([related_files]) %}
{% endif %}
{% if links | length > 0 %}
{% set new_rows = new_rows | merge([links]) %}
{% endif %}
{% set rows = new_rows %}
<div{{ attributes }}>
{{ title_prefix }}
{{ title_suffix }}
<table>
{% if rows %}
<tbody>
<tr{{ row.attributes.addClass(row_classes) }}>
<th scope="row">Title</th>
<td>{{ title }}</td>
</tr>
{% for row in rows %}
{% set row_classes = [
not no_striping ? cycle(['odd', 'even'], loop.index0),
] %}
<tr{{ row.attributes.addClass(row_classes) }}>
<th scope="row">{{- row.title -}}</th>
<td>{{- row.element -}}</td>
</tr>
{% endfor %}
</tbody>
{% endif %}
</table>
</div>
......@@ -12,6 +12,8 @@
* @see template_preprocess_region()
*/
#}
{% set search = drupal_form('Drupal\\uw_cfg_common\\Form\\UwSearchForm') %}
{% include '@layouts/header/header.twig' with {
'site_name': site_name,
'faculty': faculty,
......@@ -19,5 +21,6 @@
'nav_items': main_menu,
'secondary_items': secondary_menu,
'home_link': home_link,
'global_message': global_message
'global_message': global_message,
'search': search
}%}
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