From 0a10d2c8e7fa2eb165571e4705d888e1c136242d Mon Sep 17 00:00:00 2001 From: Thijs Kinkhorst <thijs@kinkhorst.com> Date: Wed, 14 Feb 2018 12:43:04 +0000 Subject: [PATCH] Copy some of the enablebox styles to new css. This makes the appearance at least acceptable. --- modules/core/templates/frontpage_config.twig | 4 +-- www/assets/css/src/default.css | 32 ++++++++++++++++++++ www/resources/default.css | 22 -------------- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig index 1d599c424..691e4e5ed 100644 --- a/modules/core/templates/frontpage_config.twig +++ b/modules/core/templates/frontpage_config.twig @@ -6,13 +6,13 @@ {% include "@core/_frontpage_menu.twig" %} <div style="margin-top: 1em;"> - <code style="background: white; background: #f5f5f5; border: 1px dotted #bbb; padding: 1em; color: #555" >{{ directory }} ({{ version }})</code> + <code class="simplesaml_version">{{ directory }} ({{ version }})</code> </div> {% set icon_enabled = '<img src="/' ~ baseurlpath ~ 'resources/icons/silk/accept.png" alt="enabled" />' %} {% set icon_disabled = '<img src="/' ~ baseurlpath ~ 'resources/icons/silk/delete.png" alt="disabled" />' %} - <div style="clear: both" class="enablebox mini"> + <div class="enablebox mini"> <table> <tr class="{%- if enablematrix.saml20idp %}enabled{% else %}disabled{% endif -%}"> <td>SAML 2.0 IdP</td> diff --git a/www/assets/css/src/default.css b/www/assets/css/src/default.css index dee63a056..bf67a925c 100644 --- a/www/assets/css/src/default.css +++ b/www/assets/css/src/default.css @@ -598,4 +598,36 @@ MEDIA QUERIES } } +/************************************************* + * Specifics for modules/core/frontpage* + ************************************************/ +code.simplesaml_version { + background: #f5f5f5; + border: 1px dotted #bbb; + padding: 1em; + color: #555; +} +.float-r { + float: right; +} +.enablebox table { + border: 1px solid #eee; + margin-left: 1em; +} +.enablebox.mini table { + float: right; +} +.enablebox tr td { + padding: .5px 1em 1px .5em; + margin: 0px; +} +.enablebox { + font-size: 85%; +} +.enablebox tr.enabled td { + background: #eee; +} +.enablebox tr.disabled td { + background: #ccc; +} diff --git a/www/resources/default.css b/www/resources/default.css index 3c0371bb5..b6ea1c4b4 100644 --- a/www/resources/default.css +++ b/www/resources/default.css @@ -261,28 +261,6 @@ div.caution { th.rowtitle { text-align: left; } -.enablebox table { - border: 1px solid #eee; - - margin-left: 1em; -} -.enablebox.mini table { - float: right; -} -.enablebox tr td { - padding: .5px 1em 1px .5em; - margin: 0px; -} -.enablebox { - font-size: 85%; -} -.enablebox tr.enabled td { - background: #eee; -} -.enablebox tr.disabled td { - background: #ccc; -} - .metadatabox { overflow: scroll; border: 1px solid #eee; -- GitLab