]> git.pld-linux.org Git - packages/dokuwiki-tpl-sidebar.git/blame - dw-20101007.patch
projects / packages / dokuwiki-tpl-sidebar.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- update dw patch against real 2010-11-07 release; rel 2
[packages/dokuwiki-tpl-sidebar.git] / dw-20101007.patch
CommitLineData
de02507c
ER		 1diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_admin.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_admin.css
2--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_admin.css 1970-01-01 02:00:00.000000000 +0200
3+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_admin.css 2010-10-07 11:08:14.000000000 +0300
4@@ -0,0 +1,48 @@
5+#admin__version {
6+ clear:left;
7+ float: right;
8+ color: __text_neu__;
9+}
10+
11+.dokuwiki ul.admin_tasks {
12+ font-size: 115%;
13+ float: left;
14+ width: 40%;
15+ list-style-type: none;
16+}
17+
18+.dokuwiki ul.admin_tasks li {
19+ line-height: 22px;
20+ padding-left: 35px;
21+ margin: 1em 0;
22+ background: transparent none no-repeat scroll 0 0;
23+ text-align: left;
24+}
25+
26+.dokuwiki ul.admin_tasks li div.li {
27+ font-weight: bold;
28+}
29+
30+.dokuwiki ul.admin_tasks li.admin_acl {
31+ background-image: url(../../images/admin/acl.png);
32+}
33+
34+.dokuwiki ul.admin_tasks li.admin_usermanager {
35+ background-image: url(../../images/admin/usermanager.png);
36+}
37+
38+.dokuwiki ul.admin_tasks li.admin_plugin {
39+ background-image: url(../../images/admin/plugin.png);
40+}
41+
42+.dokuwiki ul.admin_tasks li.admin_config {
43+ background-image: url(../../images/admin/config.png);
44+}
45+
46+.dokuwiki ul.admin_tasks li.admin_revert {
47+ background-image: url(../../images/admin/revert.png);
48+}
49+
50+.dokuwiki ul.admin_tasks li.admin_popularity {
51+ background-image: url(../../images/admin/popularity.png);
52+}
53diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/design.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/design.css
54--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/design.css 2009-02-14 14:13:25.000000000 +0200
55+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/design.css 2010-10-07 11:08:14.000000000 +0300
56@@ -91,7 +91,10 @@
57 background-color: __background__;
58 border: 1px solid __border__;
59 padding: 0.3em 0 0 0.3em;
60- width: 100%;
61+ /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */
62+ width: 700px;
63+ min-width: 100%;
64+ max-width: 100%;
65 }
66
67 /* nice alphatransparency background except for IE <7 */
68@@ -137,6 +140,7 @@
69 div.dokuwiki textarea.edit[readonly],
70 div.dokuwiki input.edit[disabled],
71 div.dokuwiki input.edit[readonly],
72+div.dokuwiki input.button[disabled],
73 div.dokuwiki select.edit[disabled] {
74 background-color: __background_neu__!important;
75 color: __text_neu__!important;
76@@ -404,11 +408,11 @@
77 div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;}
78
79 /* indent different sections */
80-div.dokuwiki div.level1 {margin-left: 3px;}
81-div.dokuwiki div.level2 {margin-left: 23px;}
82-div.dokuwiki div.level3 {margin-left: 43px;}
83-div.dokuwiki div.level4 {margin-left: 63px;}
84-div.dokuwiki div.level5 {margin-left: 83px;}
85+div.dokuwiki div.level1 { margin-left: 3px; }
86+div.dokuwiki div.level2 { margin-left: 23px; }
87+div.dokuwiki div.level3 { margin-left: 43px; }
88+div.dokuwiki div.level4 { margin-left: 63px; }
89+div.dokuwiki div.level5 { margin-left: 83px; }
90
91 /* unordered lists */
92 div.dokuwiki ul {
93@@ -428,12 +432,10 @@
94 font-weight: bold;
95 }
96
97-/* no gap in between nested lists */
98-div.dokuwiki li ul {
99- margin-bottom: 0;
100-}
101+/* no bottom gap in between and smaller left margin for nested lists */
102+div.dokuwiki li ul,
103 div.dokuwiki li ol {
104- margin-bottom: 0;
105+ margin: 0 0 0 1.5em;
106 }
107
108 /* the list items overriding the ul/ol definition */
109@@ -442,10 +444,10 @@
110 font-weight: normal;
111 }
112
113-div.dokuwiki ol {list-style-type: decimal}
114-div.dokuwiki ol ol {list-style-type: upper-roman}
115-div.dokuwiki ol ol ol {list-style-type: lower-alpha}
116-div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
117+div.dokuwiki ol { list-style-type: decimal; }
118+div.dokuwiki ol ol { list-style-type: upper-roman; }
119+div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
120+div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
121
122 div.dokuwiki li.open {
123 list-style-image: url(images/open.gif);
124@@ -463,6 +465,7 @@
125 }
126
127 div.dokuwiki pre {
128+ font-family: monospace;
129 font-size: 120%;
130 padding: 0.5em;
131 border: 1px dashed __border__;
132@@ -480,16 +483,47 @@
133 background-color: __background_other__;
134 }
135
136-/* inline code words */
137-div.dokuwiki code {
138- font-size: 120%;
139-}
140-
141 /* code blocks by file tag */
142 div.dokuwiki pre.file {
143 background-color: __background_alt__;
144 }
145
146+/* filenames for file and code blocks */
147+div.dokuwiki dl.file,
148+div.dokuwiki dl.code {
149+ margin-top: 2em;
150+ margin-bottom: 2.5em;
151+}
152+
153+div.dokuwiki dl.file dt,
154+div.dokuwiki dl.code dt {
155+ border: 1px dashed __border__;
156+ display: inline;
157+ padding: 0.1em 1em;
158+ margin-left: 2em;
159+}
160+
161+div.dokuwiki dl.code dt a,
162+div.dokuwiki dl.file dt a {
163+ color: __text__;
164+}
165+
166+div.dokuwiki dl.code dt {
167+ background-color: __background_other__;
168+ border-bottom: 1px solid __background_other__;
169+}
170+
171+div.dokuwiki dl.file dt {
172+ background-color: __background_alt__;
173+ border-bottom: 1px solid __background_alt__;
174+}
175+
176+
177+/* inline code words */
178+div.dokuwiki code {
179+ font-size: 120%;
180+}
181+
182 /* inline tables */
183 div.dokuwiki table.inline {
184 background-color: __background__;
185@@ -658,6 +692,7 @@
186 text-align: left;
187 padding: 4px;
188 max-width: 40%; /* IE's width is handled in javascript */
189+ min-width: 5em;
190 }
191
192 /* overcome IE issue with one line code or file boxes which require h. scrolling */
193@@ -707,10 +742,14 @@
194
195 div.dokuwiki ul.search_quickhits li {
196 margin: 0 1.0em 0 1.0em;
197- float:left;
198+ float: left;
199 width: 30%;
200 }
201
202+div.dokuwiki .section_highlight {
203+ background-color: __background_alt__ !important;
204+}
205+
206 /* ------------------ Additional ---------------------- */
207
208 div.footerinc {
209@@ -761,6 +800,10 @@
210 background-color: __background_alt__;
211 }
212
213+div.pk_hl {
214+ width: 125px;
215+}
216+
217 button.pickerbutton {
218 padding: 0px;
219 margin: 0 1px 1px 0;
220@@ -792,6 +835,7 @@
221 }
222
223 div.dokuwiki div.imagemeta img.thumb {
224- float:left;
225+ float: left;
226 margin-right: 0.1em;
227 }
228+
229diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/detail.php ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/detail.php
230--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/detail.php 2009-02-14 14:13:25.000000000 +0200
231+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/detail.php 2010-10-07 11:08:14.000000000 +0300
232@@ -53,7 +53,7 @@
233 <dl class="img_tags">
234 <?php
235 $t = tpl_img_getTag('Date.EarliestTime');
236- if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.strftime($conf['dformat'],$t).'</dd>';
237+ if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
238
239 $t = tpl_img_getTag('File.Name');
240 if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
241diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/footer.html ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/footer.html
242--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/footer.html 2009-02-14 14:13:25.000000000 +0200
243+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/footer.html 2010-10-12 19:01:18.902554928 +0300
244@@ -28,6 +28,8 @@
245
246 <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
247
248+ <a <?php echo $tgt?> href="http://www.pld-linux.org/" title="PLD Linux"><img src="<?php echo DOKU_TPL; ?>images/button-pld.png" width="80" height="15" alt="PLD Linux" /></a>
249+
250 <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
251
252 <?php
253Files ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/images/button-php.gif and ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/images/button-php.gif differ
254diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/layout.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/layout.css
255--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/layout.css 2009-02-14 14:13:25.000000000 +0200
256+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/layout.css 2010-10-07 11:08:14.000000000 +0300
257@@ -58,7 +58,7 @@
258 }
259
260 div.dokuwiki #bar__bottom {
261- margin-bottom:3px;
262+ margin-bottom: 3px;
263 }
264
265 /* ------------- File Metadata ----------------------- */
266diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_linkwiz.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_linkwiz.css
267--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_linkwiz.css 1970-01-01 02:00:00.000000000 +0200
268+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_linkwiz.css 2010-10-07 11:08:14.000000000 +0300
269@@ -0,0 +1,68 @@
270+#link__wiz {
271+ position: absolute;
272+ display: block;
273+ z-index: 99;
274+ width: 300px;
275+ height: 250px;
276+ padding: 0;
277+ margin: 0;
278+ overflow: hidden;
279+ border: 1px solid __border__;
280+ background-color: __background_neu__;
281+ text-align: center;
282+}
283+
284+#link__wiz_header {
285+ background-color: __background_alt__;
286+ height: 16px;
287+ margin-bottom: 5px;
288+}
289+
290+#link__wiz_close {
291+ cursor: pointer;
292+ margin: 0;
293+}
294+
295+#link__wiz_result {
296+ background-color: __background__;
297+ width: 293px;
298+ height: 193px;
299+ overflow: auto;
300+ border: 1px solid __border__;
301+ margin: 3px auto;
302+ text-align: left;
303+}
304+
305+#link__wiz_result div.type_u {
306+ padding: 3px 3px 3px 22px;
307+ background: transparent url(../../images/up.png) 3px 3px no-repeat;
308+}
309+
310+#link__wiz_result div.type_f {
311+ padding: 3px 3px 3px 22px;
312+ background: transparent url(../../images/page.png) 3px 3px no-repeat;
313+}
314+
315+#link__wiz_result div.type_d {
316+ padding: 3px 3px 3px 22px;
317+ background: transparent url(../../images/ns.png) 3px 3px no-repeat;
318+}
319+
320+#link__wiz_result div.even {
321+ background-color: __background_neu__;
322+}
323+
324+#link__wiz_result div.selected {
325+ background-color: __background_alt__;
326+}
327+
328+#link__wiz_result span {
329+ display: block;
330+ color: __text_neu__;
331+}
332+
333+/*FIXME maybe move to a more general style sheet*/
334+.ondrag {
335+ cursor: move;
336+ opacity: 0.8;
337+}
338diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/main.php ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/main.php
339--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/main.php 2009-02-14 14:13:25.000000000 +0200
340+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/main.php 2010-10-07 11:08:14.000000000 +0300
341@@ -82,7 +82,7 @@
342 <?php }?>
343
344 </div>
345- <?php flush()?>
346+ <?php tpl_flush()?>
347
348 <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
349
350@@ -94,7 +94,7 @@
351
352 <div class="clearer">&nbsp;</div>
353
354- <?php flush()?>
355+ <?php tpl_flush()?>
356
357 <div class="stylefoot">
358
359@@ -113,10 +113,10 @@
360 <div class="bar-left" id="bar__bottomleft">
361 <?php tpl_button('edit')?>
362 <?php tpl_button('history')?>
363+ <?php tpl_button('revert')?>
364 </div>
365 <div class="bar-right" id="bar__bottomright">
366 <?php tpl_button('subscribe')?>
367- <?php tpl_button('subscribens')?>
368 <?php tpl_button('admin')?>
369 <?php tpl_button('profile')?>
370 <?php tpl_button('login')?>
371diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/media.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/media.css
372--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/media.css 2009-02-14 14:13:25.000000000 +0200
373+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/media.css 2010-10-07 11:08:14.000000000 +0300
374@@ -35,7 +35,7 @@
375 /* --- Tree formatting --- */
376
377 #media__tree img {
378- float:left;
379+ float: left;
380 padding: 0.5em 0.3em 0 0;
381 }
382
383diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_mediaoptions.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_mediaoptions.css
384--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_mediaoptions.css 1970-01-01 02:00:00.000000000 +0200
385+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_mediaoptions.css 2010-10-07 11:08:14.000000000 +0300
386@@ -0,0 +1,92 @@
387+/* --- popup --- */
388+
389+#media__popup {
390+ background-color:__background__;
391+ display:none;
392+ border: 1px solid __border__;
393+ position: absolute;
394+ width:270px;
395+}
396+
397+#media__popup h1 {
398+ text-align:center;
399+ font-weight:normal;
400+ background-color: __background_alt__;
401+ height: 16px;
402+ margin-bottom: 5px;
403+ font-size:12px;
404+ border-bottom: 0;
405+}
406+
407+#media__popup p {
408+ display:block;
409+ line-height:14pt;
410+ margin:0.5em;
411+}
412+
413+#media_nolink {
414+ padding:4px 0;
415+}
416+
417+#media__popup label {
418+ float:left;
419+ width:9em;
420+}
421+
422+#media__popup .button {
423+ margin-left:auto;
424+ margin-right:auto;
425+}
426+
427+#media__popup .btnlbl {
428+ text-align:center;
429+}
430+
431+#media__popup .btnlbl input {
432+ margin:0 1em;
433+}
434+
435+#media__closeimg {
436+ float:right;
437+}
438+
439+/* --- display options --- */
440+
441+#media__linkopts label,
442+#media__nolnk {
443+ width: 80px;
444+ float: left;
445+ margin-left: 10px;
446+}
447+
448+#media__linkopts label{
449+ line-height: 20px;
450+}
451+
452+#media__nolnk,
453+#media__linkopts label.long{
454+ margin-bottom: 8px;
455+ line-height: 12px;
456+}
457+
458+#media__linkopts label.long{
459+ width: 150px;
460+ float: none;
461+}
462+
463+#media__linkopts br {
464+ clear: both;
465+}
466+
467+#media__linkopts select {
468+ width: 60px;
469+ margin-left: 10px;
470+}
471+
472+#media__linkopts input.edit {
473+ width:50px;
474+ margin-left:10px;
475+}
476+#media__linkopts #media__title {
477+ width:150px;
478+}
479diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/print.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/print.css
480--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/print.css 2009-02-14 14:13:25.000000000 +0200
481+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/print.css 2010-10-07 11:08:14.000000000 +0300
482@@ -7,26 +7,30 @@
483
484 table {
485 font-size: 100%;
486- padding:0;
487- margin:0;
488+ padding: 0;
489+ margin: 0;
490 }
491
492-tr,td,th {padding:0; margin:0;}
493+tr,td,th { padding: 0; margin: 0; }
494
495-img {border:0}
496+img { border: 0; }
497
498 a {
499- color:#000000;
500- text-decoration:none;
501+ color: #000000;
502+ text-decoration: none;
503 background: none !important;
504 }
505
506+a.interwiki {
507+ padding-left: 0px !important;
508+}
509+
510
511 div.meta {
512- clear:both;
513+ clear: both;
514 margin-top: 1em;
515- font-size:70%;
516- text-align:right;
517+ font-size: 70%;
518+ text-align: right;
519 }
520
521
522@@ -36,7 +40,7 @@
523 div.error,
524 div.breadcrumbs,
525 div.secedit {
526- display:none;
527+ display: none;
528 }
529
530 /* --------------------- Text formating -------------------------------- */
531@@ -60,7 +64,7 @@
532 }
533
534 /* existing wikilink */
535-a.wikilink1 {text-decoration:underline }
536+a.wikilink1 { text-decoration: underline; }
537
538 /* the document */
539 div.page {
540@@ -83,15 +87,15 @@
541 padding-top: 0.5em;
542 padding-bottom: 0;
543 border-bottom: 1px solid #000000;
544- clear:left;
545+ clear: left;
546 }
547
548 /* special headlines */
549-h1 {font-size: 160%; font-weight: bold;}
550-h2 {font-size: 150%; }
551-h3 {font-size: 140%; border-bottom: none; }
552-h4 {font-size: 120%; border-bottom: none; }
553-h5 {font-size: 100%; border-bottom: none; }
554+h1 { font-size: 160%; font-weight: bold; }
555+h2 { font-size: 150%; }
556+h3 { font-size: 140%; border-bottom: none; }
557+h4 { font-size: 120%; border-bottom: none; }
558+h5 { font-size: 100%; border-bottom: none; }
559
560 /* embedded images */
561 img.media {
562@@ -133,16 +137,20 @@
563 margin-bottom: 0;
564 }
565
566-div.dokuwiki ol {list-style-type: decimal}
567-div.dokuwiki ol ol {list-style-type: upper-roman}
568-div.dokuwiki ol ol ol {list-style-type: lower-alpha}
569-div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
570+div.dokuwiki ol { list-style-type: decimal; }
571+div.dokuwiki ol ol { list-style-type: upper-roman; }
572+div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
573+div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
574
575 /* the list items overriding the ol definition */
576 span.li {
577 font-weight: normal;
578 }
579
580+pre {
581+ font-family: monospace;
582+}
583+
584 /* code blocks by indention */
585 pre.pre {
586 font-size: 8pt;
587@@ -176,29 +184,29 @@
588 }
589
590 /* footnotes */
591-div.footnotes{
592- clear:both;
593+div.footnotes {
594+ clear: both;
595 border-top: 1px solid #000000;
596 padding-left: 1em;
597 margin-top: 1em;
598 }
599
600-div.fn{
601- font-size:90%;
602+div.fn {
603+ font-size: 90%;
604 }
605
606-a.fn_top{
607- vertical-align:super;
608- font-size:80%;
609+a.fn_top {
610+ vertical-align: super;
611+ font-size: 80%;
612 }
613
614-a.fn_bot{
615- vertical-align:super;
616- font-size:80%;
617- font-weight:bold;
618+a.fn_bot {
619+ vertical-align: super;
620+ font-size: 80%;
621+ font-weight: bold;
622 }
623
624-acronym{
625+acronym {
626 border: 0;
627 }
628
629@@ -222,17 +230,17 @@
630 border: 1px solid #000000;
631 }
632
633-.leftalign{
634+.leftalign {
635 text-align: left;
636 }
637
638-.centeralign{
639+.centeralign {
640 text-align: center;
641 }
642
643-.rightalign{
644+.rightalign {
645 text-align: right;
646 }
647
648-.toc, .footerinc, .header, .bar, .user {display:none}
649+.toc, .footerinc, .header, .bar, .user { display: none; }
650
651diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/rtl.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/rtl.css
652--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/rtl.css 2009-02-14 14:13:25.000000000 +0200
653+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/rtl.css 2010-10-07 11:08:14.000000000 +0300
654@@ -34,7 +34,7 @@
655 }
656
657 div.meta div.user {
658- float: right
659+ float: right;
660 }
661
662 div.meta div.doc {
663@@ -45,6 +45,10 @@
664
665 div.dokuwiki ul,
666 div.dokuwiki ol {
667+ margin: 0.5em 3.5em 0.5em 0;
668+}
669+div.dokuwiki li ul,
670+div.dokuwiki li ol {
671 margin: 0.5em 1.5em 0.5em 0;
672 }
673
674@@ -72,18 +76,18 @@
675 }
676
677 /* special headlines */
678-div.dokuwiki h1 {margin-left: 0px; margin-right: 0px;}
679-div.dokuwiki h2 {margin-left: 0px; margin-right: 20px;}
680-div.dokuwiki h3 {margin-left: 0px; margin-right: 40px;}
681-div.dokuwiki h4 {margin-left: 0px; margin-right: 60px;}
682-div.dokuwiki h5 {margin-left: 0px; margin-right: 80px;}
683+div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; }
684+div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; }
685+div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; }
686+div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; }
687+div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; }
688
689 /* indent different sections */
690-div.dokuwiki div.level1 {margin-left: 0px; margin-right: 3px;}
691-div.dokuwiki div.level2 {margin-left: 0px; margin-right: 23px;}
692-div.dokuwiki div.level3 {margin-left: 0px; margin-right: 43px;}
693-div.dokuwiki div.level4 {margin-left: 0px; margin-right: 63px;}
694-div.dokuwiki div.level5 {margin-left: 0px; margin-right: 83px;}
695+div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; }
696+div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; }
697+div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; }
698+div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; }
699+div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; }
700
701 /* TOC control */
702 div.dokuwiki div.toc {
703@@ -105,15 +109,39 @@
704
705 div.dokuwiki ul.toc li {
706 background-position: right 0.6em;
707- padding-right:0.4em;
708+ padding-right: 0.4em;
709 direction: rtl;
710 }
711
712 div.dokuwiki ul.toc li.clear {
713- padding-right:0.4em;
714+ padding-right: 0.4em;
715 }
716
717-div.dokuwiki pre {
718+div.dokuwiki .code {
719+ direction: ltr;
720 text-align: left;
721 }
722+div.dokuwiki blockquote {
723+ border-left: 0;
724+ padding-left: 0;
725+ border-right: 2px solid __border__;
726+ padding-right: 3px;
727+}
728+
729+/* Admin corrections */
730+#admin__version {
731+ clear: right;
732+ float: left;
733+}
734+
735+.dokuwiki ul.admin_tasks {
736+ float: right;
737+}
738+
739+.dokuwiki ul.admin_tasks li {
740+ padding-left: 0px;
741+ padding-right: 35px;
742+ background: transparent none no-repeat scroll right 0;
743+ text-align: right;
744+}
745
746diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/style.ini ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/style.ini
747--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/style.ini 2009-02-14 14:13:25.000000000 +0200
748+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/style.ini 2010-10-07 11:08:14.000000000 +0300
749@@ -10,7 +10,11 @@
750 design.css = screen
751 style.css = screen
752
753-media.css = screen
754+media.css = screen
755+_mediaoptions.css = screen
756+_admin.css = screen
757+_linkwiz.css = screen
758+_subscription.css = screen
759
760 rtl.css = rtl
761 print.css = print
762diff -ur -x .svn -x .git -x .bzr -x CVS -Nur ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_subscription.css ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_subscription.css
763--- ../BUILD/dokuwiki-2009-02-14/lib/tpl/default/_subscription.css 1970-01-01 02:00:00.000000000 +0200
764+++ ../BUILD/dokuwiki-rc2010-10-07/lib/tpl/default/_subscription.css 2010-10-07 11:08:14.000000000 +0300
765@@ -0,0 +1,21 @@
766+/**
767+ * Styles for the subscription page
768+ */
769+
770+form#subscribe__form {
771+ display: block;
772+ width: 300px;
773+ text-align: center;
774+}
775+
776+form#subscribe__form fieldset {
777+ text-align: left;
778+ margin: 0.5em 0;
779+}
780+
781+form#subscribe__form label {
782+ display:block;
783+ margin: 0 0.5em 0.5em;
784+}
785+
786+
Sidebar navigation with DokuWiki
This page took 0.176955 seconds and 4 git commands to generate.