]>
Commit | Line | Data |
---|---|---|
bfbe8e41 ER |
1 | diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/_mediaoptions.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/_mediaoptions.css |
2 | --- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/_mediaoptions.css 2011-01-16 20:04:09.000000000 +0200 | |
3 | +++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/_mediaoptions.css 2011-05-26 19:56:55.000000000 +0300 | |
4 | @@ -5,7 +5,7 @@ | |
5 | display:none; | |
6 | border: 1px solid __border__; | |
7 | position: absolute; | |
8 | - width:270px; | |
9 | + width:280px; | |
10 | } | |
11 | ||
12 | #media__popup h1 { | |
13 | diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/design.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/design.css | |
14 | --- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/design.css 2011-01-16 20:04:09.000000000 +0200 | |
15 | +++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/design.css 2011-05-26 19:56:55.000000000 +0300 | |
16 | @@ -85,8 +85,10 @@ | |
17 | } | |
18 | ||
19 | div.dokuwiki textarea.edit { | |
20 | - font-family: monospace; | |
21 | - font-size: 14px; | |
22 | + font-family: monospace, serif; | |
23 | + /* second generic font fixes problem with font-size, see | |
24 | + http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ | |
25 | + font-size: 100%; | |
26 | color: __text__; | |
27 | background-color: __background__; | |
28 | border: 1px solid __border__; | |
29 | @@ -464,9 +466,14 @@ | |
30 | padding-left: 3px; | |
31 | } | |
32 | ||
33 | +div.dokuwiki pre, | |
34 | +div.dokuwiki code { | |
35 | + font-family: monospace, serif; | |
36 | + /* second generic font fixes problem with font-size, see | |
37 | + http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */ | |
38 | + font-size: 100%; | |
39 | +} | |
40 | div.dokuwiki pre { | |
41 | - font-family: monospace; | |
42 | - font-size: 120%; | |
43 | padding: 0.5em; | |
44 | border: 1px dashed __border__; | |
45 | color: __text__; | |
46 | @@ -519,11 +526,6 @@ | |
47 | } | |
48 | ||
49 | ||
50 | -/* inline code words */ | |
51 | -div.dokuwiki code { | |
52 | - font-size: 120%; | |
53 | -} | |
54 | - | |
55 | /* inline tables */ | |
56 | div.dokuwiki table.inline { | |
57 | background-color: __background__; | |
58 | @@ -652,10 +654,12 @@ | |
59 | font-family: monospace; | |
60 | font-size: 100%; | |
61 | } | |
62 | -div.dokuwiki td.diff-addedline { | |
63 | +div.dokuwiki td.diff-addedline, | |
64 | +div.dokuwiki span.diff-addedline { | |
65 | background-color: #ddffdd; | |
66 | } | |
67 | -div.dokuwiki td.diff-deletedline { | |
68 | +div.dokuwiki td.diff-deletedline, | |
69 | +div.dokuwiki span.diff-deletedline { | |
70 | background-color: #ffffbb; | |
71 | } | |
72 | div.dokuwiki td.diff-context { | |
73 | diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/main.php ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/main.php | |
74 | --- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/main.php 2011-01-16 20:04:09.000000000 +0200 | |
75 | +++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/main.php 2011-05-26 19:56:55.000000000 +0300 | |
76 | @@ -29,7 +29,7 @@ | |
77 | ||
78 | <?php tpl_metaheaders()?> | |
79 | ||
80 | - <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> | |
81 | + <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> | |
82 | ||
83 | <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> | |
84 | </head> | |
85 | @@ -92,7 +92,7 @@ | |
86 | <!-- wikipage stop --> | |
87 | </div> | |
88 | ||
89 | - <div class="clearer"> </div> | |
90 | + <div class="clearer"></div> | |
91 | ||
92 | <?php tpl_flush()?> | |
93 | ||
94 | diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/print.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/print.css | |
95 | --- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/print.css 2011-01-16 20:04:09.000000000 +0200 | |
96 | +++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/print.css 2011-05-26 19:56:55.000000000 +0300 | |
97 | @@ -33,16 +33,11 @@ | |
98 | text-align: right; | |
99 | } | |
100 | ||
101 | - | |
102 | -div.notify, | |
103 | -div.info, | |
104 | -div.success, | |
105 | -div.error, | |
106 | -div.breadcrumbs, | |
107 | -div.secedit { | |
108 | +div.breadcrumbs { | |
109 | display: none; | |
110 | } | |
111 | ||
112 | + | |
113 | /* --------------------- Text formating -------------------------------- */ | |
114 | ||
115 | /* external link */ | |
116 | @@ -102,17 +97,16 @@ | |
117 | margin: 3px; | |
118 | } | |
119 | ||
120 | +/* the styles for media images are already in | |
121 | + lib/styles/all.css, these are additional styles */ | |
122 | img.medialeft { | |
123 | - border: 0; | |
124 | - float: left; | |
125 | margin: 0 1.5em 0 0; | |
126 | } | |
127 | - | |
128 | img.mediaright { | |
129 | - border: 0; | |
130 | - float: right; | |
131 | margin: 0 0 0 1.5em; | |
132 | } | |
133 | +img.mediacenter { | |
134 | +} | |
135 | ||
136 | /* unordered lists */ | |
137 | ul { | |
138 | @@ -230,17 +224,5 @@ | |
139 | border: 1px solid #000000; | |
140 | } | |
141 | ||
142 | -.leftalign { | |
143 | - text-align: left; | |
144 | -} | |
145 | - | |
146 | -.centeralign { | |
147 | - text-align: center; | |
148 | -} | |
149 | - | |
150 | -.rightalign { | |
151 | - text-align: right; | |
152 | -} | |
153 | - | |
154 | .toc, .footerinc, .header, .bar, .user { display: none; } | |
155 | ||
156 | diff -ur -x .svn -x .git -x .bzr -x CVS ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/rtl.css ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/rtl.css | |
157 | --- ../BUILD/dokuwiki-2010-11-07a/lib/tpl/default/rtl.css 2011-01-16 20:04:09.000000000 +0200 | |
158 | +++ ../BUILD/dokuwiki-2011-05-25/lib/tpl/default/rtl.css 2011-05-26 19:56:55.000000000 +0300 | |
159 | @@ -55,8 +55,7 @@ | |
160 | div.dokuwiki a.urlextern, | |
161 | div.dokuwiki a.interwiki, | |
162 | div.dokuwiki a.windows, | |
163 | -div.dokuwiki a.mail, | |
164 | -div.dokuwiki a.mail.JSnocheck { | |
165 | +div.dokuwiki a.mail { | |
166 | /* should work but doesn't - so we just disable icons here*/ | |
167 | /* | |
168 | background-position: right 1px; |