From 0e9c93d83db14609eea7306f9cd3f2764eaa5511 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Wed, 14 Feb 2018 12:56:31 +0000
Subject: [PATCH] Move some inline styling to the proper css place.
---
modules/core/templates/_frontpage_menu.twig | 2 +-
modules/core/templates/frontpage_config.twig | 2 +-
.../core/templates/frontpage_federation.twig | 12 +++---
www/assets/css/src/default.css | 39 ++++++++++++++-----
4 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/modules/core/templates/_frontpage_menu.twig b/modules/core/templates/_frontpage_menu.twig
index 8e07bda1b..7b363ffaf 100644
--- a/modules/core/templates/_frontpage_menu.twig
+++ b/modules/core/templates/_frontpage_menu.twig
@@ -1,4 +1,4 @@
-<div class="pure-g">
+<div class="pure-g frontpage-menu">
<div class="pure-u-2-3">
<div class="pure-menu pure-menu-horizontal">
<ul class="pure-menu-list">
diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index 691e4e5ed..21a65bbfd 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -5,7 +5,7 @@
{% block content %}
{% include "@core/_frontpage_menu.twig" %}
- <div style="margin-top: 1em;">
+ <div>
<code class="simplesaml_version">{{ directory }} ({{ version }})</code>
</div>
diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index ef21bbead..35acde2d6 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -11,18 +11,18 @@
{% set metadataset = attribute(set, 'metadata-set') %}
<dt>{{ mtype[metadataset]|trans }}</dt>
<dd>
- <p>Entity ID: {{ set.entityid }}
+ <p>Entity ID: <code>{{ set.entityid }}</code>
{% if set.deprecated is defined and set.deprecated %}
- <br /><span style="font-weight: bold;">Deprecated</span>
+ <br /><span class="entity-deprecated">Deprecated</span>
{% endif %}
{% if set.entityid != attribute(set, 'metadata-index') %}
<br />Index: {{ attribute(set, 'metadata-index') }}
{% endif %}
{% if set.name_translated is defined %}
- <br /><span style="font-weight: bold;">{{ set.name_translated }}</span>
+ <br /><span class="entity-name">{{ set.name_translated }}</span>
{% endif %}
{% if set.descr_translated is defined %}
- <br /><span style="font-weight: bold;">{{ set.descr_translated }}</span>
+ <br /><span class="entity-name">{{ set.descr_translated }}</span>
{% endif %}
<br />[ <a href="{{ attribute(set, 'metadata-url') }}">{{'{core:frontpage:show_metadata}'|trans }}</a> ]
</p>
@@ -47,7 +47,7 @@
{%- if entity.expire is defined %}
{% if entity.expire > date().timestamp %}
- <span style="color: #500; font-weight: bold"> (expired {{ ((date().timestamp - entity.expire) / 3600) }} hours ago)</span>
+ <span class="entity-expired"> (expired {{ ((date().timestamp - entity.expire) / 3600) }} hours ago)</span>
{% else %} (expires in {{ ((entity.expire - date().timestamp) / 3600) }} hours){% endif -%}{% endif %}
</li>
{% endfor %}
@@ -67,7 +67,7 @@
<fieldset class="fancyfieldset">
<legend>Lookup metadata</legend>
<form action="{{ metadata_url }}" method="get">
- <p style="margin: 1em 2em ">Look up metadata for entity:
+ <p>Look up metadata for entity:
<select name="set">
{% if metaentries.remote is defined and metaentries.remote is not empty %}
{% for key, set in metaentries.remote %}
diff --git a/www/assets/css/src/default.css b/www/assets/css/src/default.css
index bf67a925c..ae1ae6ef3 100644
--- a/www/assets/css/src/default.css
+++ b/www/assets/css/src/default.css
@@ -608,26 +608,47 @@ code.simplesaml_version {
color: #555;
}
.float-r {
- float: right;
+ float: right;
}
.enablebox table {
- border: 1px solid #eee;
+ border: 1px solid #eee;
- margin-left: 1em;
+ margin-left: 1em;
}
.enablebox.mini table {
- float: right;
+ float: right;
}
.enablebox tr td {
- padding: .5px 1em 1px .5em;
- margin: 0px;
+ padding: .5px 1em 1px .5em;
+ margin: 0px;
}
.enablebox {
- font-size: 85%;
+ font-size: 85%;
}
.enablebox tr.enabled td {
- background: #eee;
+ background: #eee;
}
.enablebox tr.disabled td {
- background: #ccc;
+ background: #ccc;
+}
+fieldset.fancyfieldset {
+ margin: 2em 1em 1em 0px;
+ border: 1px solid #bbb;
+}
+fieldset.fancyfieldset legend {
+ margin-left: 2em;
+ padding: 3px 2em 3px 2em;
+ border: 1px solid #bbb;
+}
+dt {
+ font-weight: bold;
+}
+.frontpage-menu {
+ margin-bottom: 1em;
+}
+.entity-name, .entity-deprecated, .entity-expired {
+ font-weight: bold;
+}
+.entity-expired {
+ color: #500;
}
--
GitLab