Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Pavel/show langbar #3631

Merged
habib-deriv merged 2 commits into from
May 26, 2022
Merged

Pavel/show langbar #3631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b21721d
fix: show langbar
May 26, 2022
c73334b
fix: margin fix
May 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/indexPage/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import BotLanding from './react-components/bot-landing';
const today = new Date().getTime();
const expirationDate = today + 1000 * 60 * 60 * 24 * 21;

const elements = ['#notification-banner', '#main', '#footer', '#header', '#topbar'];
const elements = ['#notification-banner', '#main', '#footer', '#header'];
const temp = getStorage('movetoderiv');
const renderBanner = () => {
ReactDOM.render(<BotLanding />, document.getElementById('movetoderiv'));
Expand Down Expand Up @@ -62,13 +62,13 @@ const loginCheck = () => {
if (endpoint()) return;
moveToDeriv();
loadLang();
$('.show-on-load').show();
if (temp) {
if (getTokenList().length) {
window.location.pathname = `${window.location.pathname.replace(/\/+$/, '')}/bot.html`;
document.getElementById('bot-main').classList.remove('hidden');
} else {
oauthLogin(() => {
$('.show-on-load').show();
$('.barspinner').hide();
renderElements();
GTM.init();
Expand Down
2 changes: 1 addition & 1 deletion static/css/_landing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ $header-color : #333333;
}

.hero {
margin-top: -110px;
margin-top: -105px;
@include for-size(mobile) {
margin-top: unset;
}
Expand Down
2 changes: 1 addition & 1 deletion templates/index.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<body>
<div id="bot-main" class="hidden" style="width: 100%; position: relative; height: 100%;">
{{> ../templates/partials/loading }}
<div id="movetoderiv"></div>
<div id="topbar">
<div class="wrapper show-on-load">
{{> ../templates/partials/language }}
</div>
</div>
<div id="movetoderiv"></div>
<div id="header">
<div class="wrapper">
<div class="logo-wrapper">
Expand Down