Merge pull request #3631 from pavel-latyshou-binary/mtd-langbar

habib-deriv · web-flow · commit a9847d1fdae2 · 2022-05-26T21:48:50.000+08:00
Pavel/show langbar
diff --git a/src/indexPage/index.js b/src/indexPage/index.js
@@ -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'));
@@ -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();
diff --git a/static/css/_landing.scss b/static/css/_landing.scss
@@ -63,7 +63,7 @@ $header-color : #333333;
 }
 
 .hero {
-  margin-top: -110px;
+  margin-top: -105px;
   @include for-size(mobile) {
     margin-top: unset;
   }
diff --git a/templates/index.mustache b/templates/index.mustache
@@ -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">

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ $header-color : #333333;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`.hero {`
`66`		`- margin-top: -110px;`
	`66`	`+ margin-top: -105px;`
`67`	`67`	`@include for-size(mobile) {`
`68`	`68`	`margin-top: unset;`
`69`	`69`	`}`