-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from bitshifters/updates2020
Updates2021
- Loading branch information
Showing
115 changed files
with
11,959 additions
and
173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
|
|
||
| <style> | ||
| #art { | ||
| /* Prevent vertical gaps */ | ||
| line-height: 0; | ||
|
|
||
| -webkit-column-count: 8; | ||
| -webkit-column-gap: 2px; | ||
| -moz-column-count: 8; | ||
| -moz-column-gap: 2px; | ||
| column-count: 8; | ||
| column-gap: 2px; | ||
| } | ||
|
|
||
| #art img { | ||
| /* Just in case there are inline attributes */ | ||
| width: 100% !important; | ||
| height: auto !important; | ||
| } | ||
|
|
||
| @media (max-width: 1200px) { | ||
| #art { | ||
| -moz-column-count: 8; | ||
| -webkit-column-count: 8; | ||
| column-count: 8; | ||
| } | ||
| } | ||
| @media (max-width: 1000px) { | ||
| #art { | ||
| -moz-column-count: 7; | ||
| -webkit-column-count: 7; | ||
| column-count: 7; | ||
| } | ||
| } | ||
| @media (max-width: 800px) { | ||
| #art { | ||
| -moz-column-count: 5; | ||
| -webkit-column-count: 5; | ||
| column-count: 5; | ||
| } | ||
| } | ||
| @media (max-width: 400px) { | ||
| #art { | ||
| -moz-column-count: 4; | ||
| -webkit-column-count: 4; | ||
| column-count: 4; | ||
| } | ||
| } | ||
| .art-container { | ||
| overflow:hidden; | ||
| margin-bottom: 2px; | ||
| opacity: 0; | ||
|
|
||
| } | ||
| .art-effect { | ||
| transform-origin: center; | ||
| transition: transform 250ms ease-in-out; | ||
| -webkit-transition: transform 250ms ease-in-out; | ||
| -moz-transition: transform 250ms ease-in-out; | ||
| -o-transition: transform 250ms ease-in-out; | ||
| } | ||
| .art-effect:hover { | ||
| transform: scale(1.05); | ||
| } | ||
| .art-fade { | ||
| animation: fadeInAnimation 1s; | ||
| animation-iteration-count: 1; | ||
| animation-fill-mode: forwards; | ||
| animation-timing-function: ease-in-out; | ||
| } | ||
| @keyframes fadeInAnimation { | ||
| from { | ||
| opacity:0; | ||
| } | ||
| to { | ||
| opacity:1; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| </style> | ||
| <script> | ||
|
|
||
|
|
||
| function compareElementVerticalPosition(a, b) { | ||
| const boundRect1 = a.getBoundingClientRect() | ||
| const boundRect2 = b.getBoundingClientRect() | ||
|
|
||
| const top1 = boundRect1.top + window.pageYOffset | ||
| const top2 = boundRect2.top + window.pageYOffset | ||
|
|
||
| if (top1 < top2) { | ||
| return -1; | ||
| } | ||
| if (top1 > top2) { | ||
| return 1; | ||
| } | ||
| // a must be equal to b | ||
| return 0; | ||
| } | ||
|
|
||
|
|
||
| function getSortedElements(elements) { | ||
| return elements.sort(compareElementVerticalPosition) | ||
| } | ||
|
|
||
| window.addEventListener('load', (event) => { | ||
|
|
||
|
|
||
|
|
||
| //console.log("loaded") | ||
|
|
||
|
|
||
|
|
||
| var myList = document.querySelector('#art') | ||
| const imageContainerList = [] | ||
| /* | ||
| for (const element of myList.children) { | ||
| imageContainerList.push(element) | ||
| } | ||
| */ | ||
| for (var i = myList.children.length; i >= 0; i--) { | ||
| const element = myList.children[Math.random() * i | 0] | ||
| myList.appendChild(element) | ||
| imageContainerList.push(element) | ||
| } | ||
|
|
||
| const sortedImageContainers = getSortedElements(imageContainerList) | ||
| for (let i=0; i<sortedImageContainers.length; ++i) { | ||
| const element = sortedImageContainers[i] | ||
|
|
||
| /* | ||
| const rect = element.getBoundingClientRect() | ||
| var node = document.createElement("h6"); | ||
| const ypos = rect.top + window.pageYOffset | ||
| //const ypos = element.offsetTop | ||
| const text = '#' + i + ', ' + ypos | ||
| var textnode = document.createTextNode(text); | ||
| node.appendChild(textnode); | ||
| element.insertBefore(node, element.firstChild) | ||
| */ | ||
|
|
||
| //console.log(element.className) | ||
| const animationDelay = 'animation-delay: '+ i*100 + 'ms' | ||
| //console.log(animationDelay) | ||
| element.setAttribute('style', animationDelay) | ||
| element.classList.add('art-fade') | ||
| } | ||
| }) | ||
| </script> | ||
|
|
||
|
|
||
| <section id="art"> | ||
| {% for image in site.static_files %} | ||
| {% if image.path contains 'img/art' %} | ||
| <div class="art-container"> | ||
| <img src="{{ site.baseurl }}{{ image.path }}" class="art-effect" alt=""> | ||
| </div> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </section> | ||
|
|
||
| <!-- | ||
| <div class="row"> | ||
| {% for image in site.static_files %} | ||
| {% if image.path contains 'img/media' %} | ||
| <div class="col-lg-2 col-md-2 mb-4 wow slideInLeft" data-wow-duration="2s" data-wow-delay="5s""> | ||
| <img src="{{ site.baseurl }}{{ image.path }}" class="img-fluid mb-4" width="320px" alt=""> | ||
| </div> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </div> | ||
| --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <!-- Portfolio Grid Section --> | ||
| <section id="portfolio"> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col-lg-12 text-center"> | ||
| <h2>Competitions</h2> | ||
| <hr class="star-primary"> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| {% assign compos = site.categories['compos'] | sort: 'date' | reverse %} | ||
| {% for compo in compos %} | ||
| <div class="panel panel-warning"> | ||
| <div class="panel-heading"><h2>{{ compo.title }}</h2></div> | ||
| <div class="panel-body"> | ||
| <h4 class="text-muted"> | ||
| <span>{{ compo.date | date: "%a, %d %B %Y" }}</span> | ||
| {% if compo.compo_location %} | ||
| <span>, {{ compo.compo_location }}</span> | ||
| {% endif %} | ||
| </h4> | ||
| {% for post in site.posts %} | ||
| {% if post.tags contains compo.compo_id %} | ||
| {% include compos_item.html %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| </div> | ||
| </div> | ||
| {% endfor %} | ||
| </div> | ||
|
|
||
| </div> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,29 @@ | ||
| <!-- html code to present a compo item --> | ||
| <div class="col-sm-4 portfolio-item"> | ||
| <!-- html code to present a compo production item --> | ||
| <div class="col-lg-4 col-md-6 col-sm-12 portfolio-item"> | ||
| <div class="panel panel-default"> | ||
| <div class="panel-body"> | ||
| {% if post.rank %} | ||
| <div class="panel-heading" data-mh="group-newstext"><h5>{{ post.rank | truncate: 50 }}</h5></div> | ||
| {% endif %} | ||
|
|
||
|
|
||
| <!-- <a href="#portfolioModal-{{ post.modal-id }}" class="portfolio-link" data-toggle="modal"> | ||
| --> | ||
| <a href="{{ post.url }}" class="portfolio-link"> | ||
| <div class="caption"> | ||
| <div class="caption-content"> | ||
| <i class="fa fa-search-plus fa-3x"></i> | ||
| </div> | ||
| </div> | ||
| <img src="/content/{{ post.img }}" class="img-responsive" alt="{{ post.alt }}"> | ||
| </a> | ||
| <h4>{{ post.title | truncate: 25 }}</h4> | ||
| <h6>{{ post.excerpt | strip_html }}</h6> | ||
| <div data-mh="group-prods-images flex-grow-1 overflow-auto"> | ||
| <img src="/content/{{ post.img }}" class="img-responsive" style='width:100%;' alt="{{ post.alt }}"> | ||
|
|
||
| </div> | ||
| </a> | ||
|
|
||
| <a href="{{ post.url }}" class="btn btn-default">Read More</a> | ||
| <!-- | ||
| <a href="{{ post.emulate }}" class="btn btn-default"> | ||
| <i class="fa fa-play-circle"></i> Emulate | ||
| </a> | ||
| <a href="{{ post.download }}" class="btn btn-default"> | ||
| <i class="fa fa-download"></i> Download | ||
| </a> | ||
| --> | ||
| <div class="panel-body" data-mh="group-prods"> | ||
| <!-- data-mh attribute puts all the items into a group so that the div height can be matched --> | ||
| <div data-mh="group-prods-titles"> | ||
| <h4>{{ post.title | truncate: 30 }}</h4> | ||
| </div> | ||
| <h6>{{ post.team }}</h6> | ||
| <a href="{{ post.url }}" class="btn btn-default">Read More</a> | ||
| </div> | ||
| </div> | ||
| </div> |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
|
|
||
| .shaderView { | ||
| position: absolute; | ||
| width: 100%; | ||
| height: 500px; | ||
| /* background: #f00; */ | ||
| } | ||
| #shaderOverlay { | ||
| position: absolute; | ||
| left: 20px; | ||
| top: 20px; | ||
| } |
Oops, something went wrong.