Merge branch 'release/0.11.1'

pagekit · Apr 7, 2016 · 3c9a3af · 3c9a3af
2 parents e293868 + 41a8cc5
commit 3c9a3af
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.11.1 (April 7, 2016)
+
+### Added
+- Added page title fallback if no logo is picked
+
+### Changed
+- Made the logo height responsive
+
 ## 0.11.0 (February 24, 2016)
 
 ### Changed

diff --git a/app/components/node-theme.vue b/app/components/node-theme.vue
@@ -40,7 +40,7 @@
         </div>
 
         <div class="uk-form-row">
-            <label class="uk-form-label">{{ 'Hero Image' | trans }}</label>
+            <label class="uk-form-label">Hero {{ 'Position' | trans }}</label>
             <div class="uk-form-controls uk-form-controls-text">
                 <p class="uk-form-controls-condensed">
                     <label><input type="checkbox" v-model="node.theme.hero_viewport"> {{ 'Full viewport height' | trans }}</label>
@@ -60,7 +60,7 @@
         </div>
 
         <div class="uk-form-row">
-            <label for="form-top-style" class="uk-form-label">{{ 'Top Style' | trans }}</label>
+            <label for="form-top-style" class="uk-form-label">Top {{ 'Position' | trans }}</label>
             <div class="uk-form-controls">
                 <select id="form-top-style" class="uk-form-width-large" v-model="node.theme.top_style">
                     <option value="uk-block-default">{{ 'Default' | trans }}</option>
@@ -70,7 +70,7 @@
         </div>
 
         <div class="uk-form-row">
-            <label for="form-main-style" class="uk-form-label">{{ 'Main Style' | trans }}</label>
+            <label for="form-main-style" class="uk-form-label">Main {{ 'Position' | trans }}</label>
             <div class="uk-form-controls">
                 <select id="form-main-style" class="uk-form-width-large" v-model="node.theme.main_style">
                     <option value="uk-block-default">{{ 'Default' | trans }}</option>
@@ -80,12 +80,13 @@
         </div>
 
         <div class="uk-form-row">
-            <label for="form-bottom-style" class="uk-form-label">{{ 'Bottom Style' | trans }}</label>
+            <label for="form-bottom-style" class="uk-form-label">Bottom {{ 'Position' | trans }}</label>
             <div class="uk-form-controls">
                 <select id="form-bottom-style" class="uk-form-width-large" v-model="node.theme.bottom_style">
                     <option value="uk-block-default">{{ 'Default' | trans }}</option>
                     <option value="uk-block-muted">{{ 'Muted' | trans }}</option>
                 </select>
+                <p class="uk-form-help-block uk-margin">{{ 'Note: Position settings only work if you publish a widget in that position.' | trans }}</p>
             </div>
         </div>
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "pagekit/theme-one",
     "type": "pagekit-theme",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "title": "One",
     "description": "Pagekit's default theme.",
     "license": "MIT",

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "gulp-util": "^3.0.4",
     "merge-stream": "^0.1.7",
     "vue-html-loader": "^1.0.0",
-    "vue-loader": "^7.2.0",
+    "vue-loader": "^8.2.0",
     "webpack": "^1.12.9"
   }
 }
diff --git a/views/template.php b/views/template.php
@@ -16,15 +16,14 @@
 
                 <nav class="uk-navbar">
 
-                    <?php if ($params['logo']) : ?>
                     <a class="uk-navbar-brand" href="<?= $view->url()->get() ?>">
-
-                        <img class="tm-logo" src="<?= $this->escape($params['logo']) ?>" alt="">
-
-                        <img class="tm-logo-contrast" src="<?= ($params['logo_contrast']) ? $this->escape($params['logo_contrast']) : $this->escape($params['logo']) ?>" alt="">
-
+                        <?php if ($params['logo']) : ?>
+                            <img class="tm-logo uk-responsive-height" src="<?= $this->escape($params['logo']) ?>" alt="">
+                            <img class="tm-logo-contrast uk-responsive-height" src="<?= ($params['logo_contrast']) ? $this->escape($params['logo_contrast']) : $this->escape($params['logo']) ?>" alt="">
+                        <?php else : ?>
+                            <?= $params['title'] ?>
+                        <?php endif ?>
                     </a>
-                    <?php endif ?>
 
                     <?php if ($view->menu()->exists('main') || $view->position()->exists('navbar')) : ?>
                     <div class="uk-navbar-flip uk-hidden-small">