Skip to content

Y
yii2
Commit e00346e5 by Qiang Xue
Options

Minor fixes.

parent d5cd8234
Showing with 7 additions and 9 deletions
framework/yii/debug/Module.php
...@@ -81,6 +81,7 @@ class Module extends \yii\base\Module ...@@ -81,6 +81,7 @@ class Module extends \yii\base\Module
echo '<div id="yii-debug-toolbar" data-url="' . $url . '" style="display:none"></div>'; echo '<div id="yii-debug-toolbar" data-url="' . $url . '" style="display:none"></div>';
/** @var View $view */ /** @var View $view */
$view = $event->sender; $view = $event->sender;
echo '<style>' . $view->renderFile(__DIR__ . '/views/default/toolbar.css') . '</style>';
echo '<script>' . $view->renderFile(__DIR__ . '/views/default/toolbar.js') . '</script>'; echo '<script>' . $view->renderFile(__DIR__ . '/views/default/toolbar.js') . '</script>';
} }
......
framework/yii/debug/views/default/toolbar.css
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
.yii-debug-toolbar-toggler { .yii-debug-toolbar-toggler {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
right: 4px; right: 10px;
bottom: 4px; bottom: 4px;
width: 15px; width: 15px;
height: 30px; height: 30px;
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
line-height: 28px; line-height: 28px;
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
background: #222222; background: #666666;
-webkit-border-radius: 12px; -webkit-border-radius: 12px;
-moz-border-radius: 12px; -moz-border-radius: 12px;
border-radius: 12px; border-radius: 12px;
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
z-index: 1000000; z-index: 1000000;
font: 11px Verdana, Arial, sans-serif; font: 11px Verdana, Arial, sans-serif;
text-align: left; text-align: left;
width: 57px; width: 63px;
height: 38px; height: 38px;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
...@@ -172,6 +172,6 @@ ...@@ -172,6 +172,6 @@
#yii-debug-toolbar-logo { #yii-debug-toolbar-logo {
position: fixed; position: fixed;
right: 25px; right: 31px;
bottom: 4px; bottom: 4px;
} }
framework/yii/debug/views/default/toolbar.php
...@@ -24,18 +24,15 @@ EOD; ...@@ -24,18 +24,15 @@ EOD;
$url = $panels['request']->getUrl(); $url = $panels['request']->getUrl();
?> ?>
<style>
<?php echo $this->renderFile(__DIR__ . '/toolbar.css'); ?>
</style>
<div id="yii-debug-toolbar"> <div id="yii-debug-toolbar">
<?php foreach ($panels as $panel): ?> <?php foreach ($panels as $panel): ?>
<?php echo $panel->getSummary(); ?> <?php echo $panel->getSummary(); ?>
<?php endforeach; ?> <?php endforeach; ?>
<a class="yii-debug-toolbar-toggler" href="javascript:void(0);" onclick="<?php echo $minJs; ?>">›</a> <span class="yii-debug-toolbar-toggler" onclick="<?php echo $minJs; ?>">›</span>
</div> </div>
<div id="yii-debug-toolbar-min"> <div id="yii-debug-toolbar-min">
<a href="<?php echo $url; ?>" title="Open Yii Debugger" id="yii-debug-toolbar-logo"> <a href="<?php echo $url; ?>" title="Open Yii Debugger" id="yii-debug-toolbar-logo">
<img width="29" height="30" alt="" src="<?php echo ConfigPanel::getYiiLogo(); ?>"> <img width="29" height="30" alt="" src="<?php echo ConfigPanel::getYiiLogo(); ?>">
</a> </a>
<a class="yii-debug-toolbar-toggler" href="javascript:void(0);" onclick="<?php echo $maxJs; ?>">‹</a> <span class="yii-debug-toolbar-toggler" onclick="<?php echo $maxJs; ?>">‹</span>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment