diff --git a/dist/habillage.css b/dist/habillage.css index e0f66673d950cf9047d06956ab53c7ed42afffcd..0ce4ae7830a6c2240e2f64d015df1aa49b48fbbf 100755 --- a/dist/habillage.css +++ b/dist/habillage.css @@ -6,22 +6,24 @@ /* Disposition a l'ecran des blocs principaux ---------------------------------------------- */ body { background: #FFF; margin: 0; padding: 0; text-align: center; } + div#page { width: 48em; margin: 0 auto; text-align: left; } + div#top { margin: 0; border-bottom: 2px solid #666699; line-height: 5em; } div#top #nom_site_spip, #top a .spip_logos { display: block; float: left; font-weight: bold; font-size: 1.5em; } div#top .formulaire_recherche { float: right; width: 30%; background: 0; margin: 0; padding: 0; } +div#top .formulaire_recherche label { display: none; } div#top #nom_site_spip, div#top .formulaire_recherche {} + div#conteneur { width: 100%; } div#contenu { float: left; width: 65%; padding-top: .3em; } + div#navigation { float: right; width: 30%; } div#extra { float: right; clear: right; width: 30%; } + div#pied { clear: both; width: 100%; margin: 1em 0; border-top: 2px solid #666699; text-align: center; } div#pied img { vertical-align: bottom; } -/* Couleurs temporaires */ -/*#navigation { background: #B9CAFF; } -#extra { background: #FF8539; }*/ - /* Espaceur de blocs */ .nettoyeur { clear: both; margin: 0; padding: 0; border: none; height: 0; line-height: 1px; font-size: 1px; } @@ -33,54 +35,37 @@ div#pied img { vertical-align: bottom; } ---------------------------------------------- */ body { font-size: 100%; font-family: Verdana, Tahoma, Geneva, sans-serif; color: #333; } #top, #contenu, #navigation, #extra, #pied { font-size: .82em; } -/*#hierarchie, .formulaire_spip, .menu, .texte, .ps, .notes, .repondre, .forum, .traductions, .hyperlien, small, #pied { font-family: Verdana, Tahoma, Geneva, sans-serif; font-size: .9em; }*/ +.texte, .ps, .notes, .introduction, h3 { font-family: Georgia, Times, serif; } -/* Blocs du contenu ----------------------------------------------- */ -/* Fil d'Ariane */ -#hierarchie { clear: both; margin-bottom: 2em; font-size: 0.77em; color: #666; } - -.surtitre, .soustitre { font-size: 0.90em; text-transform: uppercase; color: #666; color: #CCCC66; } - -.cartouche { margin-bottom: 2em; } -.cartouche .spip_logos { float: right; margin-left: 16px; margin-bottom: 4px; } -.cartouche p { margin: 0; padding: 0; clear: left; } -.cartouche .traductions { font-size: 0.77em; } -.cartouche .traductions * { display: inline; } -.cartouche .traductions li { padding-left: 1em; } - -.chapo { margin-bottom: 1.5em; font-weight: bold; line-height: 1.4em; color: #666699; } -.texte { line-height: 1.4em; color: #000; } -.ps, .notes { margin-bottom: 2em; } -.notes { clear: both; } - -.hyperlien { display: block; background: #EEE; padding: .5em 1em; font-weight: bold; } - - -/* Correction des styles HTML par defaut +/* Personnalisation des styles HTML par defaut ---------------------------------------------- */ /* Titraille */ -h1 { margin: 0; font-family: "Trebuchet MS", Helvetica, sans-serif; font-size: 1.5em; font-weight: bold; color: #000; } -h2 { margin: 0; padding: .2em; background: #666699; font-family: "Trebuchet MS", Helvetica, sans-serif; font-size: 1em; font-weight: normal; text-transform: uppercase; letter-spacing: .1em; } +h1,h2 { font-family: "Trebuchet MS", Helvetica, sans-serif; } +h1 { margin: 0; font-size: 1.5em; font-weight: bold; color: #000; } +h2 { margin: 0; padding: .2em; background: #666699; font-size: 1em; font-weight: normal; text-transform: uppercase; letter-spacing: .1em; } h2, h2 a, h2 a:hover { color: #EEE; } -h3 { margin: 2em 0 1em 0; border-bottom: 2px solid #CCCC66; color: #CCCC66; font-size: 1.2em; font-weight: bold; font-family: Georgia, Times, serif; } -h3.spip {} +h3 { margin: 2em 0 1em 0; border-bottom: 2px solid #CCCC66; font-size: 1.1em; font-weight: bold; } +h3.spip { color: #CCCC66; } /* Divers */ +abbr, acronym { border-bottom: 1px dotted; cursor: help; } small { font-size: 0.71em; color: #666; } /* Attention : en dessous de 0.71em le texte devient illisible en text smallest sur MSIE */ /* Listes SPIP */ -.spip_puce { list-style-position: outside; } +/*.spip_puce { list-style-position: outside; }*/ +ul.spip {} +ol.spip {} /* Citations, code et poesie */ blockquote { padding-left: 1em; border-left: 4px solid #DDD; } .spip_poesie { margin: 1em 3em; padding-left: 1em; border-left: 1px solid #CCC; font-family: Garamond, Georgia, Times, serif; } .spip_poesie div { text-indent: -60px; margin-left: 60px; } -.spip_code, .spip_cadre { margin-bottom: 1em; font-family: "Courier New", Courier, mono; font-size: 1.1em; font-style: normal; color: #009; } +code, .spip_cadre { font-family: "Courier New", Courier, mono; font-size: 1.1em; color: #009; } +div.spip_code, .spip_cadre { margin-bottom: 1em; } /* Tableaux */ table { border-collapse: collapse; border-spacing: 0; } @@ -93,7 +78,7 @@ table.spip th, table.spip td { text-align: left; border: 2px solid #FFF; } table.spip th { padding: .2em; vertical-align: middle; font-weight: bold; } table.spip td { padding: .4em; vertical-align: top; } -/* Images et documents */ +/* Logos, documents et images */ img, .spip_logos { margin: 0; padding: 0; border: none; } .spip_documents { text-align: center; line-height: normal; color: #666; } @@ -108,55 +93,48 @@ span.spip_documents_center { display: block; margin-top: 1em; } /* Images typographiques (via image_typo), URL a revoir... */ .format_png { behavior: url(win_png.htc); } -/* Portfolio */ -#documents_portfolio { clear: both; margin-top: 1.4em; margin-bottom: 2em; text-align: center; } -#documents_portfolio .spip_logos { margin: .1em; } -#document_actif { margin-top: 1em; } - -/* Habillage des sommaires et menus +/* Blocs et elements du contenu ---------------------------------------------- */ -/* Habillage general des menus de navigation */ -.menu { clear: both; margin-bottom: 2em; text-align: left; } -#contenu .menu { /*font-size: 0.82em;*/ } -#navigation .menu { min-width: 10em; /*font-size: 0.77em;*/ } -#navigation .menu a { } +#hierarchie { clear: both; margin-bottom: 2em; font-size: 0.77em; color: #666; } -.menu p { margin: .2em 0; padding: .2em .1em; } -.menu ul { margin: 0; padding: 0; list-style: none; } -.menu ul li { margin: .2em 0; padding: .2em .1em; border-bottom: 1px solid #DDD; } -.menu ul li ul { margin-left: 1em; } -.menu ul li li { border: 0; } +.surtitre, .soustitre { font-size: 0.90em; text-transform: uppercase; color: #666; color: #CCCC66; } -.pagination { clear: both; text-align: right; font-size: 0.90em; color: #666; } -.pagination a { } -.pagination .on { font-weight: bold; color: #000; } +.cartouche { margin-bottom: 2em; } +.cartouche .spip_logos { float: right; margin-left: 16px; margin-bottom: 4px; } +.cartouche p { margin: 0; padding: 0; clear: left; } +.cartouche .traductions { font-size: 0.77em; } +.cartouche .traductions * { display: inline; } +.cartouche .traductions li { padding-left: 1em; } -/* Rubriques */ -.rubriques ul li { background: #EEE; border: 0; text-transform: uppercase; } -.rubriques ul li ul li { text-transform: none; } -.rubriques a, .rubriques a:hover { } +.chapo { margin-bottom: 1.5em; font-weight: bold; line-height: 1.4em; color: #666699; } -/* Listes d'articles et extraits introductifs */ -.articles ul li { clear: both; } -.articles ul li h3 { margin: 0; padding: 0; border: 0; font-weight: bold; } -.articles ul li .spip_logos { float: right; clear: right; margin: 0 0 4px 16px; } -.articles ul li .enclosures { float: right; text-align: right; max-width: 60%; margin: 0; } -.articles ul li .introduction { margin-top: .5em; line-height: 1.4em; } +.texte { line-height: 1.4em; color: #000; } + +.ps, .notes { line-height: 1.4em; margin-bottom: 2em; } +.notes { clear: both; } + +.hyperlien { display: block; background: #EEE; padding: .5em 1em; font-weight: bold; color: #666699; } /* modeles par defaut */ .spip_modele { float: right; display: block; border: 1px dotted #666; width: 180px; } +/* Portfolio */ +#documents_portfolio { clear: both; margin-top: 1.4em; margin-bottom: 2em; text-align: center; } +#documents_portfolio .spip_logos { margin: .1em; } +#document_actif { margin-top: 1em; } + /* Habillage des formulaires ---------------------------------------------- */ .formulaire_spip { background: #CCCC99; margin-bottom: 2em; padding: 1em; text-align: left; } -.formulaire_spip fieldset { border: 0; } -.formulaire_spip legend { font-weight: bold; color: #FFF; } -.formulaire_spip label {} -.formulaire_spip .forml, textarea { width: 99%; background: #FFF; border: 1px inset; font-family: inherit; font-size: inherit; } +.formulaire_spip fieldset { margin: 0; margin-bottom: 1em; padding: 0; border: 0; } +.formulaire_spip legend { margin: 0; padding: 0; font-weight: bold; color: #FFF; } +.formulaire_spip label { display: block; color: #404040; } +.forml, textarea { width: 99%; background: #FFF; border: 1px inset; font-family: inherit; font-size: inherit; } +.formulaire_spip textarea { margin-bottom: 1em; } /* Boutons */ .spip_bouton { text-align: right; } @@ -179,8 +157,8 @@ ul.choix_mots { float: left; width: 47%; margin: 0; padding: 0; list-style: none ul.choix_mots label { display: inline; } /* Formulaire de recherche */ -.formulaire_recherche { width: 12em; text-align: left; } -.formulaire_recherche label { display: none; } +.formulaire_recherche {} +.formulaire_recherche .forml {} /* menu langues */ #menu_langues { vertical-align: top; max-height: 24px; margin-bottom: 5px; width: 120px; } @@ -233,17 +211,44 @@ ul ul ul ul ul .forum-chapo { background: #FFF; } #signatures td.signature-message { background: #F4F8F8; padding: 0.4em; /*font-size: 0.96em;*/ } +/* Habillage des sommaires et menus +---------------------------------------------- */ + +/* Habillage general des menus de navigation */ +.menu { clear: both; margin-bottom: 2em; text-align: left; } +#contenu .menu { /*font-size: 0.82em;*/ } +#navigation .menu { min-width: 10em; /*font-size: 0.77em;*/ } +#navigation .menu a { } + +.menu p { margin: .2em 0; padding: .2em .1em; } +.menu ul { margin: 0; padding: 0; list-style: none; } +.menu ul li { margin: .2em 0; padding: .2em .1em; border-bottom: 1px solid #DDD; } +.menu ul li ul { margin-left: 1em; } +.menu ul li li { padding: 0; border: 0; } + +.pagination { clear: both; text-align: right; font-size: 0.90em; color: #666; } +.pagination .on { font-weight: bold; color: #000; } + +/* Rubriques */ +.rubriques ul li { background: #EEE; border: 0; text-transform: uppercase; } +.rubriques ul li ul li { text-transform: none; } + +/* Listes d'articles et extraits introductifs */ +.articles ul li { clear: both; } +.articles ul li h3 { margin: 0; padding: 0; border: 0; font-weight: bold; } +.articles ul li .spip_logos { float: right; clear: right; margin: 0 0 4px 16px; } +.articles ul li .enclosures { float: right; text-align: right; max-width: 60%; margin: 0; } +.articles ul li .introduction { margin-top: .5em; line-height: 1.4em; } + + /* Couleurs des liens ---------------------------------------------- */ -a { text-decoration: none; color: #604A7F; } -a.spip_note {} /* liens vers notes de bas de page */ +a { color: #604A7F; text-decoration: none; } +a.spip_note { font-weight: bold; } /* liens vers notes de bas de page */ a.spip_in {} /* liens internes */ a.spip_out {} /* liens sortants */ a.spip_url {} /* liens url sortants */ a.spip_glossaire {} /* liens vers encyclopedie */ - .spip_out, .spip_url, .spip_glossaire { padding-right: 12px; background: url(out.gif) no-repeat right; text-decoration: underline; } - .on { font-weight: bold; } /* liens exposes */ - -a:hover { text-decoration: underline; color: #F57900; } \ No newline at end of file +a:hover { color: #F57900; text-decoration: underline; } \ No newline at end of file diff --git a/dist/inc-head.html b/dist/inc-head.html index 8928289cf4f109eff5bf12d20cef224a4900c545..6a667d94233c4491c8622393a7bf53043ecb025c 100644 --- a/dist/inc-head.html +++ b/dist/inc-head.html @@ -15,9 +15,6 @@ [(#REM) Lien vers le flux RSS du site ] [<link rel="alternate" type="application/rss+xml" title="<:syndiquer_site:>" href="(#URL_PAGE{backend})" />] -[(#REM) Feuille de style par defaut pour le code genere par SPIP ] -[<link rel="stylesheet" href="(#CHEMIN{spip_style.css}|direction_css)" type="text/css" media="all" />] - [(#REM) Feuille de style CSS pour l'affichage du site a l'ecran ] [<link rel="stylesheet" href="(#CHEMIN{habillage.css}|direction_css)" type="text/css" media="projection, screen, tv" />] diff --git a/dist/inc-pied.html b/dist/inc-pied.html index 18f4a78802f2d816f81ae2f492c84aeb6cdc8a91..7238b4d0a7c1fbd049e68ee1d23a30056ea935f5 100644 --- a/dist/inc-pied.html +++ b/dist/inc-pied.html @@ -1,11 +1,10 @@ <br class="nettoyeur" /> <div id="pied"> -<small> <a href="http://www.spip.net/" title="<:site_realise_avec_spip:>"><img src="#CHEMIN{spip.png}" alt="SPIP" width="48" height="16" class="format_png" /></a> | <a href="#ENV{skel}" title="<:voir_squelette:>" rel="nofollow"><:squelette:></a> | <a href="ecrire/"><:espace_prive:></a> | <a href="#URL_PAGE{plan}"><:plan_site:></a> - | <a href="#URL_PAGE{backend}" title="<:syndiquer_site:>"><img src="#CHEMIN{feed.png}" alt="<:icone_suivi_activite:>" width="16" height="16" class="format_png" /> RSS 2.0</a></small> + | <a href="#URL_PAGE{backend}" title="<:syndiquer_site:>"><img src="#CHEMIN{feed.png}" alt="<:icone_suivi_activite:>" width="16" height="16" class="format_png" /> RSS 2.0</a> </div> [(#REM) diff --git a/dist/spip_style.css b/dist/spip_style.css deleted file mode 100644 index 7b93d81880027c592142b8c7759f05d09b389df6..0000000000000000000000000000000000000000 --- a/dist/spip_style.css +++ /dev/null @@ -1,55 +0,0 @@ -/* SPIP-STYLE version 1.9 */ -/* Cette feuille contient les styles associes au code genere par SPIP. */ -/* Ces styles sont indispensables et doivent necessairement etre */ -/* definis pour le bon fonctionnement de vos squelettes. */ - - -/* Raccourcis typographiques de SPIP */ -.spip_puce { list-style-position: outside; } - -/*h3.spip { text-align: center; margin-top: 2em; margin-bottom: 1.4em; font-size: 1.15em; font-weight: bold; }*/ - -/* Paragraphes, citations, code et poesie */ -/*blockquote.spip, .spip_serif { font-family: Georgia, Times, serif; } - -blockquote.spip { margin: 1em; padding-left: 1em; padding-right: 1em; border: 1px dotted; } - -.spip_poesie { margin: 1em; padding-left: 1em; border-left: 1px solid; font-family: Garamond, Georgia, Times, serif; } -.spip_poesie div { text-indent: -60px; margin-left: 60px; } - -.spip_code, .spip_cadre { font-family: monospace; font-style: normal; font-size: 1.2em; } -.spip_cadre { width: 99%; border: 1px inset; } - -.spip_surligne { background: #FF6; }*/ - -/* Tableaux */ -table.spip { margin-bottom: 1em; border-collapse: collapse; } -table.spip caption { caption-side: top; padding: 3px; text-align: center; font-weight: bold; } -table.spip tr.row_first { background: #FFC; } -table.spip tr.row_odd { background: #DDD; } -table.spip tr.row_even { background: #EEE; } -table.spip th, table.spip td { padding: 3px; text-align: left; vertical-align: middle; } - -/* Logos, documents et images */ -img, .spip_logos { margin: 0; padding: 0; border: none; } - -.spip_documents { text-align: center; } -.spip_documents p { margin-top: 1px; margin-bottom: 2px; } -.spip_documents_center { clear: both; width: 100%; margin: auto; } -span.spip_documents_center { display: block; margin-top:1em; } -.spip_documents_left { float: left; margin-right: 15px; margin-bottom: 5px; } -.spip_documents_right { float: right; margin-left: 15px; margin-bottom: 5px; } -.spip_doc_titre { font-weight: bold; font-size: 0.8em; margin-left: auto; margin-right: auto; } -.spip_doc_descriptif { clear: both; font-size: 0.8em; margin-left: auto; margin-right: auto; } - -/* Images typographiques (via image_typo), URL a revoir... */ -.format_png { behavior: url(win_png.htc); } - -/* modeles par defaut */ -.spip_modele { float: right; display: block; border: 1px dotted #666; width: 180px; } - -/* Barre de raccourcis typographiques */ -table.spip_barre { width: 100%; } -table.spip_barre a img { background: #FDA; padding: 3px; border: 1px outset #999; } -table.spip_barre a:hover img { background: #FFF; border: 1px solid #999; } -table.spip_barre input.barre { width: 100%; background: #EEE; } \ No newline at end of file