From 2969161afbe60a1aa2e7da6cedc3ab48941faf3e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 21 Mar 2019 20:27:21 +0200 Subject: - More whitelabeling. Thanks to xet7 ! --- client/components/main/header.jade | 9 +++++---- client/components/main/layouts.jade | 24 ++++++++++++------------ client/components/settings/settingBody.jade | 6 +++--- client/components/settings/settingBody.styl | 4 ++++ 4 files changed, 24 insertions(+), 19 deletions(-) (limited to 'client/components') diff --git a/client/components/main/header.jade b/client/components/main/header.jade index c0781303..75e84c0c 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -45,15 +45,16 @@ template(name="header") #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}") +Template.dynamic(template=headerBar) - unless hideLogo + //unless hideLogo //- On sandstorm, the logo shouldn't be clickable, because we only have one page/document on it, and we don't want to see the home page containing the list of all boards. - unless currentSetting.hideLogo - a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}") - img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan") + + // unless currentSetting.hideLogo + // a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}") + // img(src="{{pathFor '/logo-header.png'}}" alt="") if appIsOffline +offlineWarning diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 3be676a3..0d39ed37 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -1,5 +1,5 @@ head - title Wekan + title "" meta(name="viewport" content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0") meta(http-equiv="X-UA-Compatible" content="IE=edge") @@ -7,20 +7,20 @@ head where the application is deployed with a path prefix, but it seems to be difficult to do that cleanly with Blaze -- at least without adding extra packages. - link(rel="shortcut icon" href="/wekan-favicon.png") - link(rel="apple-touch-icon" href="/wekan-favicon.png") - link(rel="mask-icon" href="/wekan-150.svg") - link(rel="manifest" href="/wekan-manifest.json") + link(rel="shortcut icon" href="/favicon.png") + link(rel="apple-touch-icon" href="/favicon.png") + link(rel="mask-icon" href="/logo-150.svg") + link(rel="manifest" href="/manifest.json") template(name="userFormsLayout") section.auth-layout - if currentSetting.hideLogo - h1 - br - br - else - h1.at-form-landing-logo - img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") + //if currentSetting.hideLogo + h1 + br + br + //else + // h1.at-form-landing-logo + // img(src="{{pathFor '/logo.png'}}" alt="") section.auth-dialog +Template.dynamic(template=content) if currentSetting.displayAuthenticationMethod diff --git a/client/components/settings/settingBody.jade b/client/components/settings/settingBody.jade index 220dbb50..89911e09 100644 --- a/client/components/settings/settingBody.jade +++ b/client/components/settings/settingBody.jade @@ -134,7 +134,7 @@ template(name='announcementSettings') template(name='layoutSettings') ul#layout-setting.setting-detail - li.layout-form + //li.layout-form .title {{_ 'hide-logo'}} .form-group.flex input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}") @@ -154,7 +154,7 @@ template(name='layoutSettings') li.layout-form .title {{_ 'custom-product-name'}} .form-group - input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}") + input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}") li.layout-form .title {{_ 'add-custom-html-after-body-start'}} textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart @@ -171,4 +171,4 @@ template(name='selectAuthenticationMethod') if isSelected value option(value="{{value}}" selected) {{_ value}} else - option(value="{{value}}") {{_ value}} \ No newline at end of file + option(value="{{value}}") {{_ value}} diff --git a/client/components/settings/settingBody.styl b/client/components/settings/settingBody.styl index 7f8bd4c0..dbf91a6c 100644 --- a/client/components/settings/settingBody.styl +++ b/client/components/settings/settingBody.styl @@ -52,6 +52,10 @@ .main-body padding: 0.1em 1em + -webkit-user-select: auto // Safari 3.1+ + -moz-user-select: auto // Firefox 2+ + -ms-user-select: auto // IE 10+ + user-select: auto // Standard syntax ul li -- cgit v1.2.3-1-g7c22