「wikiメイン」ウィジェット更新。

diff --git a/widgets/wiki_main/css/default.css b/widgets/wiki_main/css/default.css
index b7ddb5a..2bf0eb5 100644 (file)
--- a/widgets/wiki_main/css/default.css
+++ b/widgets/wiki_main/css/default.css
@@ -42,10 +42,10 @@ pre.wiki_pre {
        color:black;
        background-color:#F0F8FF;
 }
-p.wiki_small_title {
+/*p.wiki_small_title {
        font-size:80%;
        text-align:right;
-}
+}*/
 a.note_super {
        font-weight:bold;
        font-size:75%;
@@ -63,10 +63,6 @@ a.note_super {
        font-size:xx-small;
        vertical-align:super;
 }
-/*div.jumpmenu {
-       font-size:60%;
-       text-align:right;
-}*/
 /*hr.full_hr {
        border-style:ridge;
        border-color:#333333;
@@ -118,47 +114,27 @@ span.noexists {
        color:inherit;
        background-color:#FFFACC;
 }
+/* 相対フォントサイズ */
 span.size1 {
        font-size:xx-small;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 span.size2 {
        font-size:x-small;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 span.size3 {
        font-size:small;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 span.size4 {
        font-size:medium;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 span.size5 {
        font-size:large;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 span.size6 {
        font-size:x-large;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 span.size7 {
        font-size:xx-large;
-       line-height:130%;
-       text-indent:0px;
-       display:inline;
 }
 /* html.php/catbody() */
 /*strong.word0 {

diff --git a/widgets/wiki_main/css/default_bootstrap.css b/widgets/wiki_main/css/default_bootstrap.css
index 877b24f..c6b5e30 100644 (file)
--- a/widgets/wiki_main/css/default_bootstrap.css
+++ b/widgets/wiki_main/css/default_bootstrap.css
@@ -51,18 +51,32 @@ img.facemark {
        color:black;
        background-color:#F0F8FF;
 }*/
-/*div.jumpmenu {
-       font-size:60%;
-       text-align:right;
-}*/
-/*#wiki_top {
-       padding-top: 80px;
-       margin-top: -80px;
-}*/
 span.noexists {
        color:inherit;
        background-color:#FFFACC;
 }
+/* 相対フォントサイズ */
+span.size1 {
+       font-size:xx-small;
+}
+span.size2 {
+       font-size:x-small;
+}
+span.size3 {
+       font-size:small;
+}
+span.size4 {
+       font-size:medium;
+}
+span.size5 {
+       font-size:large;
+}
+span.size6 {
+       font-size:x-large;
+}
+span.size7 {
+       font-size:xx-large;
+}
 /* diff.inc.php */
 span.diff_added {
        color:blue;

diff --git a/widgets/wiki_main/include/container/wiki_mainWidgetContainer.php b/widgets/wiki_main/include/container/wiki_mainWidgetContainer.php
index 1c5d362..946a566 100644 (file)
--- a/widgets/wiki_main/include/container/wiki_mainWidgetContainer.php
+++ b/widgets/wiki_main/include/container/wiki_mainWidgetContainer.php
@@ -258,7 +258,8 @@ class wiki_mainWidgetContainer extends BaseWidgetContainer
                                $r_page   = rawurlencode($page);
                                $pageHref = $this->gEnv->getDefaultUrl() . WikiParam::convQuery("?$r_page");
                                $pageUrl = $this->gEnv->getDefaultUrl() . htmlspecialchars(WikiParam::convQuery("?$r_page", false));
-                               $permaLink = "<div class=\"wiki_small_title\"><a href=\"$pageHref\">$pageUrl</a></div>";
+               //              $permaLink = "<div class=\"wiki_small_title\"><a href=\"$pageHref\">$pageUrl</a></div>";
+                               $permaLink = "<small><a href=\"$pageHref\">$pageUrl</a></small>";
                                $this->tmpl->addVar("show_title", "title_small", $permaLink);   // リンク用URL
                        }
                }

diff --git a/widgets/wiki_main/include/plugin/size.inc.php b/widgets/wiki_main/include/plugin/size.inc.php
index 3961f49..184a52e 100644 (file)
--- a/widgets/wiki_main/include/plugin/size.inc.php
+++ b/widgets/wiki_main/include/plugin/size.inc.php
@@ -8,7 +8,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2008 Magic3 Project.
+ * @copyright  Copyright 2006-2015 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id: size.inc.php 1103 2008-10-23 05:12:30Z fishbone $
  * @link       http://www.magic3.org
@@ -33,8 +33,6 @@ function plugin_size_inline()
                return PLUGIN_SIZE_USAGE;
 
        $size = max(PLUGIN_SIZE_MIN, min(PLUGIN_SIZE_MAX, $size));
-       return '<span style="font-size:' . $size .
-               'px;display:inline-block;line-height:130%;text-indent:0px">' .
-               $body . '</span>';
+       return '<span style="font-size:' . $size . 'px;">' . $body . '</span>';
 }
 ?>