OSDN > Find Software > Internet > WWW/HTTP > Dynamic Content > Wiki > PukiWiki > SCM > git > pukiwiki > Commit

PukiWiki
Fork
pukiwiki_devel
pukiwiki_sandbox
pukiwiki

R/O
HTTP
SSH
HTTPS

pukiwiki: Commit

Commit MetaInfo

Revision	30e5d9a83726d2c9061957906547ed3eaa27ee9f (tree)
Time	2020-01-22 00:06:15
Author	umorigu <umorigu@gmai...>
Commiter	umorigu

Log Message

BugTrack/2494 Simplify CSS: 0px to 0

Change Summary

modified: lib/html.php (diff)
modified: plugin/attach.inc.php (diff)
modified: plugin/ref.inc.php (diff)
modified: plugin/size.inc.php (diff)
modified: skin/pukiwiki.css (diff)
modified: skin/tdiary.css (diff)

Incremental Difference

--- a/lib/html.php

+++ b/lib/html.php

		@@ -2,7 +2,7 @@
2	2	// PukiWiki - Yet another WikiWikiWeb clone.
3	3	// html.php
4	4	// Copyright
5		-// 2002-2019 PukiWiki Development Team
	5	+// 2002-2020 PukiWiki Development Team
6	6	// 2001-2002 Originally written by yu-ji
7	7	// License: GPL v2 or (at your option) any later version
8	8	//

		@@ -413,7 +413,7 @@ EOD;
413	413	$h_msg_edit_unloadbefore_message = htmlsc($_msg_edit_unloadbefore_message);
414	414	$body = <<<EOD
415	415	<div class="edit_form">
416		- <form action="$script" method="post" class="_plugin_edit_edit_form" style="margin-bottom:0px;">
	416	+ <form action="$script" method="post" class="_plugin_edit_edit_form" style="margin-bottom:0;">
417	417	$template
418	418	$addtag
419	419	<input type="hidden" name="cmd" value="edit" />

		@@ -431,7 +431,7 @@ $template
431	431	</div>
432	432	<textarea name="original" rows="1" cols="1" style="display:none">$s_original</textarea>
433	433	</form>
434		- <form action="$script" method="post" class="_plugin_edit_cancel" style="margin-top:0px;">
	434	+ <form action="$script" method="post" class="_plugin_edit_cancel" style="margin-top:0;">
435	435	<input type="hidden" name="cmd" value="edit" />
436	436	<input type="hidden" name="page" value="$s_page" />
437	437	<input type="submit" name="cancel" value="$_btn_cancel" accesskey="c" />

--- a/plugin/attach.inc.php

+++ b/plugin/attach.inc.php

		@@ -2,7 +2,7 @@
2	2	// PukiWiki - Yet another WikiWikiWeb clone
3	3	// attach.inc.php
4	4	// Copyright
5		-// 2003-2017 PukiWiki Development Team
	5	+// 2003-2020 PukiWiki Development Team
6	6	// 2002-2003 PANDA <panda@arino.jp> http://home.arino.jp/
7	7	// 2002 Y.MASUI <masui@hisec.co.jp> http://masui.net/pukiwiki/
8	8	// 2001-2002 Originally written by yu-ji

		@@ -42,7 +42,7 @@ define('PLUGIN_ATTACH_FILE_MODE', 0644);
42	42	// File icon image
43	43	define('PLUGIN_ATTACH_FILE_ICON', '<img src="' . IMAGE_DIR . 'file.png"' .
44	44	' width="20" height="20" alt="file"' .
45		- ' style="border-width:0px" />');
	45	+ ' style="border-width:0" />');
46	46
47	47	// mime-typeを記述したページ
48	48	define('PLUGIN_ATTACH_CONFIG_PAGE_MIME', 'plugin/attach/mime-type');

--- a/plugin/ref.inc.php

+++ b/plugin/ref.inc.php

		@@ -2,7 +2,7 @@
2	2	// PukiWiki - Yet another WikiWikiWeb clone
3	3	// ref.inc.php
4	4	// Copyright
5		-// 2002-2017 PukiWiki Development Team
	5	+// 2002-2020 PukiWiki Development Team
6	6	// 2001-2002 Originally written by yu-ji
7	7	// License: GPL v2 or (at your option) any later version
8	8	//

		@@ -13,7 +13,7 @@
13	13	if (! defined('FILE_ICON'))
14	14	define('FILE_ICON',
15	15	'<img src="' . IMAGE_DIR . 'file.png" width="20" height="20"' .
16		- ' alt="file" style="border-width:0px" />');
	16	+ ' alt="file" style="border-width:0" />');
17	17
18	18	/////////////////////////////////////////////////
19	19	// Default settings

		@@ -79,13 +79,13 @@ function plugin_ref_convert()
79	79	// Opera 6 = o
80	80	// Netscape 6 = x (wrap,aroundが効かない)
81	81	// IE 6 = x (wrap,aroundが効かない)
82		- // margin:0px
	82	+ // margin:0
83	83	// Mozilla 1.x = x (wrapで寄せが効かない)
84	84	// Opera 6 = x (wrapで寄せが効かない)
85	85	// Netscape 6 = x (wrapで寄せが効かない)
86	86	// IE6 = o
87		- $margin = ($params['around'] ? '0px' : 'auto');
88		- $margin_align = ($params['_align'] == 'center') ? '' : ";margin-{$params['_align']}:0px";
	87	+ $margin = ($params['around'] ? '0' : 'auto');
	88	+ $margin_align = ($params['_align'] == 'center') ? '' : ";margin-{$params['_align']}:0";
89	89	$params['_body'] = <<<EOD
90	90	<table class="style_table" style="margin:$margin$margin_align">
91	91	<tr>

--- a/plugin/size.inc.php

+++ b/plugin/size.inc.php

		@@ -1,6 +1,8 @@
1	1	<?php
2		-// PukiWiki - Yet another WikiWikiWeb clone.
3		-// $Id: size.inc.php,v 1.10 2005/06/16 15:04:08 henoheno Exp $
	2	+// PukiWiki - Yet another WikiWikiWeb clone
	3	+// size.inc.php
	4	+// Copyright 2002-2020 PukiWiki Development Team
	5	+// License: GPL v2 or (at your option) any later version
4	6	//
5	7	// Text-size changing via CSS plugin
6	8

		@@ -18,13 +20,11 @@ function plugin_size_inline()
18	20
19	21	// strip_autolink() is not needed for size plugin
20	22	//$body = strip_htmltag($body);
21		-
22	23	if ($size == '' \|\| $body == '' \|\| ! preg_match('/^\d+$/', $size))
23	24	return PLUGIN_SIZE_USAGE;
24	25
25	26	$size = max(PLUGIN_SIZE_MIN, min(PLUGIN_SIZE_MAX, $size));
26	27	return '<span style="font-size:' . $size .
27		- 'px;display:inline-block;line-height:130%;text-indent:0px">' .
	28	+ 'px;display:inline-block;line-height:130%;text-indent:0">' .
28	29	$body . '</span>';
29	30	}
30		-?>

--- a/skin/pukiwiki.css

+++ b/skin/pukiwiki.css

		@@ -3,7 +3,7 @@
