From a0c085f9492929c7b2bd6ada5cd1186d3133a44e Mon Sep 17 00:00:00 2001 From: Arno Renevier Date: Thu, 11 Aug 2011 18:38:55 +0200 Subject: [PATCH 1/1] fixes css regression in newpwd, contact and account --- application/views/scripts/account/success.phtml | 2 +- application/views/scripts/contact/success.phtml | 2 +- application/views/scripts/error/error.phtml | 2 +- application/views/scripts/newpwd/success.phtml | 2 +- public/css/account.css | 6 ++++++ public/css/contact.css | 6 ++++++ public/css/generic.css | 1 + public/css/list.css | 1 - public/css/newpwd.css | 6 ++++++ public/css/syj.css | 2 +- 10 files changed, 24 insertions(+), 6 deletions(-) diff --git a/application/views/scripts/account/success.phtml b/application/views/scripts/account/success.phtml index a749df7..2295c4b 100644 --- a/application/views/scripts/account/success.phtml +++ b/application/views/scripts/account/success.phtml @@ -1,4 +1,4 @@ -

+

redirectLinks = false; echo $this->translate("Your account was modified successfully"); diff --git a/application/views/scripts/contact/success.phtml b/application/views/scripts/contact/success.phtml index d770d8c..221b1ef 100644 --- a/application/views/scripts/contact/success.phtml +++ b/application/views/scripts/contact/success.phtml @@ -1,4 +1,4 @@ -

+

redirectLinks = false; echo $this->translate("Email was send successfully"); diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml index d42e82e..d567c2f 100644 --- a/application/views/scripts/error/error.phtml +++ b/application/views/scripts/error/error.phtml @@ -29,7 +29,7 @@ -

+

isServerError) { echo $this->translate('Please try again later'); diff --git a/application/views/scripts/newpwd/success.phtml b/application/views/scripts/newpwd/success.phtml index 01b4b34..69013b3 100644 --- a/application/views/scripts/newpwd/success.phtml +++ b/application/views/scripts/newpwd/success.phtml @@ -1,4 +1,4 @@ -

+

redirectLinks = false; echo $this->translate("A link to reset your password has been emailed to you"); diff --git a/public/css/account.css b/public/css/account.css index 158d102..4050d07 100644 --- a/public/css/account.css +++ b/public/css/account.css @@ -1,6 +1,12 @@ /* This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier, and is published under the AGPL license. */ +#message { + width: 80%; + margin-left: auto; + margin-right: auto; +} + /* * form */ diff --git a/public/css/contact.css b/public/css/contact.css index 597c0bb..f7f0d9c 100644 --- a/public/css/contact.css +++ b/public/css/contact.css @@ -6,6 +6,12 @@ body { padding: 0px; } +#message { + width: 80%; + margin-left: auto; + margin-right: auto; +} + /* * form */ diff --git a/public/css/generic.css b/public/css/generic.css index 43c3da8..e0dcb81 100644 --- a/public/css/generic.css +++ b/public/css/generic.css @@ -18,6 +18,7 @@ body, html { border-radius: 5px; border-width: 2px; border-style: solid; + padding: 1.5em; transition:opacity 0.5s; -webkit-transition:opacity 0.5s; -moz-transition:opacity 0.5s; diff --git a/public/css/list.css b/public/css/list.css index cd3467b..12e1a5b 100644 --- a/public/css/list.css +++ b/public/css/list.css @@ -71,7 +71,6 @@ #message { width: 40%; margin: 20px auto 20px auto; - padding: 1.5em 1.5em 1.5em 1.5em; } #other-language { diff --git a/public/css/newpwd.css b/public/css/newpwd.css index d5fcc5d..15ab533 100644 --- a/public/css/newpwd.css +++ b/public/css/newpwd.css @@ -1,6 +1,12 @@ /* This file is part of Syj, Copyright (c) 2010-2011 Arnaud Renevier, and is published under the AGPL license. */ +#message { + width: 80%; + margin-left: auto; + margin-right: auto; +} + #newpwdform { width: 40em; } diff --git a/public/css/syj.css b/public/css/syj.css index 51061b9..a78a52f 100644 --- a/public/css/syj.css +++ b/public/css/syj.css @@ -38,7 +38,7 @@ body, html { bottom: 3.5em; width: 40%; margin: 0px 45% 0px 15%; - padding: 1.5em 1.5em 0.5em 1.5em; + padding-bottom: 0.5em; } @media screen and (max-width: 640px) { #message.optional { -- 2.39.5