Skip to content

Commit

Permalink
Merge branch 'pu/cw/logoLogic' into 'main'
Browse files Browse the repository at this point in the history
tweak(Tinebase) move logo logic to server

See merge request tine20/tine20!6535
  • Loading branch information
corneliusweiss committed Feb 5, 2025
2 parents 272b136 + 4f1360f commit 01a6ca0
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions tine20/Tinebase/js/LoginPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ const browserSupport = props._this._getBrowserSupportStatus()
const licenseCheck = Tine.Tinebase.registry.get('licenseStatus')
const extIdpConfig = Tine.Tinebase.registry.get('loginExternalIdps')

// form a logo url
let logoBase = Tine.logo
logoBase = logoBase.endsWith('/') ? logoBase.slice(0, logoBase.length - 1) : logoBase
// const isDark = document.body.classList.contains('dark-mode')
// const logoUrl = `${logoBase}/300x100/image%2Fsvg%2Bxml${isDark ? '/dark' : ''}`
const logoUrl = `${logoBase}${logoBase.endsWith('b') || logoBase.endsWith('i') ? '' : '/b'}/300x100`

const eventBus = inject(props.injectKey)

const usernameTRef = ref()
Expand Down Expand Up @@ -109,7 +102,7 @@ const focusUsernameField = () => usernameTRef.value.focus()
<div class="login-container">
<div class="login-logo">
<a target="_blank" rel="noopener noreferrer" :href="Tine.websiteUrl">
<img :src="logoUrl" class="logo-image dark-reverse">
<img src="logo/i/300x100" class="logo-image">
</a>
<h2 class="mt-4">{{ i18n._('Login') }}</h2>
<h5>{{ String.format(i18n._('Login with {0} account'), Tine.title)}}</h5>
Expand Down

0 comments on commit 01a6ca0

Please sign in to comment.