Minor fixes.

Dit81 · Jul 8, 2013 · e00346e · e00346e
1 parent d5cd823
commit e00346e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/framework/yii/debug/Module.php b/framework/yii/debug/Module.php
@@ -81,6 +81,7 @@ public function renderToolbar($event)
 		echo '<div id="yii-debug-toolbar" data-url="' . $url . '" style="display:none"></div>';
 		/** @var View $view */
 		$view = $event->sender;
+		echo '<style>' . $view->renderFile(__DIR__ . '/views/default/toolbar.css') . '</style>';
 		echo '<script>' . $view->renderFile(__DIR__ . '/views/default/toolbar.js') . '</script>';
 	}
 

diff --git a/framework/yii/debug/views/default/toolbar.css b/framework/yii/debug/views/default/toolbar.css
@@ -117,7 +117,7 @@
 .yii-debug-toolbar-toggler {
 	cursor: pointer;
 	position: absolute;
-	right: 4px;
+	right: 10px;
 	bottom: 4px;
 	width: 15px;
 	height: 30px;
@@ -126,7 +126,7 @@
 	line-height: 28px;
 	color: #ffffff;
 	text-align: center;
-	background: #222222;
+	background: #666666;
 	-webkit-border-radius: 12px;
 	-moz-border-radius: 12px;
 	border-radius: 12px;
@@ -152,7 +152,7 @@
 	z-index: 1000000;
 	font: 11px Verdana, Arial, sans-serif;
 	text-align: left;
-	width: 57px;
+	width: 63px;
 	height: 38px;
 	border-top: 1px solid #ccc;
 	border-left: 1px solid #ccc;
@@ -172,6 +172,6 @@
 
 #yii-debug-toolbar-logo {
 	position: fixed;
-	right: 25px;
+	right: 31px;
 	bottom: 4px;
 }
diff --git a/framework/yii/debug/views/default/toolbar.php b/framework/yii/debug/views/default/toolbar.php
@@ -24,18 +24,15 @@
 
 $url = $panels['request']->getUrl();
 ?>
-<style>
-	<?php echo $this->renderFile(__DIR__ . '/toolbar.css'); ?>
-</style>
 <div id="yii-debug-toolbar">
 	<?php foreach ($panels as $panel): ?>
 	<?php echo $panel->getSummary(); ?>
 	<?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 id="yii-debug-toolbar-min">
 	<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(); ?>">
 	</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>