3	3	/*!
4	4	* PukiWiki - Yet another WikiWikiWeb clone.
5	5	* Copyright
6		- * 2002-2017 PukiWiki Development Team
	6	+ * 2002-2020 PukiWiki Development Team
7	7	* 2001-2002 Originally written by yu-ji
8	8	* License: GPL v2 or (at your option) any later version
9	9	*

		@@ -55,8 +55,8 @@ h1, h2 {
55	55	color:inherit;
56	56	background-color:#DDEEFF;
57	57	padding:.3em;
58		- border:0px;
59		- margin:0px 0px .5em 0px;
	58	+ border:0;
	59	+ margin:0 0 .5em 0;
60	60	}
61	61	h3 {
62	62	font-family:verdana, arial, helvetica, Sans-Serif;

		@@ -68,7 +68,7 @@ h3 {
68	68	color:inherit;
69	69	background-color:#FFFFFF;
70	70	padding:.3em;
71		- margin:0px 0px .5em 0px;
	71	+ margin:0 0 .5em 0;
72	72	}
73	73	h4 {
74	74	font-family:verdana, arial, helvetica, Sans-Serif;

		@@ -77,23 +77,23 @@ h4 {
77	77	color:inherit;
78	78	background-color:#FFFFFF;
79	79	padding:.3em;
80		- margin:0px 0px .5em 0px;
	80	+ margin:0 0 .5em 0;
81	81	}
82	82	h5, h6 {
83	83	font-family:verdana, arial, helvetica, Sans-Serif;
84	84	color:inherit;
85	85	background-color:#DDEEFF;
86	86	padding:.3em;
87		- border:0px;
88		- margin:0px 0px .5em 0px;
	87	+ border:0;
	88	+ margin:0 0 .5em 0;
89	89	}
90	90	h1.title {
91	91	font-size:30px;
92	92	font-weight:bold;
93	93	background-color:transparent;
94		- padding:12px 0px 0px 0px;
95		- border:0px;
96		- margin:12px 0px 0px 0px;
	94	+ padding:12px 0 0 0;
	95	+ border:0;
	96	+ margin:12px 0 0 0;
97	97	}
98	98
99	99	dt {

		@@ -146,8 +146,8 @@ tfoot th.style_th {
146	146	background-color:#E0E8F0;
147	147	}
148	148	.style_table {
149		- padding:0px;
150		- border:0px;
	149	+ padding:0;
	150	+ border:0;
151	151	margin:auto;
152	152	text-align:left;
153	153	color:inherit;

		@@ -240,13 +240,13 @@ div.jumpmenu {
240	240	hr.full_hr {
241	241	border-style:ridge;
242	242	border-color:#333333;
243		- border-width:1px 0px;
	243	+ border-width:1px 0;
244	244	}
245	245	hr.note_hr {
246	246	width:90%;
247	247	border-style:ridge;
248	248	border-color:#333333;
249		- border-width:1px 0px;
	249	+ border-width:1px 0;
250	250	text-align:center;
251	251	margin:1em auto 0em auto;
252	252	}

		@@ -254,43 +254,43 @@ hr.note_hr {
254	254	span.size1 {
255	255	font-size:xx-small;
256	256	line-height:130%;
257		- text-indent:0px;
	257	+ text-indent:0;
258	258	display:inline;
259	259	}
260	260	span.size2 {
261	261	font-size:x-small;
262	262	line-height:130%;
263		- text-indent:0px;
	263	+ text-indent:0;
264	264	display:inline;
265	265	}
266	266	span.size3 {
267	267	font-size:small;
268	268	line-height:130%;
269		- text-indent:0px;
	269	+ text-indent:0;
270	270	display:inline;
271	271	}
272	272	span.size4 {
273	273	font-size:medium;
274	274	line-height:130%;
275		- text-indent:0px;
	275	+ text-indent:0;
276	276	display:inline;
277	277	}
278	278	span.size5 {
279	279	font-size:large;
280	280	line-height:130%;
281		- text-indent:0px;
	281	+ text-indent:0;
282	282	display:inline;
283	283	}
284	284	span.size6 {
285	285	font-size:x-large;
286	286	line-height:130%;
287		- text-indent:0px;
	287	+ text-indent:0;
288	288	display:inline;
289	289	}
290	290	span.size7 {
291	291	font-size:xx-large;
292	292	line-height:130%;
293		- text-indent:0px;
	293	+ text-indent:0;
294	294	display:inline;
295	295	}
296	296

		@@ -343,14 +343,14 @@ strong.word9 {
343	343
344	344	/* pukiwiki.skin.php */
345	345	div#header {
346		- padding:0px;
347		- margin:0px;
	346	+ padding:0;
	347	+ margin:0;
348	348	}
349	349
350	350	div#navigator {
351	351	clear:both;
352		- padding:4px 0px 0px 0px;
353		- margin:0px;
	352	+ padding:4px 0 0 0;
	353	+ margin:0;
354	354	}
355	355
356	356	td.menubar {

		@@ -360,15 +360,15 @@ td.menubar {
360	360
361	361	div#menubar {
362	362	width:9em;
363		- padding:0px;
	363	+ padding:0;
364	364	margin:4px;
365	365	word-break:break-all;
366	366	font-size:90%;
367	367	overflow:hidden;
368	368	}
369	369	div#menubar ul {
370		- margin:0px 0px 0px .5em;
371		- padding:0px 0px 0px .5em;
	370	+ margin:0 0 0 .5em;
	371	+ padding:0 0 0 .5em;
372	372	}
373	373	div#menubar ul li {
374	374	line-height:110%;

		@@ -378,42 +378,42 @@ div#menubar h4 {
378	378	}
379	379
380	380	div#body {
381		- padding:0px;
382		- margin:0px 0px 0px .5em;
	381	+ padding:0;
	382	+ margin:0 0 0 .5em;
