Skip to content

Commit feda39f

Browse files
johnlinahanjohnlinahan
committed
MOTHER FUCK
1 parent 7a082bf commit feda39f

20 files changed

Lines changed: 5981 additions & 62 deletions

‎_includes/head.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,22 @@
44
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
55

66
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} | Pitt RAS</title>
7+
78
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
89

10+
911
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/css/bootstrap.min.css" integrity="sha384-MIwDKRSSImVFAZCVLtU0LMDdON6KVCrZHyVQQj6e8wIEJkW4tvwqXrbMIya1vriY" crossorigin="anonymous">
12+
1013
<link href='https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css' rel='stylesheet' type='text/css'>
14+
1115
<link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
12-
<link href='https://cdnjs.cloudflare.com/ajax/libs/justifiedGallery/3.6.3/css/justifiedGallery.min.css' rel='stylesheet' type='text/css'>
1316

17+
<link rel="stylesheet" href="/justiswipe_flickr_gallery-master/css/jquery.justified.images.css">
18+
<link rel="stylesheet" href="/justiswipe_flickr_gallery-master/css/photoswipe.css">
19+
<link rel="stylesheet" href="/justiswipe_flickr_gallery-master/css/photoswipe.skin.css">
1420

15-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
21+
22+
23+
<link rel="stylesheet" href="/css/main.css">
1624
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1725
</head>

‎_layouts/default.html‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
<!DOCTYPE html>
22
<html>
33

4-
{% include head.html %}
4+
{% include head.html %}
55

6-
<body>
6+
<body>
77

8-
{% include header.html %}
8+
{% include header.html %}
99

10-
{{ content }}
10+
{{ content }}
1111

12-
{% include footer.html %}
12+
{% include footer.html %}
1313

14-
</body>
15-
16-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js" integrity="sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY" crossorigin="anonymous"></script>
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
18-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/js/bootstrap.min.js" integrity="sha384-ux8v3A6CPtOTqOzMKiuo3d/DomGaaClxFYdCu2HPMBEkf6x2xiDyJ7gkXU0MWwaD" crossorigin="anonymous"></script>
19-
<script src="/js/main.js"></script>
14+
</body>
2015

16+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js" integrity="sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY" crossorigin="anonymous"></script>
17+
18+
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
19+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.3/js/bootstrap.min.js" integrity="sha384-ux8v3A6CPtOTqOzMKiuo3d/DomGaaClxFYdCu2HPMBEkf6x2xiDyJ7gkXU0MWwaD" crossorigin="anonymous"></script>
20+
21+
<script src="/justiswipe_flickr_gallery-master/js/jquery.justified.images.js"></script>
22+
<script src="/justiswipe_flickr_gallery-master/js/photoswipe.js" type="text/javascript"></script>
23+
<script src="/justiswipe_flickr_gallery-master/js/photoswipe.ui.js" type="text/javascript"></script>
24+
<script src="/justiswipe_flickr_gallery-master/js/flickr.fetch.js" type="text/javascript"></script>
25+
<script src="/justiswipe_flickr_gallery-master/js/photoswipe.after.html.js" type="text/javascript"></script>
26+
<script src="/js/main.js"></script>
2127
</html>

‎_pages/gallery.html‎

Lines changed: 70 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,75 @@
66
---
77

