fixing merge, hopefully

1 files changed, 0 insertions, 134 deletions

diff --git a/site/public/assets/css/splash.css b/site/public/assets/css/splash.css
deleted file mode 100644
index 6089f10d..00000000
--- a/site/public/assets/css/splash.css
+++ /dev/null
@@ -1,134 +0,0 @@
-/* splash */
-
-html, body {
-  overflow: hidden;
-  width: 100%; height: 100%;
-}
-header {
-  position: absolute;
-  background: transparent;
-  box-shadow: none;
-}
-footer {
-  background: transparent;
-  position: absolute;
-  bottom: 0; left: 0;
-  padding: 20px;
-}
-footer div {
-  z-index: 2;
-}
-footer {
-  background: #111;
-}
-header .links a.activeLink {
-  color: white;
-  border-bottom-color: white;
-}
-.splash {
-}
-#three_container {
-  position: absolute;
-  top: 0; left: 0;
-  width: 100%; height: 100%;
-}
-
-.about.open {
-  pointer-events: auto;
-  opacity: 1;
-  cursor: pointer;
-}
-.about {
-  position: absolute;
-  top: 0; left: 0;
-  width: 100%; height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: rgba(0,0,0,0.5);
-  opacity: 0;
-  pointer-events: none;
-  transition: opacity 400ms;
-  overflow-y: scroll;
-}
-.about .inner {
-  padding: 40px;
-  background: #000;
-  color: #eee;
-  max-width: 600px;
-  line-height: 1.5;
-  cursor: text;
-}
-.about .inner b {
-  color: #fff;
-}
-.about a {
-  color: #fff;
-}
-p {
-  margin: 0 10px 20px 0;
-  line-height: 1.5;
-  font-size: 14px;
-  font-weight: 300;
-}
-
-@media screen and (max-width: 700px) {
-  header, footer {
-    transition: background 0.4s;
-  }
-  .modalOpen header,
-  .modalOpen footer {
-    background: rgba(25, 25, 25, 1.0);
-  }
-  header .slogan {
-    padding-left: 10px;
-  }
-  footer {
-    display: block;
-    background: rgba(25, 25, 25, 0.8);
-    padding: 10px 20px;
-  }
-  footer div {
-    background: transparent;
-    text-align: center;
-    width: 100%;
-    display: block;
-    padding: 0;
-  }
-  header .links {
-    display: block;
-    text-align: right;
-    padding: 0;
-    padding-right: 10px;
-  }
-  header .links span,
-  header .links a {
-    display: inline-block;
-    text-align: right;
-    margin: 0;
-    font-size: 12px;
-    background: rgba(25, 25, 25, 0.5);
-    text-shadow: 0 0 0 rgba(0,0,0,0);
-    border-bottom: 0;
-  }
-  .about {
-    display: block;
-  }
-  .about .inner {
-    max-width: 100%;
-    padding: 20px;
-    padding-top: 80px;
-    padding-bottom: 50px;
-  }
-}
-@media screen and (max-height: 500px) {
-  .about {
-    display: block;
-  }
-  .about .inner {
-    max-width: 100%;
-    padding: 20px;
-    padding-top: 70px;
-    padding-bottom: 50px;
-  }
-}