diff --git a/.gitattributes b/.gitattributes index 96bee3188b08cf7d5cc51d6393999c9008430ff2..abf8fd87e09759ec52ca8b24315b7c898642c282 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,7 +4,6 @@ config/remove.txt -text dist/favicon.ico -text dist/feed.png -text -dist/formfx.css -text dist/formulaires/choix_mots.html -text dist/formulaires/forum/charger.php -text dist/formulaires/forum/traiter.php -text @@ -45,6 +44,7 @@ dist/puce.gif -text dist/puce_rtl.gif -text dist/rechercher.png -text dist/spip.png -text +dist/spip_formulaires.css -text dist/spip_pass.html -text dist/win_width.htc -text ecrire/action/acceder_document.php -text diff --git a/dist/habillage.css b/dist/habillage.css index 8c52b62fc3a373a0ea802813e91cf896638e723a..1f933bce0dc47ec23a04325ce5ff149fbe151d41 100755 --- a/dist/habillage.css +++ b/dist/habillage.css @@ -1,7 +1,7 @@ /* ----------------------------------------------------------- */ /* Feuilles de styles des squelettes par defaut pour SPIP 1.9 */ /* ----------------------------------------------------------- */ -/*@import url(formfx.css);*/ +@import url(spip_formulaires.css); /* ------------------------------------------ /* Typographie generale (style transversaux) diff --git a/dist/inc-head.html b/dist/inc-head.html index 33aad5839aa498272de1c9cab83a49b4444bfe00..e5959e0ea9942a6e7e84e071c2c0d52f14b1c876 100644 --- a/dist/inc-head.html +++ b/dist/inc-head.html @@ -23,9 +23,6 @@ [(#REM) Feuille de style CSS pour l'impression ] [<link rel="stylesheet" href="(#CHEMIN{impression.css}|direction_css)" type="text/css" media="print" />] -[(#REM) Feuille de style CSS pour les formulaires ] -[<link rel="stylesheet" href="(#CHEMIN{formfx.css}|direction_css)" type="text/css" media="all" />] - [(#REM) Feuille de style personnalisee pour surcharger les precedentes A noter par defaut cette css n'existe pas ] diff --git a/dist/formfx.css b/dist/spip_formulaires.css similarity index 100% rename from dist/formfx.css rename to dist/spip_formulaires.css diff --git a/dist/spip_pass.html b/dist/spip_pass.html index 8bc65d5fc4175fe55603b2c07c58690ad8a579e6..dce9b5efdb8b0119e6e51613514957b8e1768340 100644 --- a/dist/spip_pass.html +++ b/dist/spip_pass.html @@ -12,7 +12,7 @@ [<link rel="shortcut icon" href="(#CHEMIN{favicon.ico})" />] <link rel="stylesheet" href="[(#CHEMIN{spip_style.css}|direction_css)]" type="text/css" /> <link rel="stylesheet" href="[(#CHEMIN{minipres.css}|direction_css)]" type="text/css" /> -<link rel="stylesheet" href="[(#CHEMIN{formfx.css}|direction_css)]" type="text/css" /> +<link rel="stylesheet" href="[(#CHEMIN{spip_formulaires.css}|direction_css)]" type="text/css" /> </head> <body class='pass' > diff --git a/prive/style_prive_formulaires.html b/prive/style_prive_formulaires.html index f42b33b3723b508cf15569211d3e444df86855bd..8dd5f83de04c0e2ef827fdb52ea944c2bfc1a6fa 100644 --- a/prive/style_prive_formulaires.html +++ b/prive/style_prive_formulaires.html @@ -299,9 +299,6 @@ table.spip_barre { padding-bottom: 0px; } -table.spip_barre a img { - /*[(#EVAL{_DIR_IMG_PACK}|concat{fond-fondo.gif}|image_bg{[(#ENV{couleur_claire})], center center })]*/ - - padding: 3px; border: 1px outset #GET{claire}; } +table.spip_barre a img {padding: 3px; border: 1px outset #GET{claire}; } table.spip_barre a:hover img { background: #FFF; border: 1px solid #CC9; } table.spip_barre input.barre { width: 99%; background: transparent; border: 0; color: #F57900; } \ No newline at end of file