88
<section class="gallery__full-gallery">
9-
<div id="fullGallery" >
10-
<a>
11-
<img alt="Title 1" src="http://miromannino.github.io/Justified-Gallery/photos/24096687789_c37d45712f_m.jpg"/>
12-
</a>
13-
<a>
14-
<img alt="Title 2" src="http://miromannino.github.io/Justified-Gallery/photos/23753792354_bd75d8dabc_m.jpg"/>
15-
</a>
16-
<a>
17-
<img alt="Title 2" src="http://miromannino.github.io/Justified-Gallery/photos/16961685188_f130144d60.jpg"/>
18-
</a>
19-
<a>
20-
<img alt="Title 2" src="http://miromannino.github.io/Justified-Gallery/photos/24014174029_2cfa940264_m.jpg"/>
21-
</a>
22-
<a>
23-
<img alt="Title 1" src="http://miromannino.github.io/Justified-Gallery/photos/13824322785_104dc0968c_m.jpg"/>
24-
</a>
25-
<a>
26-
<img alt="Title 2" src="http://miromannino.github.io/Justified-Gallery/photos/8842312290_f310d491f4_m.jpg"/>
27-
</a>
28-
<a>
29-
<img alt="Title 2" src="http://miromannino.github.io/Justified-Gallery/photos/8811828736_88392f614a_m.jpg"/>
30-
</a>
31-
<a>
32-
<img alt="Title 2" src="http://miromannino.github.io/Justified-Gallery/photos/6916180091_9c9559e463_m.jpg"/>
33-
</a>
34-
<!-- other images... -->
9+
<!-- photoswipe elements -->
10+
11+
<!-- Root element of PhotoSwipe. Must have class pswp. -->
12+
<div class="pswp" tabindex="-1" role="dialog" aria-hidden="true">
13+
14+
<!-- Background of PhotoSwipe.
15+
It's a separate element as animating opacity is faster than rgba(). -->
16+
<div class="pswp__bg"></div>
17+
18+
<!-- Slides wrapper with overflow:hidden. -->
19+
<div class="pswp__scroll-wrap">
20+
21+
<!-- Container that holds slides.
22+
PhotoSwipe keeps only 3 of them in the DOM to save memory.
23+
Don't modify these 3 pswp__item elements, data is added later on. -->
24+
<div class="pswp__container">
25+
<div class="pswp__item"></div>
26+
<div class="pswp__item"></div>
27+
<div class="pswp__item"></div>
28+
</div>
29+
30+
<!-- Default (PhotoSwipeUI_Default) interface on top of sliding area. Can be changed. -->
31+
<div class="pswp__ui pswp__ui--hidden">
32+
33+
<div class="pswp__top-bar">
34+
35+
<!-- Controls are self-explanatory. Order can be changed. -->
36+
37+
<div class="pswp__counter"></div>
38+
39+
<button class="pswp__button pswp__button--close" title="Close (Esc)"></button>
40+
41+
<button class="pswp__button pswp__button--share" title="Share"></button>
42+
43+
<button class="pswp__button pswp__button--fs" title="Toggle fullscreen"></button>
44+
45+
<button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
46+
47+
<!-- Preloader demo http://codepen.io/dimsemenov/pen/yyBWoR -->
48+
<!-- element will get class pswp__preloader--active when preloader is running -->
49+
<div class="pswp__preloader">
50+
<div class="pswp__preloader__icn">
51+
<div class="pswp__preloader__cut">
52+
<div class="pswp__preloader__donut"></div>
53+
</div>
54+
</div>
55+
</div>
56+
</div>
57+
58+
<div class="pswp__share-modal pswp__share-modal--hidden pswp__single-tap">
59+
<div class="pswp__share-tooltip"></div>
60+
</div>
61+
62+
<button class="pswp__button pswp__button--arrow--left" title="Previous (arrow left)">
63+
</button>
64+
65+
<button class="pswp__button pswp__button--arrow--right" title="Next (arrow right)">
66+
</button>
67+
68+
<div class="pswp__caption">
69+
<div class="pswp__caption__center"></div>
70+
</div>
71+
72+
</div>
73+
74+
</div>
75+
3576
</div>
77+
<!-- end of photoswipe elements -->
78+
79+
<div class="image-container" id="images1" itemscope="" itemtype="http://schema.org/ImageGallery" data-pswp-uid="1"></div>
3680
</section>

‎_sass/vendor/justifiedGallery.min.scss‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎css/main.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
@import
66
"base",
77

8-
"vendor/justifiedGallery.min",
9-
108
"partials/header",
119
"partials/articleheader",
1210
"partials/sectiontitle",

‎js/main.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
$( document ).ready(function() {
22

3-
$.getScript("/js/vendor/jquery.justifiedGallery.min.js");
4-
$.getScript("/js/partials/header.js");
3+
$.getScript("/js/partials/header.js");
54

65
$.getScript("/js/pages/gallery.js");
76

‎js/pages/gallery.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
$("#fullGallery").justifiedGallery({
2-
rowHeight: 120,
3-
lastRow: 'justify',
4-
margins: 1
5-
});
1+
2+
prepareFlickrAlbum("72157657489437146", "images1", 20);
3+
// prepareFlickrAlbum("72157641414241043", "images2", 20);

‎js/vendor/jquery.justifiedGallery.min.js‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎justiswipe_flickr_gallery-master/.gitignore‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Windows image file caches
2+
Thumbs.db
3+
ehthumbs.db
4+
5+
# Folder config file
6+
Desktop.ini
7+
8+
# Recycle Bin used on file shares
9+
$RECYCLE.BIN/
10+
11+
# Windows Installer files
12+
*.cab
13+
*.msi
14+
*.msm
15+
*.msp
16+
17+
# =========================
18+
# Operating System Files
19+
# =========================
20+
21+
# OSX
22+
# =========================
23+
24+
.DS_Store
25+
.AppleDouble
26+
.LSOverride
27+
28+
# Icon must end with two \r
29+
Icon
30+
31+
32+
# Thumbnails
33+
._*
34+
35+
# Files that might appear on external disk
36+
.Spotlight-V100
37+
.Trashes
38+
39+
# Directories potentially created on remote AFP share
40+
.AppleDB
41+
.AppleDesktop
42+
Network Trash Folder
43+
Temporary Items
44+
.apdisk

‎justiswipe_flickr_gallery-master/css/default-skin.png‎

547 Bytes
Loading

0 commit comments

Comments
 (0)