Merge branch 'newfonts'

src/assets/css/main.css

@@ -97,14 +97,59 @@ textarea {
    Author's custom styles
    ========================================================================== */
 
+   /* 
+   ANIMATIONS */
+
+   .fade-enter-active, .fade-leave-active {
+    transition: opacity 0.45s ease-out;
+  }
+  
+  .fade-enter, .fade-leave-to {
+    opacity: 0;
+  }
+
+
+  /* FONTS */
+
+
+   @import url("http://fast.fonts.net/t/1.css?apiType=css&projectid=4ffe0acf-445b-4225-972b-c24821ab851d");
+    @font-face{
+        font-family:"BasicCommercialW01-Ligh";
+        src:url("../fonts/9dcb4e2d-058e-4612-a332-2daafe0479e7.eot?#iefix");
+        src:url("../fonts/9dcb4e2d-058e-4612-a332-2daafe0479e7.eot?#iefix") format("eot"),url("../fonts/c8ea4955-f5ed-486e-8fe1-c93b8cbd2566.woff2") format("woff2"),url("../fonts/820a8f20-1c96-461f-af29-c4d7c8501607.woff") format("woff"),url("../fonts/ed0450c0-0a6c-4f1b-b53c-648861a95de8.ttf") format("truetype");
+    }
+    @font-face{
+        font-family:"BasicCommercialW01-Roma";
+        src:url("../fonts/b79b3f0d-337c-493e-9dba-346560fd6d7f.eot?#iefix");
+        src:url("../fonts/b79b3f0d-337c-493e-9dba-346560fd6d7f.eot?#iefix") format("eot"),url("../fonts/5689664f-5706-4ecb-a6b5-18882ba249e3.woff2") format("woff2"),url("../fonts/a96530dd-c9a4-4cd4-89c1-843e8965eba1.woff") format("woff"),url("../fonts/8a8c36d9-a5cc-4614-b098-5e57c6e09ca7.ttf") format("truetype");
+    }
+    @font-face{
+        font-family:"Basic Commercial W01 It";
+        src:url("../fonts/24cd9a2c-861c-4939-b1e7-192d0048c2da.eot?#iefix");
+        src:url("../fonts/24cd9a2c-861c-4939-b1e7-192d0048c2da.eot?#iefix") format("eot"),url("../fonts/5f052fc9-d9fb-4553-a377-cc609e0e80a2.woff2") format("woff2"),url("../fonts/a57b1d4c-74ae-4bd3-a710-7b65f94f3d39.woff") format("woff"),url("../fonts/c2e8b545-3566-4eb6-bcd4-4335fd5f1b6f.ttf") format("truetype");
+    }
+    @font-face{
+        font-family:"BasicCommercialW01-Bold";
+        src:url("../fonts/1398268c-cf49-4567-ba48-8ff7d12bbbe5.eot?#iefix");
+        src:url("../fonts/1398268c-cf49-4567-ba48-8ff7d12bbbe5.eot?#iefix") format("eot"),url("../fonts/259b2e27-d686-457d-bee9-027466b3b679.woff2") format("woff2"),url("../fonts/fb411e31-380f-4a7f-a4c3-daaacd9aa217.woff") format("woff"),url("../fonts/bdcaa507-aa33-4a68-af05-eefb168255fc.ttf") format("truetype");
+    }
    
 
 body{
 
-    font: 18px "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+    font: 18px "BasicCommercialW01-Roma", Helvetica Neue, Arial, Helvetica, Geneva, sans-serif;
 	line-height: 22px;
 	padding: 1em;
-    background-color: #BCDFDA;
+ 
+}
+
+h1{
+    font: 4.26em "BasicCommercialW01-Bold", Helvetica Neue, Arial, Helvetica, Geneva, sans-serif;
+    color: #249AA6;
+}
+
+h1 span{
+    color: #B8E2F2;
 }
 
 nav li{
@@ -114,7 +159,7 @@ nav li{
 
 main{
     max-width: 635px;
-    background-color: #BCDFDA;
+    /* background-color: #BCDFDA; */
 }
 
 #start{
@@ -147,20 +192,16 @@ h3.hello{
     border-right: 30px solid grey;
 }
 
-#spatialui{
-width:600px;
-    background-color:#BCDFDA;
-    margin-bottom:30px;
-}
-#interface{
 
-    background-color: #BCDFDA;
+#interface{
+    border: 1px solid black;
+    /* background-color: #BCDFDA; */
 
 }
 
 a{
     color: black;
-    background-color: #BCDFDA; 
+
 }
 
 a:hover{

src/assets/js/custom.js

-//alert('custom js file ready to roll')
+//alert('custom js file ready to roll')
\ No newline at end of file

src/components/human-interface.vue

 <template>
   <div id="human-interface">
     <!-- the SVG.js stuff appears here -->
+    <transition name="fade">
     <styledviewer v-show="isShowing"></styledviewer>
+    </transition>
   </div>
 </template>
 

src/components/instance-logo.vue

 <template>
   <div class="logo">
-    <h1>
-      <img src="../assets/img/icon.png" alt="Logo for project codename nodenoggin">
+    <h1>node<span>noggin</span>
+      <!-- <img src="../assets/img/icon.png" alt="Logo for project codename nodenoggin"> -->
     </h1>
   </div>
 </template>

src/components/register-account.vue

 <template>
   <section class="register">
-    <h1>Register</h1>
+    <h2>Register</h2>
     <form @submit.prevent="registeraccount()">
       <!-- <form @submit.prevent="registeraccount()"> -->
       <input type="text" name="name" v-model="name" placeholder="Name">

src/components/sign-in.vue

 <template>
   <section class="signin">
-    <h1>Sign in</h1>
+    <h2>Sign in</h2>
     <form @submit.prevent="login()">
       <input type="text" name="email" v-model="input.email" placeholder="Email">
       <button type="submit">

src/components/styled-viewer.vue

 <template>
   <div class="viewer">
-    <h1>STYLISH</h1>
-    <p>This is some dummy text, no real data yet</p>
+    <h2>STYLISH</h2>
+    <p>This is some dummy text, no real data yet. Less than ten years earlier--the top half of the population. In the afternoon hush the volume of noise. Already an excited voice was as anxious as anyone else who knew it already. With him were below ground level. The problem was how to discover, against his thigh at each other again?' 'Yes, dear, you would have. I would, if I'd been the beginnings of a future society unbelievably rich, leisured, orderly, and efficient--a glittering antiseptic world of solid men in the canteen at the end, the tongue sticking right out, and blue--a quite bright blue. That's the detail of his to
+</p>
   </div>
 </template>
 

vs_noggin.code-workspace

@@ -2,9 +2,6 @@
 	"folders": [
 		{
 			"path": "."
-		},
-		{
-			"path": "/Users/adamprocter/Documents/GitKraken/MicroVue"
 		}
 	],
 	"settings": {