Skip to content

Commit 954ee88

Browse files
Merge pull request #1546 from devtron-labs/feat/christmas-dt-logo
chore: add christmas logo 🎄
2 parents 1c08133 + fe3ed27 commit 954ee88

File tree

4 files changed

+595
-6
lines changed

4 files changed

+595
-6
lines changed

src/assets/icons/ic-login-dt-with-hat.svg

Lines changed: 289 additions & 0 deletions
Loading

src/assets/icons/ic-sidebar-dt-with-hat.svg

Lines changed: 286 additions & 0 deletions
Loading

src/components/common/navigation/Navigation.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import { ReactComponent as SecurityIcon } from '../../../assets/icons/ic-nav-sec
1414
import { ReactComponent as BulkEditIcon } from '../../../assets/icons/ic-nav-code.svg'
1515
import { ReactComponent as GlobalConfigIcon } from '../../../assets/icons/ic-nav-gear.svg'
1616
import { ReactComponent as StackManagerIcon } from '../../../assets/icons/ic-nav-stack.svg'
17-
import NavSprite from '../../../assets/icons/navigation-sprite.svg'
17+
import { ReactComponent as ChristmasLogo } from '../../../assets/icons/ic-sidebar-dt-with-hat.svg'
18+
// TODO: Remove after New Year
19+
// import NavSprite from '../../../assets/icons/navigation-sprite.svg'
1820
import TextLogo from '../../../assets/icons/ic-nav-devtron.svg'
1921
import { Command, CommandErrorBoundary } from '../../command'
2022
import { ModuleStatus } from '../../v2/devtronStackManager/DevtronStackManager.type'
@@ -334,13 +336,15 @@ export default class Navigation extends Component<
334336
}}
335337
>
336338
<div className="short-nav--flex">
337-
<svg
339+
{/* TODO: Uncomment after New Year */}
340+
{/* <svg
338341
className="devtron-logo"
339342
data-testid="click-on-devtron-app-logo"
340343
viewBox="0 0 40 40"
341344
>
342345
<use href={`${NavSprite}#nav-short-devtron-logo`}></use>
343-
</svg>
346+
</svg> */}
347+
<ChristmasLogo className="icon-dim-40" />
344348
<div className="pl-12">
345349
<img src={TextLogo} alt="devtron" className="devtron-logo devtron-logo--text" />
346350
</div>

src/components/login/Login.tsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { Component } from 'react'
2-
import dt from '../../assets/icons/logo/logo-dt.svg'
2+
// TODO: Enable after New Year
3+
// import dt from '../../assets/icons/logo/logo-dt.svg'
34
import LoginIcons from '../../assets/icons/LoginSprite.svg'
45
import { Switch, Redirect, Route, NavLink } from 'react-router-dom'
56
import { toast } from 'react-toastify'
@@ -8,6 +9,8 @@ import { URLS, DOCUMENTATION, TOKEN_COOKIE_NAME, PREVIEW_DEVTRON, PRIVACY_POLICY
89
import { LoginProps, LoginFormState } from './login.types'
910
import { getSSOConfigList, loginAsAdmin } from './login.service'
1011
import { dashboardAccessed } from '../../services/service'
12+
// TODO: remove after New Year
13+
import { ReactComponent as ChristmasLogo } from '../../assets/icons/ic-login-dt-with-hat.svg'
1114
import './login.scss'
1215

1316
export default class Login extends Component<LoginProps, LoginFormState> {
@@ -138,7 +141,10 @@ export default class Login extends Component<LoginProps, LoginFormState> {
138141

139142
return (
140143
<div className="login__control">
141-
<img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" />
144+
{/* <img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" /> */}
145+
<div className="flex">
146+
<ChristmasLogo width={170} height={120} className="login__dt-logo"/>
147+
</div>
142148
<p className="login__text">Your tool for Rapid, Reliable & Repeatable deployments</p>
143149
{this.state.loginList
144150
.filter((sso) => sso.active)
@@ -172,7 +178,11 @@ export default class Login extends Component<LoginProps, LoginFormState> {
172178

173179
return (
174180
<div className="login__control">
175-
<img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" />
181+
{/* TODO: Uncomment after New year */}
182+
{/* <img src={dt} alt="login" className="login__dt-logo" width="170px" height="120px" /> */}
183+
<div className="flex">
184+
<ChristmasLogo width={170} height={120} className="login__dt-logo"/>
185+
</div>
176186
<p className="login__text">Your tool for Rapid, Reliable & Repeatable deployments</p>
177187
{/* @ts-ignore */}
178188
<form className="login-dt__form" autoComplete="on" onSubmit={this.login}>

0 commit comments

Comments
 (0)