From 18e4e16b0f63c5ee12135d66cc9e2b9fed142484 Mon Sep 17 00:00:00 2001 From: janschoenherr Date: Tue, 5 Apr 2016 17:34:30 +0200 Subject: [PATCH 1/8] fix --- index.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index a6c425a..b5122c8 100644 --- a/index.php +++ b/index.php @@ -105,8 +105,6 @@ return; } - $params = $view->params; - $classes = [ 'navbar' => 'tm-navbar', 'hero' => '', @@ -119,23 +117,23 @@ 'animation' => 'uk-animation-slide-top' ]; - if ($params['hero_viewport']) { + if ($event['hero_viewport']) { $classes['hero'] = 'tm-hero-height'; } // Sticky overlay navbar if hero position exists - if ($params['navbar_transparent'] && $view->position()->exists('hero') && $params['hero_image']) { + if ($event['navbar_transparent'] && $view->position()->exists('hero') && $event['hero_image']) { $sticky['top'] = '.uk-sticky-placeholder + *'; $classes['navbar'] .= ' tm-navbar-overlay tm-navbar-transparent'; - if ($params['hero_viewport']) { + if ($event['hero_viewport']) { $classes['hero'] = 'uk-height-viewport'; } else { $classes['hero'] = 'tm-hero-padding'; } - if ($params['hero_contrast']) { + if ($event['hero_contrast']) { $sticky['clsinactive'] = 'tm-navbar-transparent tm-navbar-contrast'; $classes['navbar'] .= ' tm-navbar-contrast'; @@ -146,17 +144,17 @@ } - if ($params['hero_parallax'] && $view->position()->exists('hero') && $params['hero_image']) { + if ($event['hero_parallax'] && $view->position()->exists('hero') && $event['hero_image']) { $classes['parallax'] = 'data-uk-parallax="{bg: \'-400\'}"'; } - if ($params['hero_contrast'] && $params['hero_image']) { + if ($event['hero_contrast'] && $event['hero_image']) { $classes['hero'] .= ' uk-contrast'; } $classes['sticky'] = 'data-uk-sticky=\''.json_encode($sticky).'\''; - $params['classes'] = $classes; + $event['classes'] = $classes; }, 'view.system/site/widget-menu' => function ($event, $view) { From 08525e5d5c79e56cfb3b8898c73dadc35fd0df3f Mon Sep 17 00:00:00 2001 From: janschoenherr Date: Wed, 6 Apr 2016 09:39:25 +0200 Subject: [PATCH 2/8] Revert "fix" This reverts commit 18e4e16b0f63c5ee12135d66cc9e2b9fed142484. --- index.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index b5122c8..a6c425a 100644 --- a/index.php +++ b/index.php @@ -105,6 +105,8 @@ return; } + $params = $view->params; + $classes = [ 'navbar' => 'tm-navbar', 'hero' => '', @@ -117,23 +119,23 @@ 'animation' => 'uk-animation-slide-top' ]; - if ($event['hero_viewport']) { + if ($params['hero_viewport']) { $classes['hero'] = 'tm-hero-height'; } // Sticky overlay navbar if hero position exists - if ($event['navbar_transparent'] && $view->position()->exists('hero') && $event['hero_image']) { + if ($params['navbar_transparent'] && $view->position()->exists('hero') && $params['hero_image']) { $sticky['top'] = '.uk-sticky-placeholder + *'; $classes['navbar'] .= ' tm-navbar-overlay tm-navbar-transparent'; - if ($event['hero_viewport']) { + if ($params['hero_viewport']) { $classes['hero'] = 'uk-height-viewport'; } else { $classes['hero'] = 'tm-hero-padding'; } - if ($event['hero_contrast']) { + if ($params['hero_contrast']) { $sticky['clsinactive'] = 'tm-navbar-transparent tm-navbar-contrast'; $classes['navbar'] .= ' tm-navbar-contrast'; @@ -144,17 +146,17 @@ } - if ($event['hero_parallax'] && $view->position()->exists('hero') && $event['hero_image']) { + if ($params['hero_parallax'] && $view->position()->exists('hero') && $params['hero_image']) { $classes['parallax'] = 'data-uk-parallax="{bg: \'-400\'}"'; } - if ($event['hero_contrast'] && $event['hero_image']) { + if ($params['hero_contrast'] && $params['hero_image']) { $classes['hero'] .= ' uk-contrast'; } $classes['sticky'] = 'data-uk-sticky=\''.json_encode($sticky).'\''; - $event['classes'] = $classes; + $params['classes'] = $classes; }, 'view.system/site/widget-menu' => function ($event, $view) { From 8fbfd41aba8189014aa6fab6aa0d07baa4ff25bc Mon Sep 17 00:00:00 2001 From: Malte Date: Wed, 6 Apr 2016 14:59:54 +0200 Subject: [PATCH 3/8] update vue-loader --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86fa21e..863dedb 100644 --- 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" } } From fb2aeaf6f3fe2939acad221a6804978183d98fb7 Mon Sep 17 00:00:00 2001 From: Sascha Dube Date: Wed, 6 Apr 2016 18:06:38 +0200 Subject: [PATCH 4/8] better option naming --- app/components/node-theme.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/components/node-theme.vue b/app/components/node-theme.vue index 11733e0..7288411 100644 --- a/app/components/node-theme.vue +++ b/app/components/node-theme.vue @@ -40,7 +40,7 @@
- +

@@ -60,7 +60,7 @@

- +
@@ -80,12 +80,13 @@
- +
+

{{ 'Note: Position settings only work if you publish a widget in that position.' | trans }}

From 14fed5631d075df20d9ee595dbe500e7fda93ac7 Mon Sep 17 00:00:00 2001 From: Sascha Dube Date: Wed, 6 Apr 2016 18:09:39 +0200 Subject: [PATCH 5/8] Made the logo height responsive --- CHANGELOG.md | 5 +++++ views/template.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32fb29b..f58b5df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## WIP + +### Changed +- Made the logo height responsive + ## 0.11.0 (February 24, 2016) ### Changed diff --git a/views/template.php b/views/template.php index 7ae89f0..5f7046b 100644 --- a/views/template.php +++ b/views/template.php @@ -19,9 +19,9 @@ - + - + From 3e4ad697c3c60b78a275d849ff4d6d54139e4e1e Mon Sep 17 00:00:00 2001 From: Sascha Dube Date: Wed, 6 Apr 2016 19:24:38 +0200 Subject: [PATCH 6/8] Added page title fallback if no logo is picked --- CHANGELOG.md | 3 +++ views/template.php | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f58b5df..cb5ad61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## WIP +### Added +- Added page title fallback if no logo is picked + ### Changed - Made the logo height responsive diff --git a/views/template.php b/views/template.php index 5f7046b..57f62d8 100644 --- a/views/template.php +++ b/views/template.php @@ -16,15 +16,14 @@