383	383	}
384	384	div#note {
385	385	clear:both;
386		- padding:0px;
387		- margin:0px;
	386	+ padding:0;
	387	+ margin:0;
388	388	}
389	389	div#attach {
390	390	clear:both;
391		- padding:0px;
392		- margin:0px;
	391	+ padding:0;
	392	+ margin:0;
393	393	}
394	394	div#toolbar {
395	395	clear:both;
396		- padding:0px;
397		- margin:0px;
	396	+ padding:0;
	397	+ margin:0;
398	398	text-align:right;
399	399	}
400	400	div#lastmodified {
401	401	font-size:80%;
402		- padding:0px;
403		- margin:0px;
	402	+ padding:0;
	403	+ margin:0;
404	404	}
405	405	div#related {
406	406	font-size:80%;
407		- padding:0px;
408		- margin:16px 0px 0px 0px;
	407	+ padding:0;
	408	+ margin:16px 0 0 0;
409	409	}
410	410	div#related .page_passage {
411	411	font-size:60%;
412	412	}
413	413	div#footer {
414	414	font-size:70%;
415		- padding:0px;
416		- margin:16px 0px 0px 0px;
	415	+ padding:0;
	416	+ margin:16px 0 0 0;
417	417	}
418	418	div#banner {
419	419	float:right;

		@@ -441,8 +441,8 @@ img#logo {
441	441
442	442	/* calendar.inc.php /
443	443	.style_calendar {
444		- padding:0px;
445		- border:0px;
	444	+ padding:0;
	445	+ border:0;
446	446	margin:3px;
447	447	color:inherit;
448	448	background-color:#CCD5DD;

		@@ -522,7 +522,7 @@ span.calendar_viewer_right {
522	522
523	523	/* clear.inc.php */
524	524	.clear {
525		- margin:0px;
	525	+ margin:0;
526	526	clear:both;
527	527	}
528	528

		@@ -547,7 +547,7 @@ hr.short_line {
547	547	width:80%;
548	548	border-style:solid;
549	549	border-color:#333333;
550		- border-width:1px 0px;
	550	+ border-width:1px 0;
551	551	}
552	552
553	553	/* include.inc.php */

		@@ -557,8 +557,8 @@ h5.side_label {
557	557
558	558	/* navi.inc.php */
559	559	ul.navi {
560		- margin:0px;
561		- padding:0px;
	560	+ margin:0;
	561	+ padding:0;
562	562	text-align:center;
563	563	}
564	564	li.navi_none {

--- a/skin/tdiary.css

+++ b/skin/tdiary.css

		@@ -3,7 +3,7 @@
3	3	/*!
4	4	* PukiWiki - Yet another WikiWikiWeb clone.
5	5	* Copyright
6		- * 2002-2017 PukiWiki Development Team
	6	+ * 2002-2020 PukiWiki Development Team
7	7	* 2001-2002 Originally written by yu-ji
8	8	* License: GPL v2 or (at your option) any later version
9	9	*

		@@ -55,8 +55,8 @@ tfoot th.style_th {
55	55	background-color:#E0E8F0;
56	56	}
57	57	.style_table {
58		- padding:0px;
59		- border:0px;
	58	+ padding:0;
	59	+ border:0;
60	60	margin:auto;
61	61	text-align:left;
62	62	color:inherit;

		@@ -140,43 +140,43 @@ hr.note_hr {
140	140	span.size1 {
141	141	font-size:xx-small;
142	142	line-height:130%;
143		- text-indent:0px;
	143	+ text-indent:0;
144	144	display:inline;
145	145	}
146	146	span.size2 {
147	147	font-size:x-small;
148	148	line-height:130%;
149		- text-indent:0px;
	149	+ text-indent:0;
150	150	display:inline;
151	151	}
152	152	span.size3 {
153	153	font-size:small;
154	154	line-height:130%;
155		- text-indent:0px;
	155	+ text-indent:0;
156	156	display:inline;
157	157	}
158	158	span.size4 {
159	159	font-size:medium;
160	160	line-height:130%;
161		- text-indent:0px;
	161	+ text-indent:0;
162	162	display:inline;
163	163	}
164	164	span.size5 {
165	165	font-size:large;
166	166	line-height:130%;
167		- text-indent:0px;
	167	+ text-indent:0;
168	168	display:inline;
169	169	}
170	170	span.size6 {
171	171	font-size:x-large;
172	172	line-height:130%;
173		- text-indent:0px;
	173	+ text-indent:0;
174	174	display:inline;
175	175	}
176	176	span.size7 {
177	177	font-size:xx-large;
178	178	line-height:130%;
179		- text-indent:0px;
	179	+ text-indent:0;
180	180	display:inline;
181	181	}
182	182

		@@ -229,13 +229,13 @@ strong.word9 {
229	229
230	230	/* pukiwiki.skin.php */
231	231	div#header {
232		- padding:0px;
233		- margin:0px;
	232	+ padding:0;
	233	+ margin:0;
234	234	}
235	235	div#navigator {
236	236	clear:both;
237		- padding:4px 0px 0px 0px;
238		- margin:0px;
	237	+ padding:4px 0 0 0;
	238	+ margin:0;
239	239	}
240	240	td.menubar {
241	241	width:9em;

		@@ -243,15 +243,15 @@ td.menubar {
243	243	}
244	244	div#menubar {
245	245	width:9em;
246		- padding:0px;
	246	+ padding:0;
247	247	margin:4px;
248	248	word-break:break-all;
249	249	font-size:90%;
250	250	overflow:hidden;
251	251	}
252	252	div#menubar ul {
253		- margin:0px 0px 0px .5em;
254		- padding:0px 0px 0px .5em;
	253	+ margin:0 0 0 .5em;
	254	+ padding:0 0 0 .5em;
