Static Ubuntu-fr

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

  1. maj-dokuwiki
  2. Merge into trunk
Proposed by YoBoY
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 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
=== modified file 'theme2010/css/doc-edubuntu.css'
--- theme2010/css/doc-edubuntu.css 2011-04-27 21:17:22 +0000
+++ theme2010/css/doc-edubuntu.css 2012-10-23 20:51:19 +0000
@@ -49,19 +49,19 @@
4949
50 #main h2{50 #main h2{
51 }51 }
52 #main h2 a, #main h3 a, #main h4 a, #main h5 a{52 #main h2, #main h3, #main h4, #main h5 {
53 color:#C80015;53 color:#C80015;
54 }54 }
5555
56 #main h4{ font-style:italic; }56 #main h4{ font-style:italic; }
5757
58/* Menu droit */58/* Menu droit */
59div.toc{59#dw__toc {
60 background:transparent url('../images/commun/edubuntu/ruban_center.png') top left repeat-x;60 background:url('../images/commun/edubuntu/ruban_center.png') top left repeat-x #F6F6F6;
61}61}
62 .tocheader{62#dw__toc h3.toggle {
63 background:transparent url('../images/commun/edubuntu/ruban_left.png') top left no-repeat;63 background:transparent url('../images/commun/edubuntu/ruban_left.png') top left no-repeat;
64 }64}
6565
66/* TABLEAUX */66/* TABLEAUX */
67 .inline tr{67 .inline tr{
6868
=== modified file 'theme2010/css/doc-general.css'
--- theme2010/css/doc-general.css 2011-06-26 10:57:59 +0000
+++ theme2010/css/doc-general.css 2012-10-23 20:51:19 +0000
@@ -249,126 +249,106 @@
249 border-bottom:0 none #FFF;249 border-bottom:0 none #FFF;
250 }250 }
251251
252/* MENUS DROITE */252/* Table des matières */
253253
254div.toc{254#dw__toc {
255 position:relative;255 position:relative;
256 float:right;256 float:right;
257 margin-left:1em;257 margin-left:1em;
258 width:18em; height:auto;258 width:18em; height:auto;
259 background-color:transparent; background-position:top left; background-repeat:repeat-x;259 border-radius:0 8px 8px 8px;
260 border-radius:0 8px 0 0;260 -moz-border-radius:0 8px 8px 8px;
261 -moz-border-radius:0 8px 0 0;261 -o-border-radius:0 8px 8px 8px;
262 -o-border-radius:0 8px 0 0;262 -khtml-border-radius:0 8px 8px 8px;
263 -khtml-border-radius:0 8px 0 0;263 /* Chrome - Safari */
264 /* Chrome - Safari */264 -webkit-border-top-right-radius:8px;
265 -webkit-border-top-right-radius:8px;265 -webkit-border-bottom-right-radius:8px;
266 -webkit-border-bottom-left-radius:8px;
267 border-right:1px outset #D2D2D2;
268 border-bottom:1px outset #D2D2D2;
266}269}
267270
268 ul.toc{271#dw__toc h3.toggle {
269 margin-left:1.2em;
270 list-style:none;
271 }
272 ul.toc ul{
273 margin-top:0.2em;
274 margin-left:1em;
275 }
276 .toc li{
277 position:relative; z-index:1;
278 line-height:1.4em;
279 font-size:0.9em;
280 }
281 .toc li li{
282 margin-left:0;
283 font-size:1em;
284 }
285 .tocheader{
286 position:relative;272 position:relative;
287 margin:-4px 0 0 -4px; padding:0.3em 0 0 4em;273 margin:-4px 0 0 -4px; padding:0.5em 0 0 4em;
288 background-color:transparent; background-position:top left; background-repeat:no-repeat;274 background-color:transparent; background-position:top left; background-repeat:no-repeat;
289 height:45px;275 height:45px;
290 font-size:0.87em;276 font-size:0.87em;
291 font-weight:bold;277 font-weight:bold;
292 }278}
293 .toc_close{279
294 position:relative;280#dw__toc .open span, #dw__toc .closed span {
295 margin-top:46px;281 display:block;
296 }282 margin:1.1em 0 0 0.75em;
297 .toc_close span, .toc_open span{283 width:14px; height:14px;
298 position:absolute; top:0; left:0;284 background:transparent url('../images/commun/bt_open_close.png') 50% 0 repeat-y;
299 display:block;285 text-indent:-9000px;
300 margin:0.48em 0 0 -3.2em;286 position: absolute; top: 0px; left: 0px;
301 width:14px; height:14px;287}
302 background:transparent url('../images/commun/bt_open_close.png') 50% 0 repeat-y;288
303 text-indent:-9000px;289#dw__toc .closed span {
304 }290 background-position: 50% -14px;
305 .toc_open{291}
306 position:absolute;292
307 margin-left:-3.6em; margin-top:1.8em;293#dw__toc > div {
308 display:block;294 margin-top:-1.8em;
309 width:20.7em; height:22px;295 border-top:1px solid #F6F6F6;
310 border-right:1px outset #D2D2D2;296}
311 border-bottom:1px outset #D2D2D2;297
312 border-radius:0 0 8px 0;298#dw__toc ul.toc{
313 -moz-border-radius:0 0 8px 0;299 margin-left:1.2em;
314 -o-border-radius:0 0 8px 0;300 list-style:none;
315 -khtml-border-radius:0 0 8px 0;301}
316 /* Chrome - Safari */302#dw__toc ul.toc ul {
317 -webkit-border-bottom-right-radius:8px;303 margin-top:0.2em;
318 }304 margin-left:1em;
319 .toc_open span{305 margin-bottom:0.2em;
320 margin:-1.2em 0 0 0.4em;306}
321 background-position:50% -14px;307#dw__toc ul.toc li {
322 }308 position:relative; z-index:1;
309 padding: 0px;
310 line-height:1.4em;
311 font-size:0.9em;
312}
313#dw__toc .toc li li {
314 font-size:1em;
315}
323 316
324 #toc__inside{317#dw__toc li.level1{
325 margin-top:-1.56em;318 counter-reset:sousmenus;
326 background-color:#F6F6F6;319}
327 border:1px outset #D2D2D2;320#dw__toc li.level1 > div:before {
328 border-top:1px solid #F6F6F6;321 padding-right:0.2em;
329 border-radius:0 0 8px 8px;322 counter-increment:menus;
330 -moz-border-radius:0 0 8px 8px;323 content:counter(menus)".";
331 -o-border-radius:0 0 8px 8px;324}
332 -khtml-border-radius:0 0 8px 8px;325
333 /* Chrome - Safari */326#dw__toc li.level2 > div:before {
334 -webkit-border-bottom-right-radius:8px;327 counter-increment:sousmenus;
335 -webkit-border-bottom-left-radius:8px;328 content:counter(menus) "." counter(sousmenus) " ";
336 }329}
337330/* fin - Table des matières */
338 /* Début - Effet de numérotation */331
339 #toc__inside li.level1{332/* Effet de numérotation des sections */
340 counter-reset:sousmenus;333
341 }334#main > h2{
342 #toc__inside li.level1 span:before {335 counter-reset:soussection;
343 padding-right:0.2em;336 padding-right:0.2em;
344 counter-increment:menus;337 counter-increment:section;
345 content:counter(menus)".";338}
346 }339#main > h2:before {
347 #toc__inside li.level2 span:before {340 content:counter(section) ". ";
348 counter-increment:sousmenus;341}
349 content:counter(menus) "." counter(sousmenus) " ";342
350 }343#main > h3 {
351344 counter-increment:soussection;
352 #main h2{345 counter-reset:soussoussection paragraphe sousparagraphe;
353 counter-reset:soussection;346}
354 }347#main > h3:before {
355 #main h2 a:before {348 content:counter(section) "." counter(soussection) " ";
356 padding-right:0.2em;349}
357 counter-increment:section;350
358 content:counter(section)".";351/* Fin - Effet de numérotation */
359 }
360 #main h2#pagetitle{
361 counter-increment:none;
362 counter-reset:none;
363 }
364 #main h3 {
365 counter-increment:soussection;
366 counter-reset:soussoussection paragraphe sousparagraphe;
367 }
368 #main h3:before {
369 content:counter(section) "." counter(soussection) " ";
370 }
371 /* Fin - Effet de numérotation */
372352
373.notehelp{353.notehelp{
374 354
375355
=== modified file 'theme2010/css/doc-kubuntu.css'
--- theme2010/css/doc-kubuntu.css 2011-06-26 10:06:33 +0000
+++ theme2010/css/doc-kubuntu.css 2012-10-23 20:51:19 +0000
@@ -49,19 +49,19 @@
4949
50 #main h2{50 #main h2{
51 }51 }
52 #main h2 a, #main h3 a, #main h4 a, #main h5 a{52 #main h2, #main h3, #main h4, #main h5 {
53 color:#0019A8;53 color:#0019A8;
54 }54 }
5555
56 #main h4{ font-style:italic; }56 #main h4{ font-style:italic; }
5757
58/* Menu droit */58/* Menu droit */
59div.toc{59#dw__toc {
60 background:transparent url('../images/commun/kubuntu/ruban_center.png') top left repeat-x;60 background:url('../images/commun/kubuntu/ruban_center.png') top left repeat-x #F6F6F6;
61}61}
62 .tocheader{62#dw__toc h3.toggle {
63 background:transparent url('../images/commun/kubuntu/ruban_left.png') top left no-repeat;63 background:transparent url('../images/commun/kubuntu/ruban_left.png') top left no-repeat;
64 }64}
6565
66/* TABLEAUX */66/* TABLEAUX */
67 .inline tr{67 .inline tr{
6868
=== modified file 'theme2010/css/doc-ubuntu.css'
--- theme2010/css/doc-ubuntu.css 2011-04-27 21:17:22 +0000
+++ theme2010/css/doc-ubuntu.css 2012-10-23 20:51:19 +0000
@@ -49,19 +49,19 @@
4949
50 #main h2{50 #main h2{
51 }51 }
52 #main h2 a, #main h3 a, #main h4 a, #main h5 a{52 #main h2 , #main h3 , #main h4 , #main h5 {
53 color:#C80015;53 color:#C80015;
54 }54 }
5555
56 #main h4 a{ font-style:italic; }56 #main h4 a{ font-style:italic; }
5757
58/* Menu droit */58/* Menu droit */
59div.toc{59#dw__toc {
60 background:transparent url('../images/commun/ubuntu/ruban_center.png') top left repeat-x;60 background: url('../images/commun/ubuntu/ruban_center.png') top left repeat-x #F6F6F6;
61}61}
62 .tocheader{62#dw__toc h3.toggle {
63 background:transparent url('../images/commun/ubuntu/ruban_left.png') top left no-repeat;63 background:transparent url('../images/commun/ubuntu/ruban_left.png') top left no-repeat;
64 }64}
6565
66/* TABLEAUX */66/* TABLEAUX */
67 .inline tr{67 .inline tr{
6868
=== modified file 'theme2010/css/doc-xubuntu.css'
--- theme2010/css/doc-xubuntu.css 2011-04-27 21:17:22 +0000
+++ theme2010/css/doc-xubuntu.css 2012-10-23 20:51:19 +0000
@@ -49,19 +49,19 @@
4949
50 #main h2{50 #main h2{
51 }51 }
52 #main h2 a, #main h3 a, #main h4 a, #main h5 a{52 #main h2 a, #main h3, #main h4, #main h5 {
53 color:#3A5065;53 color:#3A5065;
54 }54 }
5555
56 #main h4{ font-style:italic; }56 #main h4{ font-style:italic; }
5757
58/* Menu droit */58/* Menu droit */
59div.toc{59#dw__toc {
60 background:transparent url('../images/commun/xubuntu/ruban_center.png') top left repeat-x;60 background:url('../images/commun/xubuntu/ruban_center.png') top left repeat-x #F6F6F6;
61}61}
62 .tocheader{62#dw__toc h3.toggle {
63 background:transparent url('../images/commun/xubuntu/ruban_left.png') top left no-repeat;63 background:transparent url('../images/commun/xubuntu/ruban_left.png') top left no-repeat;
64 }64}
6565
66/* TABLEAUX */66/* TABLEAUX */
67 .inline tr{67 .inline tr{

Subscribers

People subscribed via source and target branches

to all changes: