Merge lp:~yoboy-leguesh/ubuntu-fr-static/maj-dokuwiki into lp:ubuntu-fr-static

Proposed by YoBoY on 2012-10-23
Status: Merged
Merged at revision: 51
Proposed branch: lp:~yoboy-leguesh/ubuntu-fr-static/maj-dokuwiki
Merge into: lp:ubuntu-fr-static
Diff against target: 337 lines (+111/-131)
5 files modified
theme2010/css/doc-edubuntu.css (+5/-5)
theme2010/css/doc-general.css (+91/-111)
theme2010/css/doc-kubuntu.css (+5/-5)
theme2010/css/doc-ubuntu.css (+5/-5)
theme2010/css/doc-xubuntu.css (+5/-5)
To merge this branch: bzr merge lp:~yoboy-leguesh/ubuntu-fr-static/maj-dokuwiki
Reviewer Review Type Date Requested Status
Ubuntu-fr-webteam 2012-10-23 Pending
Review via email: mp+131094@code.launchpad.net

Description of the change

Mise à jour des CSS pour prendre en compte les changements HTML de dokuwiki 2012-10-13 "Adora Belle" sur la table des matières et les ancres des titres de section.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'theme2010/css/doc-edubuntu.css'
2--- theme2010/css/doc-edubuntu.css 2011-04-27 21:17:22 +0000
3+++ theme2010/css/doc-edubuntu.css 2012-10-23 20:51:19 +0000
4@@ -49,19 +49,19 @@
5
6 #main h2{
7 }
8- #main h2 a, #main h3 a, #main h4 a, #main h5 a{
9+ #main h2, #main h3, #main h4, #main h5 {
10 color:#C80015;
11 }
12
13 #main h4{ font-style:italic; }
14
15 /* Menu droit */
16-div.toc{
17- background:transparent url('../images/commun/edubuntu/ruban_center.png') top left repeat-x;
18+#dw__toc {
19+ background:url('../images/commun/edubuntu/ruban_center.png') top left repeat-x #F6F6F6;
20 }
21- .tocheader{
22+#dw__toc h3.toggle {
23 background:transparent url('../images/commun/edubuntu/ruban_left.png') top left no-repeat;
24- }
25+}
26
27 /* TABLEAUX */
28 .inline tr{
29
30=== modified file 'theme2010/css/doc-general.css'
31--- theme2010/css/doc-general.css 2011-06-26 10:57:59 +0000
32+++ theme2010/css/doc-general.css 2012-10-23 20:51:19 +0000
33@@ -249,126 +249,106 @@
34 border-bottom:0 none #FFF;
35 }
36
37-/* MENUS DROITE */
38+/* Table des matières */
39
40-div.toc{
41- position:relative;
42- float:right;
43- margin-left:1em;
44- width:18em; height:auto;
45- background-color:transparent; background-position:top left; background-repeat:repeat-x;
46- border-radius:0 8px 0 0;
47- -moz-border-radius:0 8px 0 0;
48- -o-border-radius:0 8px 0 0;
49- -khtml-border-radius:0 8px 0 0;
50- /* Chrome - Safari */
51- -webkit-border-top-right-radius:8px;
52+#dw__toc {
53+ position:relative;
54+ float:right;
55+ margin-left:1em;
56+ width:18em; height:auto;
57+ border-radius:0 8px 8px 8px;
58+ -moz-border-radius:0 8px 8px 8px;
59+ -o-border-radius:0 8px 8px 8px;
60+ -khtml-border-radius:0 8px 8px 8px;
61+ /* Chrome - Safari */
62+ -webkit-border-top-right-radius:8px;
63+ -webkit-border-bottom-right-radius:8px;
64+ -webkit-border-bottom-left-radius:8px;
65+ border-right:1px outset #D2D2D2;
66+ border-bottom:1px outset #D2D2D2;
67 }
68
69- ul.toc{
70- margin-left:1.2em;
71- list-style:none;
72- }
73- ul.toc ul{
74- margin-top:0.2em;
75- margin-left:1em;
76- }
77- .toc li{
78- position:relative; z-index:1;
79- line-height:1.4em;
80- font-size:0.9em;
81- }
82- .toc li li{
83- margin-left:0;
84- font-size:1em;
85- }
86- .tocheader{
87+#dw__toc h3.toggle {
88 position:relative;
89- margin:-4px 0 0 -4px; padding:0.3em 0 0 4em;
90+ margin:-4px 0 0 -4px; padding:0.5em 0 0 4em;
91 background-color:transparent; background-position:top left; background-repeat:no-repeat;
92 height:45px;
93 font-size:0.87em;
94 font-weight:bold;
95- }
96- .toc_close{
97- position:relative;
98- margin-top:46px;
99- }
100- .toc_close span, .toc_open span{
101- position:absolute; top:0; left:0;
102- display:block;
103- margin:0.48em 0 0 -3.2em;
104- width:14px; height:14px;
105- background:transparent url('../images/commun/bt_open_close.png') 50% 0 repeat-y;
106- text-indent:-9000px;
107- }
108- .toc_open{
109- position:absolute;
110- margin-left:-3.6em; margin-top:1.8em;
111- display:block;
112- width:20.7em; height:22px;
113- border-right:1px outset #D2D2D2;
114- border-bottom:1px outset #D2D2D2;
115- border-radius:0 0 8px 0;
116- -moz-border-radius:0 0 8px 0;
117- -o-border-radius:0 0 8px 0;
118- -khtml-border-radius:0 0 8px 0;
119- /* Chrome - Safari */
120- -webkit-border-bottom-right-radius:8px;
121- }
122- .toc_open span{
123- margin:-1.2em 0 0 0.4em;
124- background-position:50% -14px;
125- }
126+}
127+
128+#dw__toc .open span, #dw__toc .closed span {
129+ display:block;
130+ margin:1.1em 0 0 0.75em;
131+ width:14px; height:14px;
132+ background:transparent url('../images/commun/bt_open_close.png') 50% 0 repeat-y;
133+ text-indent:-9000px;
134+ position: absolute; top: 0px; left: 0px;
135+}
136+
137+#dw__toc .closed span {
138+ background-position: 50% -14px;
139+}
140+
141+#dw__toc > div {
142+ margin-top:-1.8em;
143+ border-top:1px solid #F6F6F6;
144+}
145+
146+#dw__toc ul.toc{
147+ margin-left:1.2em;
148+ list-style:none;
149+}
150+#dw__toc ul.toc ul {
151+ margin-top:0.2em;
152+ margin-left:1em;
153+ margin-bottom:0.2em;
154+}
155+#dw__toc ul.toc li {
156+ position:relative; z-index:1;
157+ padding: 0px;
158+ line-height:1.4em;
159+ font-size:0.9em;
160+}
161+#dw__toc .toc li li {
162+ font-size:1em;
163+}
164
165- #toc__inside{
166- margin-top:-1.56em;
167- background-color:#F6F6F6;
168- border:1px outset #D2D2D2;
169- border-top:1px solid #F6F6F6;
170- border-radius:0 0 8px 8px;
171- -moz-border-radius:0 0 8px 8px;
172- -o-border-radius:0 0 8px 8px;
173- -khtml-border-radius:0 0 8px 8px;
174- /* Chrome - Safari */
175- -webkit-border-bottom-right-radius:8px;
176- -webkit-border-bottom-left-radius:8px;
177- }
178-
179- /* Début - Effet de numérotation */
180- #toc__inside li.level1{
181- counter-reset:sousmenus;
182- }
183- #toc__inside li.level1 span:before {
184- padding-right:0.2em;
185- counter-increment:menus;
186- content:counter(menus)".";
187- }
188- #toc__inside li.level2 span:before {
189- counter-increment:sousmenus;
190- content:counter(menus) "." counter(sousmenus) " ";
191- }
192-
193- #main h2{
194- counter-reset:soussection;
195- }
196- #main h2 a:before {
197- padding-right:0.2em;
198- counter-increment:section;
199- content:counter(section)".";
200- }
201- #main h2#pagetitle{
202- counter-increment:none;
203- counter-reset:none;
204- }
205- #main h3 {
206- counter-increment:soussection;
207- counter-reset:soussoussection paragraphe sousparagraphe;
208- }
209- #main h3:before {
210- content:counter(section) "." counter(soussection) " ";
211- }
212- /* Fin - Effet de numérotation */
213+#dw__toc li.level1{
214+ counter-reset:sousmenus;
215+}
216+#dw__toc li.level1 > div:before {
217+ padding-right:0.2em;
218+ counter-increment:menus;
219+ content:counter(menus)".";
220+}
221+
222+#dw__toc li.level2 > div:before {
223+ counter-increment:sousmenus;
224+ content:counter(menus) "." counter(sousmenus) " ";
225+}
226+/* fin - Table des matières */
227+
228+/* Effet de numérotation des sections */
229+
230+#main > h2{
231+ counter-reset:soussection;
232+ padding-right:0.2em;
233+ counter-increment:section;
234+}
235+#main > h2:before {
236+ content:counter(section) ". ";
237+}
238+
239+#main > h3 {
240+ counter-increment:soussection;
241+ counter-reset:soussoussection paragraphe sousparagraphe;
242+}
243+#main > h3:before {
244+ content:counter(section) "." counter(soussection) " ";
245+}
246+
247+/* Fin - Effet de numérotation */
248
249 .notehelp{
250
251
252=== modified file 'theme2010/css/doc-kubuntu.css'
253--- theme2010/css/doc-kubuntu.css 2011-06-26 10:06:33 +0000
254+++ theme2010/css/doc-kubuntu.css 2012-10-23 20:51:19 +0000
255@@ -49,19 +49,19 @@
256
257 #main h2{
258 }
259- #main h2 a, #main h3 a, #main h4 a, #main h5 a{
260+ #main h2, #main h3, #main h4, #main h5 {
261 color:#0019A8;
262 }
263
264 #main h4{ font-style:italic; }
265
266 /* Menu droit */
267-div.toc{
268- background:transparent url('../images/commun/kubuntu/ruban_center.png') top left repeat-x;
269+#dw__toc {
270+ background:url('../images/commun/kubuntu/ruban_center.png') top left repeat-x #F6F6F6;
271 }
272- .tocheader{
273+#dw__toc h3.toggle {
274 background:transparent url('../images/commun/kubuntu/ruban_left.png') top left no-repeat;
275- }
276+}
277
278 /* TABLEAUX */
279 .inline tr{
280
281=== modified file 'theme2010/css/doc-ubuntu.css'
282--- theme2010/css/doc-ubuntu.css 2011-04-27 21:17:22 +0000
283+++ theme2010/css/doc-ubuntu.css 2012-10-23 20:51:19 +0000
284@@ -49,19 +49,19 @@
285
286 #main h2{
287 }
288- #main h2 a, #main h3 a, #main h4 a, #main h5 a{
289+ #main h2 , #main h3 , #main h4 , #main h5 {
290 color:#C80015;
291 }
292
293 #main h4 a{ font-style:italic; }
294
295 /* Menu droit */
296-div.toc{
297- background:transparent url('../images/commun/ubuntu/ruban_center.png') top left repeat-x;
298+#dw__toc {
299+ background: url('../images/commun/ubuntu/ruban_center.png') top left repeat-x #F6F6F6;
300 }
301- .tocheader{
302+#dw__toc h3.toggle {
303 background:transparent url('../images/commun/ubuntu/ruban_left.png') top left no-repeat;
304- }
305+}
306
307 /* TABLEAUX */
308 .inline tr{
309
310=== modified file 'theme2010/css/doc-xubuntu.css'
311--- theme2010/css/doc-xubuntu.css 2011-04-27 21:17:22 +0000
312+++ theme2010/css/doc-xubuntu.css 2012-10-23 20:51:19 +0000
313@@ -49,19 +49,19 @@
314
315 #main h2{
316 }
317- #main h2 a, #main h3 a, #main h4 a, #main h5 a{
318+ #main h2 a, #main h3, #main h4, #main h5 {
319 color:#3A5065;
320 }
321
322 #main h4{ font-style:italic; }
323
324 /* Menu droit */
325-div.toc{
326- background:transparent url('../images/commun/xubuntu/ruban_center.png') top left repeat-x;
327+#dw__toc {
328+ background:url('../images/commun/xubuntu/ruban_center.png') top left repeat-x #F6F6F6;
329 }
330- .tocheader{
331+#dw__toc h3.toggle {
332 background:transparent url('../images/commun/xubuntu/ruban_left.png') top left no-repeat;
333- }
334+}
335
336 /* TABLEAUX */
337 .inline tr{

Subscribers

People subscribed via source and target branches

to all changes: