Merge pull request #124 from aminmarashi/hide-elements-before-load

Add show-on-load class to show elements on load
binary-com · Jan 11, 2017 · 0e1fb4d · 0e1fb4d
2 parents 52fb5d6 + 720609e
commit 0e1fb4d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/src/botPage/index.js b/src/botPage/index.js
@@ -110,6 +110,7 @@ class BotPage {
         trackJs.configure({
           userId: $('.account-id').first().text(),
         })
+        $('.show-on-load').show()
         $('.barspinner').hide()
         this.view.activeTour = this.view.tours.welcome
         this.view.activeTour.welcome(() => {

diff --git a/src/indexPage/index.js b/src/indexPage/index.js
@@ -6,4 +6,7 @@ import { load as loadLang } from '../common/lang'
 window.$ = $ // eslint-disable-line no-undef
 loadLang()
 setAppId()
-oauthLogin(() => $('.barspinner').hide())
+oauthLogin(() => {
+  $('.show-on-load').show()
+  $('.barspinner').hide()
+})
diff --git a/static/css/bot.scss b/static/css/bot.scss
@@ -172,3 +172,7 @@ select.tour-highlight {
   left: 0px;
   transition: 0.5s;
 }
+
+.show-on-load {
+  display: none;
+}
diff --git a/static/css/index.scss b/static/css/index.scss
@@ -82,3 +82,7 @@ ul.bullet {
 .button span {
   text-transform: inherit !important;
 }
+
+.show-on-load {
+  display: none;
+}
diff --git a/templates/bot.mustache b/templates/bot.mustache
@@ -34,7 +34,7 @@
     </div>
     {{> loading }}
     <div id="topbar">
-      <div class="right-header">
+      <div class="right-header show-on-load">
         <div class="tours">
           <ul id="display-tour">
             <li>
@@ -71,7 +71,7 @@
           </a>
         </div>
       </div>
-      <div class="right-header">
+      <div class="right-header show-on-load">
         <div class="intro-login-logout">
           <div id="account-list">
             <div id="main-logout">
@@ -172,7 +172,7 @@
     <form id="fileUploadForm" style="display: none;">
       <input title="Open an already saved XML file and retrieve its blocks" type="file" id="files" accept=".xml" multiple/>
     </form>
-    <div id="toolbox" class="actions_menu">
+    <div id="toolbox" class="actions_menu show-on-load">
       <div class="group-save">
         <button title="Load the blocks as an XML file" id="loadXml" class="toolbox-button icon-browse"></button>
         <div id="saveXml"></div>

diff --git a/templates/index.mustache b/templates/index.mustache
@@ -12,7 +12,7 @@
 <body>
 	{{> loading }}
 	<div id="topbar">
-    <div class="wrapper">
+    <div class="wrapper show-on-load">
 		  {{> language }}
     </div>
 	</div>
@@ -34,7 +34,7 @@
 	</div>
 	<div id="main">
 		<div>
-			<div class="content">
+			<div class="content show-on-load">
 				<h1 class="center" data-i18n-text="Binary Bot"></h1>
                 <h3 class="center" data-i18n-text="Trade More Efficiently Than You Ever Thought Possible"></h3>
                 <div class="half-width">