Compare commits

..

No commits in common. "413220311d9414cc44d6d1b216dd6dcdc45f2d27" and "a8e7b1d0f19d18d7c6561ad7014ba55d1fec86cc" have entirely different histories.

10 changed files with 12 additions and 2301 deletions

2
.gitignore vendored
View File

@ -1,2 +0,0 @@
_site
Gemfile.lock

View File

@ -7,7 +7,7 @@ gem "rmagick"
gem "exifr" gem "exifr"
group :jekyll_plugins do group :jekyll_plugins do
# gem "jekyll-feed", "~> 0.6" gem "jekyll-feed", "~> 0.6"
gem "jekyll-exif-data" gem "jekyll-exif-data"
end end

View File

@ -21,7 +21,7 @@ gallery:
symlink: false # false: copy images into _site. true: create symbolic links (saves disk space) symlink: false # false: copy images into _site. true: create symbolic links (saves disk space)
thumbnail_size: thumbnail_size:
y: 450 y: 450
retina: 1.2 retina: 1.5
# The following options are for individual galleries. # The following options are for individual galleries.
galleries: galleries:

View File

@ -1,5 +1,4 @@
<!-- <script src="//danielandrade.net/gallery.js"></script>
<script src="/assets/gallery.js"></script>
-->
</body> </body>
</html> </html>

View File

@ -13,7 +13,7 @@
<link href='//fonts.googleapis.com/css?family=Roboto:400,900' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Roboto:400,900' rel='stylesheet' type='text/css'>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery.lazy/1.7.4/jquery.lazy.min.js"></script> <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery.lazy/1.7.4/jquery.lazy.min.js"></script>
<link rel="stylesheet" href="/assets/gallery.css"> <link rel="stylesheet" href="//danielandrade.net/gallery.css">
</head> </head>
<body> <body>
@ -27,4 +27,4 @@
}); });
</script> </script>
{% include svg_shadow.html %} {% include svg_shadow.html %}

View File

@ -29,20 +29,18 @@
<div id="gallery"> <div id="gallery">
{% for image in sorted_imgs %} {% for image in sorted_imgs %}
<div class="picture-frame">
<a class="item lazy" href="{{ image[0] }}"> <a class="item lazy" href="{{ image[0] }}">
<img <img
src="thumbs/{{ image[0] }}" src="thumbs/{{ image[0] }}"
data-src="thumbs/{{ image[0] }}" data-src="thumbs/{{ image[0] }}"
height="300" /> width="{{ image[1] | divided_by: site.gallery.thumbnail_size.retina }}"
height="{{ site.gallery.thumbnail_size.y | divided_by: site.gallery.thumbnail_size.retina }}" />
</a> </a>
{% assign image_path = '/usr/local/jekyll/sites/photos.kameronkenny.com/photos/' | append: page.gallery | append: '/' | append: image[0] %} {% assign image_path = '/usr/local/jekyll/sites/photos.kameronkenny.com/photos/' | append: page.gallery | append: '/' | append: image[0] %}
{% capture has_exif %}{{ image_path | exif: "exif?" }}{% endcapture %} {% capture has_exif %}{{ image_path | exif: "exif?" }}{% endcapture %}
{% if has_exif %} {% if has_exif %}
<p>{{ image_path | exif: 'model' }} {{ image_path | exif: 'shutter_speed_value'}}</p> Camera: {{ image_path | exif: 'model' }}
<p>{{ image_path | exif: 'lens_model' }} f{{ image_path | exif: 'aperture_value' }}</p>
{% endif %} {% endif %}
</div>
{% endfor %} {% endfor %}
</div> </div>

View File

@ -153,7 +153,7 @@ module Jekyll
begin begin
Dir.foreach(dir) do |gallery_dir| Dir.foreach(dir) do |gallery_dir|
gallery_path = File.join(dir, gallery_dir) gallery_path = File.join(dir, gallery_dir)
if File.directory?(gallery_path) and gallery_dir.chars.first != "." and gallery_dir != "assets" if File.directory?(gallery_path) and gallery_dir.chars.first != "."
gallery = GalleryPage.new(site, site.source, gallery_path, gallery_dir) gallery = GalleryPage.new(site, site.source, gallery_path, gallery_dir)
gallery.render(site.layouts, site.site_payload) gallery.render(site.layouts, site.site_payload)
gallery.write(site.dest) gallery.write(site.dest)
@ -172,4 +172,4 @@ module Jekyll
site.pages << gallery_index site.pages << gallery_index
end end
end end
end end

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long