From 905faf372186c1a766364224e95fd24479daf4ca Mon Sep 17 00:00:00 2001 From: rr- Date: Thu, 14 Apr 2016 12:11:49 +0200 Subject: [PATCH] client/css: scale to device width --- client/css/users.styl | 9 ++++++++- client/html/endless_pager.hbs | 1 + client/html/index.htm | 1 + client/js/util/misc.js | 2 +- client/js/views/endless_page_view.js | 5 +++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/client/css/users.styl b/client/css/users.styl index 7470d2a..735dee2 100644 --- a/client/css/users.styl +++ b/client/css/users.styl @@ -79,9 +79,10 @@ justify-content: center align-content: flex-end flex-wrap: wrap + margin: 0 -0.5em 0 -0.5em li width: 20em - margin: 0.5em + margin: 0 0.5em 1em 0.5em padding: 0.75em vertical-align: top background: $top-nav-color @@ -95,3 +96,9 @@ width: 3em height: 3em margin: 0 0.6em 0 0 +.user-list-header + text-align: left + form + max-width: auto + input[name=search-text] + max-width: 15em diff --git a/client/html/endless_pager.hbs b/client/html/endless_pager.hbs index b734683..a47cd96 100644 --- a/client/html/endless_pager.hbs +++ b/client/html/endless_pager.hbs @@ -1,4 +1,5 @@
+
diff --git a/client/html/index.htm b/client/html/index.htm index 2c2d9ab..5cf68ec 100644 --- a/client/html/index.htm +++ b/client/html/index.htm @@ -2,6 +2,7 @@ + <!-- confiured in config file --> diff --git a/client/js/util/misc.js b/client/js/util/misc.js index 38f54ff..af33364 100644 --- a/client/js/util/misc.js +++ b/client/js/util/misc.js @@ -60,7 +60,7 @@ function formatSearchQuery(dict) { result.push('{0}={1}'.format(key, value)); } } - return result.join(''); + return result.join(';'); } function parseSearchQuery(query) { diff --git a/client/js/views/endless_page_view.js b/client/js/views/endless_page_view.js index 2fda55a..5c813ef 100644 --- a/client/js/views/endless_page_view.js +++ b/client/js/views/endless_page_view.js @@ -14,10 +14,15 @@ class EndlessPageView { render(ctx) { const target = document.getElementById('content-holder'); const source = this.holderTemplate(); + const pageHeaderHolder = source.querySelector('.page-header-holder'); const pagesHolder = source.querySelector('.pages-holder'); views.listenToMessages(target); views.showView(target, source); + let headerRendererCtx = ctx; + headerRendererCtx.target = pageHeaderHolder; + ctx.headerRenderer.render(headerRendererCtx); + const threshold = window.innerHeight / 3; if (ctx.state && ctx.state.html) {