diff --git a/components/services/collections/html.template b/components/services/collections/html.template index 47cc9af6aaae758c22982ffb68db52079a1317c3..8bd66b270ac9e0933d80f7a4572d5267808a42f9 100755 --- a/components/services/collections/html.template +++ b/components/services/collections/html.template @@ -24,7 +24,7 @@ </div> <div class="col-md-9 col-sm-9 col-lg-9"> <h3><a href="{{ row.uri.value }}">{{ row.label.value }}</a></h3> - <div>{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description">{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div> </div> </div> diff --git a/components/services/conceptscheme%2Fbilledsamlingens-emneord/html.template b/components/services/conceptscheme%2Fbilledsamlingens-emneord/html.template index 62cd70116e335e8381443efc7933fa022d1b5626..38f09d57a6482f91603f1e5d730b30e6c557f6d3 100644 --- a/components/services/conceptscheme%2Fbilledsamlingens-emneord/html.template +++ b/components/services/conceptscheme%2Fbilledsamlingens-emneord/html.template @@ -20,7 +20,7 @@ <div class="col-md-9"> <h1>{% for row in models.main %}{% if row.title && row.title.value != "" %}{{row.title.value}}{% else %}{% if row.label && row.label.value != "" %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}{% endfor %} <span class="badge">{{ first.count.total.value }} topptermer</span></h1> - <div>{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> {% if first.haspart.uri.value != null %} diff --git a/components/services/conceptscheme/html.template b/components/services/conceptscheme/html.template index a30b11b251a2bc16c001ff9e5f95f173c871cb70..0b34c8c13688756f43f23f3e3539f3ed8fe344de 100755 --- a/components/services/conceptscheme/html.template +++ b/components/services/conceptscheme/html.template @@ -42,7 +42,7 @@ <div class="col-md-9"> <h1>{% for row in models.main %}{% if row.title && row.title.value != "" %}{{row.title.value}}{% else %}{% if row.label && row.label.value != "" %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}{% endfor %} <span class="badge">{{ first.count.total.value }}</span></h1> - <div>{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> <hr> {% if lodspk.query %} <h2>/ <small>"{{lodspk.query}}"</small></h2> {%else%}{%endif%} {% if lodspk.query %} diff --git a/components/services/conceptschemes/html.template b/components/services/conceptschemes/html.template index dabbf7a1252660df5d839fbe36483f46f464c5af..94e758264f41d31d04b7751d9b4a92afa802a3ae 100755 --- a/components/services/conceptschemes/html.template +++ b/components/services/conceptschemes/html.template @@ -26,7 +26,7 @@ </div> <div class="col-md-10 col-sm-10 col-lg-10"> <h3><a href="{{ row.uri.value }}">{{ row.label.value }}</a></h3> - <div>{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description">{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div> </div> </div> diff --git a/components/services/exhibition/html.template b/components/services/exhibition/html.template index 2ab2e2533aed9fdf8da17dfade22312f09f00431..387cba808b363465a9078fb86e7c5d5b8a470d16 100644 --- a/components/services/exhibition/html.template +++ b/components/services/exhibition/html.template @@ -21,7 +21,7 @@ <h2 itemprop="alternativeHeadline"><small>{{first.main.alternative.value}}</small></h2> {% endif %} {% endfor %} - <div itemprop="description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description" itemprop="description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> {% if models.producedin|length != 0 %} {% for row in models.producedin %} diff --git a/components/services/exhibitions/html.template b/components/services/exhibitions/html.template index 760192a29e1da3077d3a7dc5afe5efe0e6aba96d..b16c2f3401bf54da125f0bc30b3b36d69b3a7bf9 100644 --- a/components/services/exhibitions/html.template +++ b/components/services/exhibitions/html.template @@ -37,7 +37,7 @@ <div class="{% if row.logo %}col-md-9 col-sm-9 col-lg-9{% else %}col-sm-10 col-md-10{% endif %}"> <h3><a href="{{ row.uri.value }}">{{ row.label.value }}</a></h3> {% if row.alternative %}<h4>{{ row.alternative.value }}</h4>{% endif %} - <div>{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description">{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div> </div> </div> <div class="clearfix"></div> diff --git a/components/services/instance%2Fcataloguecard/html.template b/components/services/instance%2Fcataloguecard/html.template index 14d4b54918c9fb89180f4ee78b1d7da8eaa875d6..f770dfe1874d8eb1024ab62027c85b24cab6fcd0 100755 --- a/components/services/instance%2Fcataloguecard/html.template +++ b/components/services/instance%2Fcataloguecard/html.template @@ -75,7 +75,7 @@ {%endif%} {% for row in models.main %} - {% autoescape off %} <div>{{ row.description.value|decodedescription }}</div> {% endautoescape %} + {% autoescape off %} <div class="decode-description">{{ row.description.value|decodedescription }}</div> {% endautoescape %} {% endfor %} diff --git a/components/services/instance%2Fcollection/html.template b/components/services/instance%2Fcollection/html.template index 8b56ce70fcafb269f9263c6326fd35dc68184128..26779a1c5ccb383851450d566ac149b391ec4257 100755 --- a/components/services/instance%2Fcollection/html.template +++ b/components/services/instance%2Fcollection/html.template @@ -70,7 +70,7 @@ <h1><span itemprop="name">{% for row in models.main %}{% if row.title && row.title.value != "" %}{{row.title.value}}{% else %}{% if row.label && row.label.value != "" %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}{% endfor %}</span> <span class="badge">{{ first.count.total.value }}</span></h1> - <div itemprop="description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description" itemprop="description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> <hr> diff --git a/components/services/instance%2Fcompany/html.template b/components/services/instance%2Fcompany/html.template index 7d915d1f61794b4e610426b6e722872b746b491f..f4ba4165d688d259014cc90b2b56e2421eb81121 100755 --- a/components/services/instance%2Fcompany/html.template +++ b/components/services/instance%2Fcompany/html.template @@ -105,7 +105,7 @@ <h1>{{ row.name.value }} <span class="badge">{{ first.count.total.value }}</span></h1> {% endfor %} - <div> {% autoescape off %}{{first.main.description.value|decodedescription}}{% endautoescape %}</div> + <div class="decode-description"> {% autoescape off %}{{first.main.description.value|decodedescription}}{% endautoescape %}</div> {% if first.dbpedia.sameas.dbparticle != null %} <div class="well dbpedia"> diff --git a/components/services/instance%2Fevent/html.template b/components/services/instance%2Fevent/html.template index 2cc439efd89e444a955d1236cb8309eb5e575004..90fb5351550e5b1793c04c38e4dd17e98aa1415b 100755 --- a/components/services/instance%2Fevent/html.template +++ b/components/services/instance%2Fevent/html.template @@ -66,7 +66,7 @@ <h1>{% if first.main.title && first.main.title.value != "" %}{{first.main.title.value}}{% else %}{% if first.main.label && first.main.label.value != "" %}{{first.main.label.value}}{% else %} {{first.main.identifier.value}}{%endif%}{%endif%} <span class="badge">{{ first.count.total.value }}</span></h1> - <div>{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> + <div class="decode-description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div> {% if models.webresources|length != 0 %} <p class="text-center"><strong class="text-muted">Nettsider</strong><br> diff --git a/components/services/instance%2Fperson/html.template b/components/services/instance%2Fperson/html.template index b1a3895dc4029ae9513250d23ea73dd7e403c48d..b0c5e3928c79a0a72a6aa00760b199ace9338b39 100755 --- a/components/services/instance%2Fperson/html.template +++ b/components/services/instance%2Fperson/html.template @@ -143,7 +143,7 @@ </div> {% endif %} - {% if first.main.description.value %}<div itemprop="http://schema.org/description">{{first.main.description.value|decodedescription}}</div>{% endif %} + {% if first.main.description.value %}<div class="decode-description" itemprop="http://schema.org/description">{{first.main.description.value|decodedescription}}</div>{% endif %} <p>{% if first.main.altname %}Også kjent som: <ul class="list-inline text-muted">{% for row in models.main %}{% ifchanged row.name.value %}<li><i>{{row.altname.value}}</i></li>{% endifchanged %}{% endfor %}</ul>{% endif %}</p> diff --git a/components/services/instance%2Fship/html.template b/components/services/instance%2Fship/html.template index 363fc061460a9dd3ca6f047d1c656bd679197294..ed093565a937e09fb50b7bb10dfea62e151c0bf2 100644 --- a/components/services/instance%2Fship/html.template +++ b/components/services/instance%2Fship/html.template @@ -119,7 +119,7 @@ </div> {% endif %} - {% if first.main.description.value %}<div itemprop="http://schema.org/description">{{first.main.description.value|decodedescription}}</div>{% endif %} + {% if first.main.description.value %}<div class="decode-description" itemprop="http://schema.org/description">{{first.main.description.value|decodedescription}}</div>{% endif %} <p>{% if first.main.altname %}Også kjent som: <ul class="list-inline text-muted">{% for row in models.main %}{% ifchanged row.name.value %}<li><i>{{row.altname.value}}</i></li>{% endifchanged %}{% endfor %}</ul>{% endif %}</p> diff --git a/components/static/css/basic.css b/components/static/css/basic.css index 0f327dbd666eba8c689a80ccbeeff7e1c9dfbfc3..b6f97c5c3cfd4fbfa1c26759879432732ff3ffe2 100755 --- a/components/static/css/basic.css +++ b/components/static/css/basic.css @@ -1,6 +1,6 @@ .main-body { padding-bottom: 40px; } - .marcus-block-margin { + .marcus-block-margin { margin-top: 40px; padding-top: 30px; } @@ -129,6 +129,7 @@ } .lead-md { margin-bottom: 20px; font-size: 16.09999999998px; font-weight: 200; line-height: 1.4;} +.decode-description p:first-child { font-size: : 21px; } .bs-sidebar { position: fixed; top: 90px; width: 265px;} .bs-sidebar h3 {border-bottom: solid 1px #ddd; padding-bottom: 5px; font-size: 1.4em;}