コミット: 6506c6df874a3e661581eaf78497a652382fff42 - pukiwiki-fork (git)

コミットメタ情報

• リビジョン: 6506c6df874a3e661581eaf78497a652382fff42 (tree)
• 日時: 2016-10-23 21:38:42
• 作者: Akito Hachiya <s.beec1e@gmai...>
• コミッター: umorigu

ログメッセージ

Remove media selector, use media query

変更サマリ

• modified: skin/pukiwiki.css.php
• modified: skin/pukiwiki.skin.php
• modified: skin/tdiary.css.php
• modified: skin/tdiary.skin.php

差分

--- a/skin/pukiwiki.css.php
+++ b/skin/pukiwiki.css.php
@@ -16,10 +16,6 @@ if(ini_get('zlib.output_compression') && preg_match('/\b(gzip|deflate)\b/i', $_S
 	header('Vary: Accept-Encoding');
 }
 
-// Media
-$media   = isset($_GET['media'])   ? $_GET['media']    : '';
-if ($media != 'print') $media = 'screen';
-
 // Output CSS ----
 ?>
 @charset "UTF-8";
@@ -38,13 +34,9 @@ body,td {
 }
 
 a:link {
-<?php	if ($media == 'print') { ?>
-	text-decoration: underline;
-<?php	} else { ?>
 	color:#215dc6;
 	background-color:inherit;
 	text-decoration:none;
-<?php	} ?>
 }
 
 a:active {
@@ -54,13 +46,9 @@ a:active {
 }
 
 a:visited {
-<?php	if ($media == 'print') { ?>
-	text-decoration: underline;
-<?php	} else { ?>
 	color:#a63d21;
 	background-color:inherit;
 	text-decoration:none;
-<?php	} ?>
 }
 
 a:hover {
@@ -328,35 +316,23 @@ div#header {
 }
 
 div#navigator {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	clear:both;
 	padding:4px 0px 0px 0px;
 	margin:0px;
-<?php   } ?>
 }
 
 td.menubar {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	width:9em;
 	vertical-align:top;
-<?php   } ?>
 }
 
 div#menubar {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	width:9em;
 	padding:0px;
 	margin:4px;
 	word-break:break-all;
 	font-size:90%;
 	overflow:hidden;
-<?php   } ?>
 }
 
 div#menubar ul {
@@ -380,24 +356,16 @@ div#note {
 }
 
 div#attach {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	clear:both;
 	padding:0px;
 	margin:0px;
-<?php   } ?>
 }
 
 div#toolbar {
-<?php   if ($media == 'print') { ?>
-        display:none;
-<?php   } else { ?>
 	clear:both;
 	padding:0px;
 	margin:0px;
 	text-align:right;
-<?php   } ?>
 }
 
 div#lastmodified {
@@ -407,13 +375,9 @@ div#lastmodified {
 }
 
 div#related {
-<?php   if ($media == 'print') { ?>
-        display:none;
-<?php   } else { ?>
 	font-size:80%;
 	padding:0px;
 	margin:16px 0px 0px 0px;
-<?php   } ?>
 }
 
 div#footer {
@@ -433,12 +397,8 @@ div#preview {
 }
 
 img#logo {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	float:left;
 	margin-right:20px;
-<?php   } ?>
 }
 
 /* aname.inc.php */
@@ -601,7 +561,6 @@ span.new5 {
 /* popular.inc.php */
 span.counter { font-size:70%; }
 ul.popular_list {
-<?php
 /*
 	padding:0px;
 	border:0px;
@@ -609,12 +568,10 @@ ul.popular_list {
 	word-wrap:break-word;
 	word-break:break-all;
 */
-?>
 }
 
 /* recent.inc.php,showrss.inc.php */
 ul.recent_list {
-<?php
 /*
 	padding:0px;
 	border:0px;
@@ -622,7 +579,6 @@ ul.recent_list {
 	word-wrap:break-word;
 	word-break:break-all;
 */
-?>
 }
 
 /* ref.inc.php */
@@ -644,3 +600,19 @@ td.vote_td2 {
 	color:inherit;
 	background-color:#EEF5FF;
 }
+
+@media print {
+  a:link,
+  a:visited {
+    text-decoration: underline;
+  }
+  img#logo,
+  div#navigator,
+  div#menubar,
+  td.menubar,
+  div#related,
+  div#attach,
+  div#toolbar {
+    display: none;
+  }
+}