255	255	}
256	256	div#menubar ul li {
257	257	line-height:110%;

		@@ -262,43 +262,43 @@ div#menubar h4 {
262	262
263	263	/* for tDiary themes */
264	264	div.pkwk_body {
265		- padding:0px;
	265	+ padding:0;
266	266	}
267	267	div#note {
268	268	clear:both;
269		- padding:0px;
270		- margin:0px;
	269	+ padding:0;
	270	+ margin:0;
271	271	}
272	272	div#attach {
273	273	clear:both;
274		- padding:0px;
275		- margin:0px;
	274	+ padding:0;
	275	+ margin:0;
276	276	}
277	277	div#toolbar {
278	278	clear:both;
279		- padding:0px;
280		- margin:0px;
	279	+ padding:0;
	280	+ margin:0;
281	281	text-align:right;
282	282	}
283	283	div#lastmodified {
284	284	font-size:80%;
285		- padding:0px;
286		- margin:0px;
	285	+ padding:0;
	286	+ margin:0;
287	287	}
288	288
289	289	/* for tDiary theme */
290	290	div#related {
291	291	font-size:80%;
292		- padding:0px;
293		- margin:0px 0px 0px 0px;
	292	+ padding:0;
	293	+ margin:0 0 0 0;
294	294	}
295	295	div#related .page_passage {
296	296	font-size:60%;
297	297	}
298	298	div#footer {
299	299	font-size:70%;
300		- padding:0px;
301		- margin:16px 0px 0px 0px;
	300	+ padding:0;
	301	+ margin:16px 0 0 0;
302	302	}
303	303	div#banner {
304	304	float:right;

		@@ -326,8 +326,8 @@ img#logo {
326	326
327	327	/* calendar.inc.php /
328	328	.style_calendar {
329		- padding:0px;
330		- border:0px;
	329	+ padding:0;
	330	+ border:0;
331	331	margin:3px;
332	332	color:inherit;
333	333	background-color:#CCD5DD;

		@@ -407,7 +407,7 @@ span.calendar_viewer_right {
407	407
408	408	/* clear.inc.php */
409	409	.clear {
410		- margin:0px;
	410	+ margin:0;
411	411	clear:both;
412	412	}
413	413

		@@ -432,7 +432,7 @@ hr.short_line {
432	432	width:80%;
433	433	border-style:solid;
434	434	border-color:#CCD5DD;
435		- border-width:1px 0px;
	435	+ border-width:1px 0;
436	436	}
437	437
438	438	/* include.inc.php */

		@@ -442,8 +442,8 @@ h5.side_label {
442	442
443	443	/* navi.inc.php */
444	444	ul.navi {
445		- margin:0px;
446		- padding:0px;
	445	+ margin:0;
	446	+ padding:0;
447	447	text-align:center;
448	448	}
449	449	li.navi_none {

Show on old repository browser