summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2015-05-11 18:47:56 +0100
committerJulie Lala <jules@okfoc.us>2015-05-11 18:48:59 +0100
commit47f99164edadbe4a97a67ef6890a02b424b2ab87 (patch)
treea1a6af38e212806de30f68c363c8d24c24497be8
parentca364c2cee66002d35b7e5c8c675b7191563ae4f (diff)
random grid
-rw-r--r--site/public/assets/javascripts/_env.js24
-rw-r--r--site/public/assets/style.css5
-rw-r--r--site/templates/all.liquid8
3 files changed, 29 insertions, 8 deletions
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index f940389..0b10daf 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -1,6 +1,7 @@
var strips = [], boxImages = []
var done_loading = false, menu_open = false, entry_open = false
+var shuffled_indexes
var environment = {}, hashes = {}
environment.init = function(){
@@ -346,12 +347,27 @@ function open_entry (entryIsAll) {
entry_open_time = +new Date
$("#entry_container").addClass("fade")
}
-function display_entry ($el) {
+function display_entry (el) {
var now = +new Date
- console.log("Has all", $el, $($el).hasClass("all"))
+ var $el = $(el)
+ var isIndex = $el.hasClass("all")
if (is_mobile) {
- $("body").toggleClass("menuActive", $($el).hasClass("all"))
- $($el).find(".brady").remove()
+ $("body").toggleClass("menuActive", isIndex)
+ $el.find(".brady").remove()
+ }
+ if (isIndex) {
+ var $projects = $el.find(".project")
+ if (! shuffled_indexes) {
+ shuffled_indexes = []
+ for (var i = 0; i < $projects.length; i++) {
+ shuffled_indexes[i] = i
+ }
+ shuffle(shuffled_indexes)
+ }
+ $el.html("")
+ for (var i = 0; i < $projects.length; i++) {
+ $el.append($projects[shuffled_indexes[i]])
+ }
}
setTimeout(function(){
$("#entry_container").empty().append($el)
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index a11d905..3ccb1a7 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -877,6 +877,7 @@ nav .sub.active a {
transition: 0.1s opacity ease-in;
display: block;
text-overflow: ellipsis;
+ text-transform: uppercase;
}
.mobile .project span,
.desktop .project:hover span {
@@ -973,6 +974,10 @@ nav .sub.active a {
width:33.3333%;
height: 16.6vw;
}
+ .brady a {
+ width: 160px;
+ height: 160px;
+ }
}
diff --git a/site/templates/all.liquid b/site/templates/all.liquid
index 73da67b..97528c2 100644
--- a/site/templates/all.liquid
+++ b/site/templates/all.liquid
@@ -2,25 +2,25 @@
{% for project in advertisings %}
<div class="project" data-id="{{ project.id }}" data-type="advertising">
<img src="{{ project.thumbnail.uri }}">
- <span>{{ project.title }}</span>
+ <span>{{ project.menu }}</span>
</div>
{% endfor %}
{% for project in contents %}
<div class="project" data-id="{{ project.id }}" data-type="content">
<img src="{{ project.thumbnail.uri }}">
- <span>{{ project.title }}</span>
+ <span>{{ project.menu }}</span>
</div>
{% endfor %}
{% for project in experientials %}
<div class="project" data-id="{{ project.id }}" data-type="experiential">
<img src="{{ project.thumbnail.uri }}">
- <span>{{ project.title }}</span>
+ <span>{{ project.menu }}</span>
</div>
{% endfor %}
{% for project in retails %}
<div class="project" data-id="{{ project.id }}" data-type="retail">
<img src="{{ project.thumbnail.uri }}">
- <span>{{ project.title }}</span>
+ <span>{{ project.menu }}</span>
</div>
{% endfor %}
</div>