From a695d39f563f6f5968ed79357790662a84eae270 Mon Sep 17 00:00:00 2001
From: tetue <tetue@rezo.net>
Date: Fri, 9 Jun 2006 23:41:53 +0000
Subject: [PATCH] =?UTF-8?q?Disparition=20de=20spip=5Fstyle.css=20pour=20l'?=
=?UTF-8?q?espace=20prive=CC=81,=20dont=20les=20quelques=20de=CC=81finitio?=
=?UTF-8?q?ns=20de=20style=20rejoignent=20leurs=20copines=20:=20dans=20dis?=
=?UTF-8?q?t/style=5Fprive.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 -
dist/style_prive.html | 69 +++++++++++++++++++++++++++++-----
ecrire/img_pack/spip_style.css | 67 ---------------------------------
ecrire/inc/presentation.php | 8 +---
4 files changed, 62 insertions(+), 83 deletions(-)
delete mode 100644 ecrire/img_pack/spip_style.css
diff --git a/.gitattributes b/.gitattributes
index 4da4a880da..6e90398053 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -312,7 +312,6 @@ ecrire/img_pack/set-ecran.png -text
ecrire/img_pack/site-24.gif -text
ecrire/img_pack/spip-80x15.png -text
ecrire/img_pack/spip_out.gif -text
-ecrire/img_pack/spip_style.css -text
ecrire/img_pack/statistiques-24.gif -text
ecrire/img_pack/statistiques-48.png -text
ecrire/img_pack/style_prive_defaut.css -text
diff --git a/dist/style_prive.html b/dist/style_prive.html
index 19392bf5a3..25e19d5a25 100644
--- a/dist/style_prive.html
+++ b/dist/style_prive.html
@@ -1189,9 +1189,25 @@ div.brouteur_rubrique_on div a {
/*
- * Styles generes par les raccourcis de mis en page
+ * Styles generes par les raccourcis de mise en page
*/
+i.spip {}
+strong.spip {}
+hr.spip {}
+
+.spip_puce { list-style-position: outside; }
+
+ul.spip {}
+ol.spip {}
+li.spip {}
+
+h3.spip {
+ text-align: center;
+ margin: 2em 0 1.4em 0;
+ font: 1.15em Verdana,Arial,Sans,sans-serif;
+ font-weight: bold; }
+
p.spip {
line-height: 140%;
}
@@ -1227,14 +1243,10 @@ a.spip_glossaire:hover {
background-color: ##ENV{couleur_foncee,3874b0};
color: #FFF;
}
-.spip_cadre {
- width: 100%;
- background-color: #EEE;
- margin-top: 10px;
- padding: 5px;
- border: 1px solid #666;
- behavior: url([(#CHEMIN{win_width.htc}|url_absolue)]);
-}
+
+/* Citations, code et poesie */
+q, blockquote.spip, .spip_poesie, .spip_serif { font-family: Georgia, Garamond, Times, serif; }
+
blockquote.spip {
margin-[(#ENV{ltr}|choixsiegal{left,left,right})]: 40px;
margin-[(#ENV{ltr}|choixsiegal{left,right,left})]: 0;
@@ -1256,6 +1268,45 @@ div.spip_poesie div {
margin-[(#ENV{ltr}|choixsiegal{left,left,right})]: 60px;
}
+.spip_code, .spip_cadre { font-family: monospace; font-style: normal; font-size: 1.1em; }
+.spip_cadre {
+ width: 100%;
+ background-color: #EEE;
+ margin-top: 10px;
+ padding: 5px;
+ border: 1px solid #666;
+ behavior: url([(#CHEMIN{win_width.htc}|url_absolue)]);
+}
+
+/* Tableaux */
+table.spip {
+ margin: auto;
+ margin-bottom: 1em;
+ border: 1px solid;
+ border-collapse: collapse;
+ font-family: Verdana,Arial,Sans,sans-serif;
+ font-size: 0.90em; }
+table.spip caption {
+ caption-side: top; /* bottom pas pris en compte par IE */
+ text-align: center;
+ margin: auto;
+ padding: 3px;
+ font-weight: bold; }
+table.spip tr.row_first { background-color: #FCF4D0; }
+table.spip tr.row_odd { background-color: #d0d0d0; }
+table.spip tr.row_even { background-color: #F0F0F0; }
+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: 0; }
+
+.spip_documents { text-align: center; font-family: Verdana,Arial,Sans,sans-serif; font-size: 0.90em; }
+.spip_documents_center { clear: both; width: 100%; margin: auto; }
+.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; }
+.spip_doc_descriptif { clear: both; }
+
/* pour le plugin "revision_nbsp" */
.spip-nbsp {
border-bottom: 2px solid #C8C8C8;
diff --git a/ecrire/img_pack/spip_style.css b/ecrire/img_pack/spip_style.css
deleted file mode 100644
index f07ed9c841..0000000000
--- a/ecrire/img_pack/spip_style.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Spip Styles : intertitre, citations, etc...
------------------------------------------------ */
-i.spip {}
-strong.spip {}
-hr.spip {}
-
-.spip_puce { list-style-position: outside; }
-
-ul.spip {}
-ol.spip {}
-li.spip {}
-
-h3.spip {
- text-align: center;
- margin: 2em 0 1.4em 0;
- font: 1.15em Verdana,Arial,Sans,sans-serif;
- font-weight: bold; }
-
-p.spip {}
-p.spip_note {}
-
-/* * Citations, code et poesie */
-q, blockquote.spip, .spip_poesie, .spip_serif { font-family: Georgia, Garamond, Times, serif; }
-
-blockquote.spip {
- margin: 1em;
- padding: 0 1em;
- border: 1px solid #aaaaaa; }
-
-.spip_poesie {
- margin: 1em;
- padding-left: 1em;
- border-left: 1px solid; }
-.spip_poesie div { text-indent: -60px; margin-left: 60px; }
-
-.spip_code, .spip_cadre { font-family: monospace; font-style: normal; font-size: 1.1em; }
-.spip_cadre { width: 99%; border: 1px solid; }
-
-/* Tableaux
----------------------------------------------- */
-table.spip {
- margin: auto;
- margin-bottom: 1em;
- border: 1px solid;
- border-collapse: collapse;
- font-size: 0.70em; }
-table.spip caption {
- caption-side: top; /* bottom pas pris en compte par IE */
- text-align: center;
- margin: auto;
- padding: 3px;
- font-weight: bold; }
-table.spip tr.row_first { background-color: #FCF4D0; }
-table.spip tr.row_odd { background-color: #d0d0d0; }
-table.spip tr.row_even { background-color: #F0F0F0; }
-table.spip td { padding: 3px; text-align: left; vertical-align: middle; }
-
-/* Logos, documents et images
----------------------------------------------- */
-img, .spip_logos { margin: 0; padding: 0; border: 0; }
-
-.spip_documents { font-family: Verdana,Arial,Sans,sans-serif; font-size: 0.90em; }
-.spip_documents_center { width: 100%; margin: auto; text-align: center; }
-.spip_documents_left { float: left; margin-right: 15px; text-align: center; }
-.spip_documents_right { float: right; margin-left: 15px; text-align: center; }
-.spip_doc_titre { text-align: center; font-weight: bold; }
-.spip_doc_descriptif { clear: both; }
\ No newline at end of file
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index a344c0e78f..b5704da654 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -1578,15 +1578,11 @@ function envoi_link($nom_site_spip, $rubrique="") {
'<r=' .
$GLOBALS['spip_lang_left'];
- // CSS pour le code genere par Spip
- $res = '<link rel="stylesheet" type="text/css" href="' . _DIR_IMG_PACK
- . 'spip_style.css" >' . "\n"
-
// CSS de secours en cas de non fonct de la suivante
- . '<link rel="stylesheet" type="text/css" href="' . _DIR_IMG_PACK
+ $res = '<link rel="stylesheet" type="text/css" href="' . _DIR_IMG_PACK
. 'style_prive_defaut.css" >' . "\n"
- // CSS espace prive : la vrai
+ // CSS espace prive : la vraie
. '<link rel="stylesheet" type="text/css" href="'
. generer_url_public('style_prive', $args) .'" >' . "\n"
--
GitLab