summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorokfprojz <jules+okfprojz@okfoc.us>2016-11-30 01:06:16 -0500
committerokfprojz <jules+okfprojz@okfoc.us>2016-11-30 01:06:16 -0500
commit929108353254d6b84463e54e54c1788c14ae7d7f (patch)
tree0e4dbaae861d9e7b4589a95062963e7602cefeef
parent5ab11844f43443baa00c2b9aa4a291c7360eae5a (diff)
etc
-rw-r--r--tree/public/assets/css/css.css3
-rw-r--r--tree/public/assets/js/app.js6
-rw-r--r--tree/templates/index.liquid4
3 files changed, 4 insertions, 9 deletions
diff --git a/tree/public/assets/css/css.css b/tree/public/assets/css/css.css
index 75b38af..0685fcd 100644
--- a/tree/public/assets/css/css.css
+++ b/tree/public/assets/css/css.css
@@ -30,10 +30,11 @@ p {
padding: 10px;
margin: 10px;
font-weight: 200;
+ line-height: 170%;
}
@media (max-width: 1200px) {
}
@media (max-width: 700px) {
-} \ No newline at end of file
+}
diff --git a/tree/public/assets/js/app.js b/tree/public/assets/js/app.js
index dc67379..87df286 100644
--- a/tree/public/assets/js/app.js
+++ b/tree/public/assets/js/app.js
@@ -28,8 +28,7 @@ var app = (function() {
app.build = function(data) {
window.scrollTo(0,0)
- environment.init()
- corner.init()
+ // environment.init()
app.views = {}
app.nav = new NavView ()
app.views.home = new HomeView({
@@ -57,7 +56,7 @@ var app = (function() {
app.view = null
app.router = new SiteRouter()
app.router.launch()
- app.animate(0)
+ // app.animate(0)
}
app.animate = function (t) {
@@ -70,7 +69,6 @@ var app = (function() {
var dt = t - last_t
last_t = t
environment.update(t, dt)
- corner.update(t, dt)
}
app.resize = function () {
diff --git a/tree/templates/index.liquid b/tree/templates/index.liquid
index 897c1f0..17f4c39 100644
--- a/tree/templates/index.liquid
+++ b/tree/templates/index.liquid
@@ -81,7 +81,6 @@ For more information, please email <u>&#x69;&#x6E;&#x66;&#x6F;&#x40;&#x6E;&#x65;
<script src="/assets/js/vendor/okcms.js"></script>
<script src="/assets/js/vendor/oktween.js"></script>
<script src="/assets/js/vendor/util.js"></script>
- <script src="/assets/js/vendor/wheel.js"></script>
<script src="/assets/js/vendor/view/View.js"></script>
<script src="/assets/js/vendor/view/ScrollableView.js"></script>
@@ -93,10 +92,7 @@ For more information, please email <u>&#x69;&#x6E;&#x66;&#x6F;&#x40;&#x6E;&#x65;
<script src="/assets/js/lib/view/HomeView.js"></script>
<script src="/assets/js/lib/view/PressView.js"></script>
- <script src="/assets/js/lib/view/FestivalView.js"></script>
- <script src="/assets/js/lib/view/LectureView.js"></script>
<script src="/assets/js/lib/view/AboutView.js"></script>
- <script src="/assets/js/lib/view/TeamView.js"></script>
<script src="/assets/js/lib/_router.js"></script>