From d2a0b127cb9d5a81bc4ef082af7f3ce6186dc534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarje=20S=C3=A6len=20Lavik?= <Tarje.Lavik@ub.uib.no>
Date: Fri, 22 Apr 2016 14:25:18 +0200
Subject: [PATCH] =?UTF-8?q?La=20til=20klasse=20p=C3=A5=20div=20rundt=20dec?=
=?UTF-8?q?ode-filter=20og=20treffer=20p:first-child.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/services/collections/html.template | 2 +-
.../conceptscheme%2Fbilledsamlingens-emneord/html.template | 2 +-
components/services/conceptscheme/html.template | 2 +-
components/services/conceptschemes/html.template | 2 +-
components/services/exhibition/html.template | 2 +-
components/services/exhibitions/html.template | 2 +-
components/services/instance%2Fcataloguecard/html.template | 2 +-
components/services/instance%2Fcollection/html.template | 2 +-
components/services/instance%2Fcompany/html.template | 2 +-
components/services/instance%2Fevent/html.template | 2 +-
components/services/instance%2Fperson/html.template | 2 +-
components/services/instance%2Fship/html.template | 2 +-
components/static/css/basic.css | 3 ++-
13 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/components/services/collections/html.template b/components/services/collections/html.template
index 47cc9af6..8bd66b27 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 62cd7011..38f09d57 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 a30b11b2..0b34c8c1 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 dabbf7a1..94e75826 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 2ab2e253..387cba80 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 760192a2..b16c2f34 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 14d4b549..f770dfe1 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 8b56ce70..26779a1c 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 7d915d1f..f4ba4165 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 2cc439ef..90fb5351 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 b1a3895d..b0c5e392 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 363fc061..ed093565 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 0f327dbd..b6f97c5c 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;}
--
GitLab