From 6614f3f0e6f006e0457e476915a708dd16c422dc Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 14:50:35 +0200 Subject: [PATCH 1/6] put the page class on html element --- customize.dist/src/less2/main.less | 16 ++++++++-------- customize.dist/src/less2/pages/page-index.less | 2 +- customize.dist/template.js | 9 +++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/customize.dist/src/less2/main.less b/customize.dist/src/less2/main.less index 068db5c7e..ecbe75cf2 100644 --- a/customize.dist/src/less2/main.less +++ b/customize.dist/src/less2/main.less @@ -2,11 +2,11 @@ font-family: Neuropolitical; src: url(./customize/fonts/neuropolitical.ttf) } -div#cp-main.cp-page-index { @import "./pages/page-index.less"; } -div#cp-main.cp-page-contact { @import "./pages/page-contact.less"; } -div#cp-main.cp-page-login { @import "./pages/page-login.less"; } -div#cp-main.cp-page-register { @import "./pages/page-register.less"; } -div#cp-main.cp-page-what-is-cryptpad { @import "./pages/page-what-is-cryptpad.less"; } -div#cp-main.cp-page-about { @import "./pages/page-about.less"; } -div#cp-main.cp-page-privacy { @import "./pages/page-privacy.less"; } -div#cp-main.cp-page-terms { @import "./pages/page-terms.less"; } +body.cp-page-index { @import "./pages/page-index.less"; } +body.cp-page-contact { @import "./pages/page-contact.less"; } +body.cp-page-login { @import "./pages/page-login.less"; } +body.cp-page-register { @import "./pages/page-register.less"; } +body.cp-page-what-is-cryptpad { @import "./pages/page-what-is-cryptpad.less"; } +body.cp-page-about { @import "./pages/page-about.less"; } +body.cp-page-privacy { @import "./pages/page-privacy.less"; } +body.cp-page-terms { @import "./pages/page-terms.less"; } diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 82832f792..98963a70f 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -9,7 +9,7 @@ @background_lighter: rgba(0,0,0,0.1); @background_darker: rgba(0,0,0,0.4); -&#cp-main { +#cp-main { color: #FFF; background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg'); background-size: cover; diff --git a/customize.dist/template.js b/customize.dist/template.js index e8d7db2fe..7dc666ec4 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -78,6 +78,15 @@ $(function () { return; } + } else { + // add class on info-pages + var css = location.pathname.replace(/(\/$|^\/|.html$)/gm, "") + .replace(/[^a-zA-Z]/gi, "-"); + if (css === '') + { + css = 'index'; + } + $('body').addClass('cp-page-' + css); } require([ From c953e71a1891e14c97b08551e2e2828c580bde27 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:06:58 +0200 Subject: [PATCH 2/6] better class generation and remove duplicate class --- customize.dist/pages.js | 16 ++++++++-------- customize.dist/template.js | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index d3b512f65..27a114c16 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -94,7 +94,7 @@ define([ }; Pages['/about.html'] = function () { - return h('div#cp-main.cp-page-about', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', [ @@ -143,7 +143,7 @@ define([ }; Pages['/privacy.html'] = function () { - return h('div#cp-main.cp-page-privacy', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.policy_title)), @@ -172,7 +172,7 @@ define([ }; Pages['/terms.html'] = function () { - return h('div#cp-main.cp-page-terms', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.tos_title)), @@ -187,7 +187,7 @@ define([ }; Pages['/contact.html'] = function () { - return h('div#cp-main.cp-page-contact', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.contact)), @@ -198,7 +198,7 @@ define([ }; Pages['/what-is-cryptpad.html'] = function () { - return h('div#cp-main.cp-page-what-is-cryptpad', [ + return h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('center', h('h1', Msg.whatis_title)), @@ -234,7 +234,7 @@ define([ Pages['/'] = Pages['/index.html'] = function () { var showingMore = false; return [ - h('div#cp-main.cp-page-index', [ + h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('div.row', [ @@ -310,7 +310,7 @@ define([ }; Pages['/register/'] = Pages['/register/index.html'] = function () { - return [h('div#cp-main.cp-page-register', [ + return [h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('div.row.align-items-center', [ @@ -362,7 +362,7 @@ define([ }; Pages['/login/'] = Pages['/login/index.html'] = function () { - return [h('div#cp-main.cp-page-login', [ + return [h('div#cp-main', [ infopageTopbar(), h('div.container.cp-container', [ h('div.row.align-items-center', [ diff --git a/customize.dist/template.js b/customize.dist/template.js index 7dc666ec4..a9067f35f 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -80,8 +80,9 @@ $(function () { } } else { // add class on info-pages - var css = location.pathname.replace(/(\/$|^\/|.html$)/gm, "") - .replace(/[^a-zA-Z]/gi, "-"); + var css = location.pathname.replace(/(index)?\.html$/gi, "") // .html + .replace(/[^a-zA-Z]+/gi, '-') // any non-alpha character + .replace(/^-|-$/g, ''); // starting/trailing dashes if (css === '') { css = 'index'; From 5c21a9048ebab456777fc2aab44144b48a5273c3 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:13:03 +0200 Subject: [PATCH 3/6] fix styles --- customize.dist/src/less2/include/infopages.less | 2 +- customize.dist/src/less2/pages/page-index.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index dfc4108ba..ca37fc9bd 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -21,7 +21,7 @@ padding: 0; margin: 0; - font-size: 14px; + font-size: 16px; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; .cp-container { diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 425182475..4301f562b 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -64,7 +64,6 @@ } .navbar { width: 100%; - margin-top: -1em; @media only screen and (max-device-width: 991px) { margin-top: 0; } From addd91cc72a230c62120fde8e9ab677577dd7644 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:16:48 +0200 Subject: [PATCH 4/6] fix styles (again) copyright cjd 2017 --- customize.dist/src/less2/pages/page-index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 4301f562b..962a174f1 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -16,7 +16,7 @@ min-height: 100vh; display: flex; flex-direction: column; - justify-content: space-around; + justify-content: space-between; align-items: center; .container { @media only screen and (max-device-width : 576px) { From 7310960f464a13823244589620e6f634450690ce Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:19:59 +0200 Subject: [PATCH 5/6] remove the hack around the hack to fix the hack --- customize.dist/pages.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 27a114c16..7c1548119 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -274,11 +274,9 @@ define([ if (showingMore) { $('.cp-more, .cp-callout-more-lessmsg').addClass('cp-hidden'); $('.cp-callout-more-moremsg').removeClass('cp-hidden'); - if ( $( window ).width() >991 ) $('.navbar').css('margin-top','-1em'); } else { $('.cp-more, .cp-callout-more-lessmsg').removeClass('cp-hidden'); $('.cp-callout-more-moremsg').addClass('cp-hidden'); - $('.navbar').css('margin-top','0'); } showingMore = !showingMore; } From ecc766eb7b71224ba740cc7a67353ec1699f47c4 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 4 Aug 2017 15:24:58 +0200 Subject: [PATCH 6/6] remove useless margin --- customize.dist/src/less2/include/infopages.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index ca37fc9bd..73b68b40a 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -21,12 +21,11 @@ padding: 0; margin: 0; - font-size: 16px; + font-size: 16pxt:; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; .cp-container { font-size: 16px; - margin-top: @infopages_infobar-height; padding-top: @infopages_padding; padding-bottom: @infopages_padding; min-height: 75vh;