--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -73,8 +73,7 @@ if (isset($pkwk_dtd)) {
  <title><?php echo $title ?> - <?php echo $page_title ?></title>
 
  <link rel="SHORTCUT ICON" href="<?php echo $image['favicon'] ?>" />
- <link rel="stylesheet" type="text/css" media="screen" href="<?php echo SKIN_DIR ?>pukiwiki.css.php" />
- <link rel="stylesheet" type="text/css" media="print"  href="<?php echo SKIN_DIR ?>pukiwiki.css.php?media=print" />
+ <link rel="stylesheet" type="text/css" href="<?php echo SKIN_DIR ?>pukiwiki.css.php" />
  <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $link['rss'] ?>" /><?php // RSS auto-discovery ?>
 
 <?php echo $head_tag ?>

--- a/skin/tdiary.css.php
+++ b/skin/tdiary.css.php
@@ -16,10 +16,6 @@ if(ini_get('zlib.output_compression') && preg_match('/\b(gzip|deflate)\b/i', $_S
 	header('Vary: Accept-Encoding');
 }
 
-// Media
-$media = isset($_GET['media']) ? $_GET['media'] : '';
-if ($media != 'print') $media = 'screen';
-
 // Color theme
 $color_theme = isset($_GET['color']) ? $_GET['color'] : '';
 
@@ -278,35 +274,23 @@ div#header {
 }
 
 div#navigator {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	clear:both;
 	padding:4px 0px 0px 0px;
 	margin:0px;
-<?php   } ?>
 }
 
 td.menubar {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	width:9em;
 	vertical-align:top;
-<?php   } ?>
 }
 
 div#menubar {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	width:9em;
 	padding:0px;
 	margin:4px;
 	word-break:break-all;
 	font-size:90%;
 	overflow:hidden;
-<?php   } ?>
 }
 
 div#menubar ul {
@@ -328,24 +312,16 @@ div#note {
 }
 
 div#attach {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	clear:both;
 	padding:0px;
 	margin:0px;
-<?php   } ?>
 }
 
 div#toolbar {
-<?php   if ($media == 'print') { ?>
-        display:none;
-<?php   } else { ?>
 	clear:both;
 	padding:0px;
 	margin:0px;
 	text-align:right;
-<?php   } ?>
 }
 
 div#lastmodified {
@@ -356,13 +332,9 @@ div#lastmodified {
 
 /* for tDiary theme */
 div#related {
-<?php   if ($media == 'print') { ?>
-        display:none;
-<?php   } else { ?>
 	font-size:80%;
 	padding:0px;
 	margin:0px 0px 0px 0px;
-<?php   } ?>
 }
 
 div#footer {
@@ -382,12 +354,8 @@ div#preview {
 }
 
 img#logo {
-<?php   if ($media == 'print') { ?>
-	display:none;
-<?php   } else { ?>
 	float:left;
 	margin-right:20px;
-<?php   } ?>
 }
 
 /* aname.inc.php */
@@ -571,3 +539,15 @@ td.vote_td2 {
 	color:inherit;
 	background-color:#<?php echo $color['td.vote_td2'] ?>;
 }
+
+@media print {
+  img#logo,
+  div#navigator,
+  div#menubar,
+  td.menubar,
+  div#related,
+  div#attach,
+  div#toolbar {
+    display: none;
+  }
+}

--- a/skin/tdiary.skin.php
+++ b/skin/tdiary.skin.php
@@ -575,8 +575,7 @@ if (isset($pkwk_dtd)) {
  <link rel="SHORTCUT ICON" href="<?php echo $image['favicon'] ?>" />
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo SKIN_DIR ?>theme/base.css" />
  <link rel="stylesheet" type="text/css" media="all" href="<?php echo SKIN_DIR ?>theme/<?php echo $theme ?>/<?php echo $theme ?>.css" />
- <link rel="stylesheet" type="text/css" media="screen" href="<?php echo SKIN_DIR ?>tdiary.css.php?color=<?php echo $css_theme ?>" />
- <link rel="stylesheet" type="text/css" media="print"  href="<?php echo SKIN_DIR ?>tdiary.css.php?color=<?php echo $css_theme ?>&amp;media=print" />
+ <link rel="stylesheet" type="text/css" href="<?php echo SKIN_DIR ?>tdiary.css.php?color=<?php echo $css_theme ?>" />
  <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $link['rss'] ?>" /><?php // RSS auto-discovery ?>
 
 <?php echo $head_tag ?>