diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f3e81ab..0d7b6df 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -111,7 +111,25 @@ - + + + + + + + + + + + + + + + + + + + @@ -120,7 +138,7 @@ - + @@ -151,22 +169,22 @@ @@ -816,29 +834,25 @@ - - - - - - + + + - + + + - - - - - - + + + @@ -880,7 +894,9 @@ - + + + @@ -890,13 +906,6 @@ - - - - - - - @@ -925,6 +934,20 @@ + + + + + + + + + + + + + + @@ -932,9 +955,16 @@ + + + + + + + - + diff --git a/www/css/styles.css b/www/css/styles.css index c477630..46d4ba7 100644 --- a/www/css/styles.css +++ b/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; } \ No newline at end of file diff --git a/www/images/logo.png b/www/images/logo.png new file mode 100644 index 0000000..c9e8e90 Binary files /dev/null and b/www/images/logo.png differ diff --git a/www/protected/extensions/bootstrap/assets/css/bootstrap.css b/www/protected/extensions/bootstrap/assets/css/bootstrap.css index c92a7cf..e0624a1 100644 --- a/www/protected/extensions/bootstrap/assets/css/bootstrap.css +++ b/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; diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php index b3d2e69..4ce9208 100644 --- a/www/protected/views/layouts/main.php +++ b/www/protected/views/layouts/main.php @@ -29,7 +29,8 @@ $this->widget('bootstrap.widgets.TbNavbar', [ - 'brandLabel' => Yii::app()->name, + 'brandLabel'=>'', + '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')), ], ], diff --git a/www/protected/views/programme/admin.php b/www/protected/views/programme/admin.php index e4b5076..0e40f01 100644 --- a/www/protected/views/programme/admin.php +++ b/www/protected/views/programme/admin.php @@ -44,7 +44,7 @@ or =) at the beginning of each of your search values to specify how the c 'model'=>$model, )); ?> - +

widget('bootstrap.widgets.TbGridView',array( 'type' => TbHtml::GRID_TYPE_BORDERED, 'id'=>'programme-grid', diff --git a/www/protected/views/site/about.php b/www/protected/views/site/about.php index b1a0bf0..9b6d838 100644 --- a/www/protected/views/site/about.php +++ b/www/protected/views/site/about.php @@ -22,7 +22,7 @@ $this->selectedNav = 'about';

Welcome to my private homepage.

-

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 ...');

+

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.

If you want you can look at the things I programmed