[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/reservoir/develop] public/themes/neverland: Site title (the tag title) needs a different t
From:       Ingo Malchow <imalchow () kde ! org>
Date:       2014-10-30 22:05:19
Message-ID: E1XjxqJ-0004oQ-VW () scm ! kde ! org
[Download RAW message or body]

Git commit e3c329af663b3ecf5a59de21b045d47197964951 by Ingo Malchow.
Committed on 30/10/2014 at 22:04.
Pushed by imalchow into branch 'develop'.

Site title (the tag title) needs a different treatment than the title in the topbar

M  +1    -0    public/themes/neverland/config.php
M  +1    -3    public/themes/neverland/layouts/default.blade.php
M  +1    -1    public/themes/neverland/partials/header.blade.php

http://commits.kde.org/websites/reservoir/e3c329af663b3ecf5a59de21b045d47197964951

diff --git a/public/themes/neverland/config.php b/public/themes/neverland/config.php
index 34fb5dc..6b025c2 100644
--- a/public/themes/neverland/config.php
+++ b/public/themes/neverland/config.php
@@ -58,6 +58,7 @@ return array(
         'beforeRenderTheme' => function($theme)
         {
             $theme->layout('default');
+            $theme->set('site_title', $theme->getTitle());
             
             // Load the CSS
             $theme->asset()->usePath()->add('neverland', 'css/neverland.min.css');
diff --git a/public/themes/neverland/layouts/default.blade.php \
b/public/themes/neverland/layouts/default.blade.php index 23753db..0bd2c37 100644
--- a/public/themes/neverland/layouts/default.blade.php
+++ b/public/themes/neverland/layouts/default.blade.php
@@ -18,9 +18,7 @@
 
         <div class="container Neverland">
             <div class="row">
-                <div class="col-lg-12">
-                    {{ Theme::content() }}
-                </div>
+                {{ Theme::content() }}
             </div>
             {{ Theme::partial('footer') }}
             
diff --git a/public/themes/neverland/partials/header.blade.php \
b/public/themes/neverland/partials/header.blade.php index a5ad44b..6cf0718 100644
--- a/public/themes/neverland/partials/header.blade.php
+++ b/public/themes/neverland/partials/header.blade.php
@@ -7,7 +7,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#"><img class="logo" \
src="img/logo.new.png" alt="Home" />{{ Theme::get('title') }}</a> +            <a \
class="navbar-brand" href="#"><img class="logo" src="img/logo.new.png" alt="Home" \
/>{{ Theme::get('site_title') }}</a>  <div class="nav-pills nav-collapse">
                 <ul class="nav navbar-nav">
                 </ul>


[prev in list] [next in list] [prev in thread] [next in thread]