0.0.7

devgk · Jan 23, 2017 · ad373b8 · ad373b8
1 parent d5a7404
commit ad373b8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/a1-business/chapter-1-1.txt b/a1-business/chapter-1-1.txt
@@ -14,11 +14,11 @@
 
 <div class="chapterNavigation">
 <div class="grid">
-<div id="previousArticle" class="previousArticle">
+<div id="previousArticle" class="previousArticle" style="display: none;">
     <a href="/wordpress/dev/dmbuddy/scps01.html"
     onClick="">
 <p><img src="../images/next.png"><span>Previous Topic</span></p></a></div>
-<div id="nextArticle" class="nextArticle">
+<div id="nextArticle" class="nextArticle" style="width: 98%;">
     <a href="#"
     onClick="return chapter1(02);">
 <p><span>Next Topic</span><img src="../images/next.png"></p></a></div>

diff --git a/a1-business/chapter-1-3.txt b/a1-business/chapter-1-3.txt
@@ -14,11 +14,11 @@
 
 <div class="chapterNavigation">
 <div class="grid">
-<div id="previousArticle" class="previousArticle">
+<div id="previousArticle" class="previousArticle" style="width: 98%;">
     <a href="#"
     onClick="return chapter1(02);">
 <p><img src="../images/next.png"><span>Previous Topic</span></p></a></div>
-<div id="nextArticle" class="nextArticle">
+<div id="nextArticle" class="nextArticle" style="display: none;">
     <a href="#"
     onClick="">
 <p><span>Next Topic</span><img src="../images/next.png"></p></a></div>

diff --git a/a1-business/function/chapter-1.js b/a1-business/function/chapter-1.js
@@ -11,7 +11,6 @@ if(x==01){
     };
     xhttp.open("GET", "chapter-1-1.txt", true);
     xhttp.send();
-    setTimeout(startingEnd,10); //Start Chapter
 }
 if(x==02){
     startLoading();
@@ -34,17 +33,6 @@ if(x==03){
     };
     xhttp.open("GET", "chapter-1-3.txt", true);
     xhttp.send();
-    setTimeout(removeEnd,10); //close chapters
 }
 return null;
-}
-
-function startingEnd(){
-document.getElementById('previousArticle').style.display = 'none';
-document.getElementById('nextArticle').style.width = '98%';
-}
-
-function removeEnd(){
-document.getElementById('nextArticle').style.display = 'none';
-document.getElementById('previousArticle').style.width = '98%';
 }
diff --git a/a1.html b/a1.html
@@ -16,6 +16,10 @@
 
 
 <link href="https://fonts.googleapis.com/css?family=PT+Sans:400,700" rel="stylesheet">
+
+<script type="text/javascript">
+setTimeout(removeLoading, 100);
+</script>
 </head>
 <body>
 <div class="container">

diff --git a/functions/core.js b/functions/core.js
@@ -10,7 +10,6 @@ hammer();
 try {
 chapter1(01);
 }catch(err) {}
-setTimeout(removeLoading, 100);
 }
 
 function startLoading(){
@@ -23,7 +22,7 @@ setTimeout(endLoading, 150);
 }
 function endLoading(){
 document.getElementById("loadingScreen").style.display = "none";
-document.getElementById('loadingScreen').style.opacity = '1';
+document.getElementById('loadingScreen').style.opacity = '0.9';
 }
 
 function hammer(){

diff --git a/styles/core.css b/styles/core.css
@@ -18,7 +18,7 @@ height: 100%;
 background: url(../images/back.png);
 background-position: center center;
 z-index: 9999999;
-opacity: 1;
+opacity: .9;
 -webkit-transition: opacity .15s;
 transition: opacity .15s;
 }
@@ -275,23 +275,23 @@ background: repeating-linear-gradient(
 .chapterNavigation a{
 color: #444;
 }
-.previousArticle, .nextArticle{
-width: 48%;
-display: inline-block;
-margin: 0 0.7%;
-border-radius: 5px;
+.previousArticle, .nextArticle {
+    width: 48%;
+    display: inline-block;
+    margin: 4px 0.7% 0;
+    border-radius: 5px;
 }
 .previousArticle p{
 -webkit-filter: grayScale(1) contrast(1.4);
 }
 .previousArticle p, .nextArticle p{
 display: block;
-height: 40px;
+height: 36px;
 width: 170px;
 margin: 0 auto;
 background-color: FBD75B;
 border-radius: 8px;
-box-shadow: 0 0 5px #555;
+box-shadow: 0 0 0 3px #aaa;
 border: 2px solid #E36C46;
 }
 .previousArticle img, .nextArticle img {