From bda4314030be5f81aeaf2fb1927aee582f1194d9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 28 Oct 2017 16:27:54 +0200 Subject: [PATCH] Edit theme to represent pvv --- README.md | 10 +- themes/{fyrkat => pvv}/core/loginuserpass.php | 8 +- themes/{fyrkat => pvv}/default/error.php | 2 +- .../default/includes/footer.php | 0 .../default/includes/header.php | 0 www/auth.css | 4 +- www/fyrkat.svg | 19 --- www/logo.svg | 141 ++++++++++++++++++ www/{fyrkat.css => style.css} | 12 +- 9 files changed, 161 insertions(+), 35 deletions(-) rename themes/{fyrkat => pvv}/core/loginuserpass.php (95%) rename themes/{fyrkat => pvv}/default/error.php (98%) rename themes/{fyrkat => pvv}/default/includes/footer.php (100%) rename themes/{fyrkat => pvv}/default/includes/header.php (100%) delete mode 100644 www/fyrkat.svg create mode 100644 www/logo.svg rename www/{fyrkat.css => style.css} (96%) diff --git a/README.md b/README.md index 8c5d6e6..5c68eaa 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,17 @@ -# fyrkat theme for SimpleSamlPhp +# PVV theme for SimpleSamlPhp + +This has been forked from [fyrkat/ssp-theme](https://github.com/fyrkat/ssp-theme) Clone this repo to your modules directory - git clone https://github.com/fyrkat/ssp-theme.git themefyrkat + git clone https://github.com/Programvareverkstedet/ssp-theme themepvv Make the following changes in your SSP setup: ## config/config.php 'module.enable' => [ - 'themefyrkat' => TRUE, + 'themepvv' => TRUE, ], - 'theme.use' => 'themefyrkat:fyrkat', + 'theme.use' => 'themepvv:pvv', diff --git a/themes/fyrkat/core/loginuserpass.php b/themes/pvv/core/loginuserpass.php similarity index 95% rename from themes/fyrkat/core/loginuserpass.php rename to themes/pvv/core/loginuserpass.php index 8c3aa3d..ba1c8a2 100644 --- a/themes/fyrkat/core/loginuserpass.php +++ b/themes/pvv/core/loginuserpass.php @@ -1,9 +1,9 @@ <?php echo $this->t('{login:user_pass_header}'); ?> - - - + + + data['header'] = $this->t('{login:user_pass_header}'); @@ -114,7 +114,7 @@ if (!empty($this->data['links'])) { echo ''; } ?> - + <?php echo $this->t($this->data['dictTitle']); ?> - + data['header'] = $this->t($this->data['dictTitle']); diff --git a/themes/fyrkat/default/includes/footer.php b/themes/pvv/default/includes/footer.php similarity index 100% rename from themes/fyrkat/default/includes/footer.php rename to themes/pvv/default/includes/footer.php diff --git a/themes/fyrkat/default/includes/header.php b/themes/pvv/default/includes/header.php similarity index 100% rename from themes/fyrkat/default/includes/header.php rename to themes/pvv/default/includes/header.php diff --git a/www/auth.css b/www/auth.css index 66230d1..8a28ea9 100644 --- a/www/auth.css +++ b/www/auth.css @@ -9,7 +9,7 @@ body { padding: 2em 0 0 0; } #loginform h1 { - background: url('fyrkat.svg') no-repeat 0 0; + background: url('logo.svg') no-repeat 0 0; background-size: fill; padding-top: 18em; font-size: 1em; @@ -35,6 +35,7 @@ form .inputstack p input { border: .1em solid #aaa; border-top: none; width: 12.8rem; + outline: none; } form .inputstack p:first-child input { border-top: .1em solid #aaa; @@ -48,4 +49,5 @@ form .inputstack p:last-child input { width: 14rem; display: block; margin: 0 auto; + outline: none; } diff --git a/www/fyrkat.svg b/www/fyrkat.svg deleted file mode 100644 index a478dca..0000000 --- a/www/fyrkat.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/www/logo.svg b/www/logo.svg new file mode 100644 index 0000000..c186631 --- /dev/null +++ b/www/logo.svg @@ -0,0 +1,141 @@ + + + +image/svg+xml diff --git a/www/fyrkat.css b/www/style.css similarity index 96% rename from www/fyrkat.css rename to www/style.css index 33eabce..d8c4fc9 100644 --- a/www/fyrkat.css +++ b/www/style.css @@ -21,7 +21,7 @@ main { min-height: 40em; } nav { - background: url('fyrkat.svg') no-repeat 0 0; + background: url('logo.svg') no-repeat 0 0; background-size: contain; position: absolute; width: 15em; @@ -120,23 +120,23 @@ form input[type=submit] { /* remove explicit width, add padding */ border: none; cursor: pointer; border-radius: .3em; - background: #084; + background: #048; color: #fff; - box-shadow: #063 0 3px 0; + box-shadow: #036 0 3px 0; padding: 1em 2.5em .8em 2.5em; } form input[type=submit].disabled, form input[type=submit].disabled:active { color: #ddd; - background: #576; + background: #567; cursor: default; /* border-bottom: .2em solid #254 !important; */ - box-shadow: #254 0 3px 0; + box-shadow: #245 0 3px 0; top: 0 !important; } form input[type=submit]:active, form input[type=submit].active { position: relative; top: 1px; - box-shadow: #063 0 2px 0; + box-shadow: #036 0 2px 0; } .input-group input[type=radio] {