Changeset 65867 in spip-zone

Timestamp:

Sep 14, 2012, 2:56:45 PM (8 years ago)

Author:

cedric@…

Message:

ordre des css et qq corrections car les css de demo de layout gala etaient prises en compte dans le reste des css.
on a donc commencé à casser l'apparence, mais c'est juste pour voir avant de vraiment tout casser

Location:

_squelettes_/sarkaspip/trunk

Files:

• css/elements.css.html (modified) (1 diff)
• css/layout.css.html (modified) (2 diffs)
• inclure/head.html (modified) (2 diffs)

_squelettes_/sarkaspip/trunk/css/elements.css.html

@@ -39 +39 @@
 /* -------------------------------------------------------------------- */
 /* Styles generiques */
-.description {margin: 10px 0 30px; font-size: 1.2em; line-height: 1em;}
+.description {margin: 10px 0 30px; font-size: 1.2em; }
 .description li {margin-left: 10px;     line-height: 1.4em;}
 .description p {font-size: 1em;}

_squelettes_/sarkaspip/trunk/css/layout.css.html

@@ -10 +10 @@
 body {
         padding: 0; 
-        font: 0.625em/1em [(#CONFIG{sarkaspip_styles/fo_site, 'Helvetica,Verdana'}),]Arial,sans-serif; 
+        font: 0.625em/1.4em [(#CONFIG{sarkaspip_styles/fo_site, 'Helvetica,Verdana'}),]Arial,sans-serif;
         color: #CONFIG{sarkaspip_styles/fg_site, #000000};
         background: #CONFIG{sarkaspip_styles/bg_body, #ffffff}[ url((#CHEMIN{images/bg_body#CONFIG{sarkaspip_styles/bi_extension_body, .gif}}))][ (#CONFIG{sarkaspip_styles/bi_proprietes_body})];
@@ -19 +19 @@
 div#footer{padding: 30px 0 0; color: transparent; background: none; line-height: 1.12em;}
 div#navigation{width: 180px; background: none;}
-div#extra{width:180px; background: none;} 
+div#extra{width:180px; background: none;}
+div#container{text-align:left}
 div#container{background: #CONFIG{sarkaspip_styles/bg_site, #ffffff}[ url((#CHEMIN{images/bg_site#CONFIG{sarkaspip_styles/bi_extension_site, .gif}}))][ (#CONFIG{sarkaspip_styles/bi_proprietes_site})]; 
 }  

_squelettes_/sarkaspip/trunk/inclure/head.html

@@ -32 +32 @@
 [(#REM) <!-- Raz des styles --> ]
 <link rel="stylesheet" type="text/css" media="all" href="[(#CHEMIN{css/raz.css})]" />
+[(#REM) <!-- Styles SPIP par defaut --> ]
+[<link rel="stylesheet" type="text/css" media="all" href="(#CSS{spip_style.css})" />]
+[<link rel="stylesheet" type="text/css" media="all" href="(#CSS{spip_formulaires.css})" />]
 
 [(#REM) Balise permettant aux plugins d'inserer des fichiers CSS ]
@@ -37 +40 @@
 
 [(#REM) <!-- Layout Gala choisi --> ]
-<link rel="stylesheet" type="text/css" media="all" href="[(#CHEMIN{[css/layouts/layout(#CONFIG{sarkaspip_layout/numero_layout,13}).css]})]" />
-[(#REM) <!-- Styles SPIP par defaut --> ]
-[<link rel="stylesheet" type="text/css" media="all" href="(#CSS{spip_style.css})" />]
-[<link rel="stylesheet" type="text/css" media="all" href="(#CSS{spip_formulaires.css})" />]
 [(#REM) <!-- Styles du squelette par defaut --> ]
 [<link rel="stylesheet" type="text/css" media="all" href="(#CSS{css/base.css})" />]
 [(#REM) <!-- Layout Gala choisi --> ]
+<link rel="stylesheet" type="text/css" media="all" href="[(#CHEMIN{[css/layouts/layout(#CONFIG{sarkaspip_layout/numero_layout,13}).css]})]" />
 [<link rel="stylesheet" type="text/css" media="all" href="(#CSS{css/layout.css})" />]
+
 [<link rel="stylesheet" type="text/css" media="all" href="(#CSS{css/bandeau.css})" />]
 [<link rel="stylesheet" type="text/css" media="all" href="(#CSS{css/noisettes.css})" />]