Added Logo

www/css/styles.css

@@ -32,4 +32,16 @@
 
 .cstm-main-navbar {
     margin-bottom: 0px;
+}
+
+/* Header
+-------------------------------------------------- */
+
+.brandLogo {
+    height: 30px;
+    padding: 8px 12px 10px 12px;
+}
+
+.navbar .brand {
+    padding: 0px;
 }

www/protected/extensions/bootstrap/assets/css/bootstrap.css

@@ -1098,7 +1098,7 @@ input[type="color"],
   margin-bottom: 10px;
   font-size: 15px;
   line-height: 20px;
-  color: #95a5a6;
+  color: #404040;
   vertical-align: middle;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
@@ -3210,7 +3210,7 @@ button.close {
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
   vertical-align: middle;
   cursor: pointer;
-  background-color: #bfc6cb;
+  background-color: #2c3e50;
   *background-color: #d0d5d9;
   background-image: -moz-linear-gradient(top, #b4bcc2, #d0d5d9);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4bcc2), to(#d0d5d9));
@@ -6370,7 +6370,6 @@ div.subnav .nav > .active > a:hover {
 }
 
 .btn {
-  padding: 9px 20px;
   color: #ffffff;
   text-decoration: none;
   text-shadow: none;

www/protected/views/layouts/main.php

@@ -29,7 +29,8 @@
 
 	$this->widget('bootstrap.widgets.TbNavbar',
 		[
-			'brandLabel' => Yii::app()->name,
+			'brandLabel'=>'<img src="/images/logo.png" class="brandLogo"/>',
+			'brandUrl'=>'/',
 			'display' => null,
 			'htmlOptions' =>
 				[
@@ -43,8 +44,8 @@
 							[
 								array('label' => 'Home', 		'url' => '/', 'active' => ($this->selectedNav === 'index')),
 								array('label' => 'Blog', 		'url' => '#', 'active' => ($this->selectedNav === 'blog')),
-								array('label' => 'Programme', 	'url' => 'programme/', 'active' => ($this->selectedNav === 'prog')),
-								array('label' => 'About',		'url' => 'about', 'active' => ($this->selectedNav === 'about')),
+								array('label' => 'Programme', 	'url' => '/programme/', 'active' => ($this->selectedNav === 'prog')),
+								array('label' => 'About',		'url' => '/about', 'active' => ($this->selectedNav === 'about')),
 							],
 					],
 

www/protected/views/programme/admin.php

@@ -44,7 +44,7 @@ or <b>=</b>) at the beginning of each of your search values to specify how the c
 	'model'=>$model,
 )); ?>
 </div><!-- search-form -->
-
+<br><br>
 <?php $this->widget('bootstrap.widgets.TbGridView',array(
 	'type' => TbHtml::GRID_TYPE_BORDERED,
 	'id'=>'programme-grid',

www/protected/views/site/about.php

@@ -22,7 +22,7 @@ $this->selectedNav = 'about';
 	<div class="well cstm-background-white">
 		<p>Welcome to my private homepage.</p>
 
-		<p>My name is Mike Schwörer, and this is my homepage - here i upload programs i write in my free time and sometimes i even write a blog entry ...'); </p>
+		<p>My name is Mike Schwörer, and this is my homepage - here i upload programs i write in my free time and sometimes i even write a blog entry. </p>
 
 		<p>If you want you can look <?php echo TbHtml::link('here', '#'); // TODO Add Link ?> at the things I programmed </p>
 	</div>