diff --git a/dist/habillage.css b/dist/habillage.css
index 5700e43017000fb0bc17686cf4ac5ebb9a5bbc52..440207d020b82c2e9b4ca35fbfc8d6d4f3c2bf43 100755
--- a/dist/habillage.css
+++ b/dist/habillage.css
@@ -335,7 +335,7 @@ ul.forum { display: block; clear: both; margin: 0; padding: 0; }
/* Boite d'un forum : eclaircissement progressif des bords */
-ul .message { border: 1px solid #666; margin: 0; padding: 0; margin-bottom: 1em; }
+ul .message { border: 1px solid #666666; margin: 0; padding: 0; margin-bottom: 1em; }
ul ul .message { border: 1px solid #A4A4A4; }
ul ul ul .message { border: 1px solid #B8B8B8; }
ul ul ul ul .message { border: 1px solid #CCCCCC; }
diff --git a/dist/login.html b/dist/login.html
index 79208beb61b5362b78a017137a9203ab5935b599..e6db043723c6a442b85cf1b6c74354b053ca6399 100644
--- a/dist/login.html
+++ b/dist/login.html
@@ -14,7 +14,7 @@
]</head>
<body style="background: #FFF; text-align: center;">
-<div id="contenu" style="width: 400px; margin: auto; padding: 3em 0;">
+<div class="formulaire_spip formulaire_login">
<h3 class="spip">#NOM_SITE_SPIP<br />
<small><:login_acces_prive:></small>
@@ -25,19 +25,9 @@
[(#LOGIN_PRIVE)]
<p>
-
-[[<a style="color: #e86519"
- href="#URL_PAGE{spip_inscription,focus=nom_inscription}&mode=(#URL_SITE_SPIP|tester_config{mode_inscription})"
- target="spip_pass"
- onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=500'); return false;"><:login_sinscrire:></a>]]
-
-[<a style="color: #e86519"
- href="#URL_PAGE{spip_pass}"
- target="spip_pass"
- onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=280'); return false;"><:login_motpasseoublie:></a>]
-
-[<a style="color: #e86519" href="#URL_SITE_SPIP/"><:login_retoursitepublic:></a>]
-
+ [[<a href="#URL_PAGE{spip_inscription,focus=nom_inscription}&mode=(#URL_SITE_SPIP|tester_config{mode_inscription})" target="spip_pass" onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=500'); return false;"><:login_sinscrire:></a>]]
+ [<a href="#URL_PAGE{spip_pass}" target="spip_pass" onclick="javascript:window.open(this.href, 'spip_pass', 'scrollbars=yes, resizable=yes, width=480, height=280'); return false;"><:login_motpasseoublie:></a>]
+ [<a href="#URL_SITE_SPIP/"><:login_retoursitepublic:></a>]
</p>
</div>
diff --git a/dist/spip_style.css b/dist/spip_style.css
index 620acb5c82ae4ebbf15fba05d1d8618ef3585816..a3448a287e68a686cbcad1bafcf3b1d97d99fe12 100644
--- a/dist/spip_style.css
+++ b/dist/spip_style.css
@@ -99,7 +99,7 @@ form, fieldset, legend, label, input, textarea, select, option {
#contenu .formulaire_spip * *{ font-size: 1em; }
.formulaire_spip p {
- margin: 4px 0;
+ margin: 0.5em 0;
padding: 0; }
.formulaire_spip fieldset, .spip_encadrer {
@@ -113,19 +113,21 @@ form, fieldset, legend, label, input, textarea, select, option {
.spip_sanscadre { border: 0; }
.spip_sanscadre legend { display: none; }
+.formulaire_spip label {}
.forml {
width: 99%;
background: #FCFCF0;
padding: 1px;
- border: 1px solid #666;
- color: #000; }
+ border: 1px solid #666666;
+ color: #333333; }
+.forml:focus { background: #FFF; border: 1px solid #000; color: #000; }
input.spip_bouton {
float: right;
- background: #666;
+ background: #666666;
margin: 3px 0;
padding: 1px 2px;
- border: 2px outset #666;
+ border: 2px outset #666666;
font-weight: bold;
color: #FFF; }
@@ -140,13 +142,13 @@ fieldset.reponse_formulaire legend { font-weight: normal; }
fieldset.reponse_formulaire p { padding: 4px; }
/* * Previsualisation du message */
-.previsu {
+fieldset.previsu {
background: #FFF;
margin-bottom: 16px;
padding: 12px;
- border: 1px solid #666;
+ border: 1px solid #666666;
color: #000; }
-.previsu .titre {
+fieldset.previsu .titre {
font-weight: bold;
font-size: 1.18em; }
@@ -186,14 +188,17 @@ div.choix_mots label { display: inline; }
float: right;
text-align: left;
width: 12em;
- font-size: 0.71em; }
+ /*font-size: 0.71em;*/ }
.formulaire_menu_lang label { display: none; }
+.formulaire_menu_lang select { padding: 0; margin: 0; }
/* Formulaire de login
----------------------------------------------- */
-.formulaire_login { clear: both; font-size: 0.88em; }
-.formulaire_login .forml { width: 12em; }
-.formulaire_login .spip_logos { float: right; padding-left: 10px; }
+.formulaire_login { clear: both; font-size: 0.90em; text-align: center; width: 400px; margin: 0 auto; padding: 3em 0; }
+.formulaire_login fieldset { width: 100%; clear: both; text-align: left; }
+.formulaire_login .forml, .formulaire_login_forum .forml { width: 12em; }
+.formulaire_login .spip_logos, .formulaire_login_forum .spip_logos { float: right; padding-left: 10px; }
+.formulaire_login a { color: #e86519; }
/* ------------------------------------------ */
/* Couleurs des liens
diff --git a/formulaires/formulaire_login.html b/formulaires/formulaire_login.html
index 25128256bbc5b8e43df3c9027274a029eb3bd067..1e49969c8692064308477a23ad3dd5433b0fecf7 100644
--- a/formulaires/formulaire_login.html
+++ b/formulaires/formulaire_login.html
@@ -1,11 +1,12 @@
#HTTP_HEADER{"Cache-Control: no-store, no-cache, must-revalidate"}
#HTTP_HEADER{"Pragma: no-cache"}
[(#ENV{echec_cookie})
- <h3 class="spip"><:avis_erreur_cookie:></h3>
- <strong><:login_cookie_oblige:></strong>
- <:login_cookie_accepte:>]
+<fieldset class="reponse_formulaire">
+<legend><:avis_erreur_cookie:></legend>
+<p><:login_cookie_oblige:></p>
+<p><:login_cookie_accepte:></p>
+</fieldset>]
-<div class="formulaire_spip formulaire_login">
<script type="text/javascript" src="#EVAL{_DIR_IMG_PACK}md5.js"></script>
<form id="login[_(#ENV{login})]"
action="[(#ENV{action2})]"
@@ -15,28 +16,28 @@
this.next_session_password_md5.value = calcMD5("[(#ENV{alea_futur})]" + this.session_password.value);
this.session_password.value = "";
}']>
- <fieldset class="spip_encadrer" style="[(#URL_SITE_SPIP|style_align)]">
+ <fieldset class="spip_encadrer">
<legend><:form_forum_identifiants:></legend>
[<p class="reponse_formulaire">(#ENV*{erreur})</p>]
- [<p><label for="var_login"><:login_login2:></label>(#ENV{login}|?{'',' '})
+ [<p><label for="var_login"><:login_login2:></label><br />(#ENV{login}|?{'',' '})
<input type="text" class="forml" id="var_login" name="var_login" value="" size="40" /></p>]
[
[(#LOGO_AUTEUR||reduire_image{100,80}|inserer_attribut{alt,#ENV{login_alt}})]
<input type="hidden" name="session_login_hidden" value="(#ENV{login})" />
<script type="text/javascript"><!--
-document.write("<:login_login:> <strong>[(#ENV{login_alt})]<" + "/strong> [<a style='color: #e86519' href='[(#ENV{action2}
+document.write("<:login_login:> <strong>[(#ENV{login_alt})]<" + "/strong><br />[<a style='color: #e86519' href='[(#ENV{action2}
|parametre_url{cookie_admin,non}
|parametre_url{url,#ENV*{url}}
|parametre_url{retour,#ENV*{self}})]'><:login_autre_identifiant:><" + "/a>]")
//--></script>
<noscript>
<p class="reponse_formulaire"><:login_non_securise:> <a href="[(#ENV{action})]"><:login_recharger:></a>.</p>
- <p><label for="session_login"><:login_login2:></label>
+ <p><label for="session_login"><:login_login2:></label><br />
<input type="text" class="forml" name="session_login" id="session_login"[ value="(#ENV{login})"] size="40" /></p>
</noscript>
- <p><label[ for="var_login_(#ENV{login})"]><:login_pass2:></label>
+ <p><label[ for="var_login_(#ENV{login})"]><:login_pass2:></label><br />
<input type="password" class="forml" name="session_password"[ id="var_login_(#ENV{login})"] value="" size="20" /></p>
<p><input type="checkbox" name="session_remember" id="session[_(#ENV{login})]" value="oui"[(#ENV*{prefs}|filtre_rester_connecte)checked="checked"]/>
<label for="session[_(#ENV{login})]"><:login_rester_identifie:></label></p>
@@ -61,6 +62,4 @@ document.getElementById('var_login[_(#ENV{login})]').focus();
<input type="submit" class="spip_bouton" value="<:login_sans_cookiie:>"/>
</fieldset>
</form>
-]
-<br class="nettoyeur" />
-</div>
\ No newline at end of file
+]
\ No newline at end of file