Compare commits

..

1 Commits

Author SHA1 Message Date
kkenny 413220311d Merge pull request 'develop' (#1) from develop into main
Reviewed-on: #1
2024-07-02 23:56:03 -04:00
5 changed files with 31 additions and 4647 deletions

View File

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

View File

@ -12,18 +12,17 @@
maximum-scale=1"> maximum-scale=1">
<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="//code.jquery.com/jquery-3.7.1.min.js"></script> <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="//cdn.jsdelivr.net/jquery.lazy/1.7.9/jquery.lazy.min.js"></script>
<link rel="stylesheet" href="/assets/gallery.css"> <link rel="stylesheet" href="/assets/gallery.css">
</head> </head>
<body> <body>
<script type="text/javascript"> <script type="text/javascript">
(function() { $(function() {
$('.lazy').lazy({ $('.lazy').lazy({
effect: "fadeIn", effect: "fadeIn",
effectTime: 1000, effectTime: 2000,
threshold: 500 threshold: 0
}); });
}); });
</script> </script>

View File

@ -30,17 +30,17 @@
<div id="gallery"> <div id="gallery">
{% for image in sorted_imgs %} {% for image in sorted_imgs %}
<div class="picture-frame"> <div class="picture-frame">
<a class="item" 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" />
</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 %}
<div class="meta"><div class="pull-left">{{ image_path | exif: 'model' }}</div> <div class="pull-right">{{ image_path | exif: 'shutter_speed_value'}}</div></div> <p>{{ image_path | exif: 'model' }} {{ image_path | exif: 'shutter_speed_value'}}</p>
<div class="meta"><div class="pull-left">{{ image_path | exif: 'lens_model' }}</div> <div class="pull-right">f/{{ image_path | exif: 'aperture_value' }}</div></div> <p>{{ image_path | exif: 'lens_model' }} f{{ image_path | exif: 'aperture_value' }}</p>
{% endif %} {% endif %}
</div> </div>
{% endfor %} {% endfor %}

View File

@ -2251,33 +2251,25 @@ a {
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
position: relative; } position: relative; }
#gallery .item { #gallery .item {
float: left; float: left; }
margin-bottom: 5px; #gallery .item.last-row, #gallery .item.last-row ~ a {
}
#gallery .item a {
}
#gallery .item.last-row, #gallery .item.last-row ~ a {
margin-bottom: 0; } margin-bottom: 0; }
#gallery .item img { #gallery .item img {
width: 100%;
height: 100%;
background: rgba(255, 255, 255, 0.02); background: rgba(255, 255, 255, 0.02);
opacity: 0.9; } opacity: 0.9; }
#gallery .item:hover img { #gallery .item:hover img {
opacity: 1; } opacity: 1; }
.picture-frame { .picture-frame {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
float: left; float: left;
padding: 5px; padding: 0px;
padding-bottom: 50px;
background: rgba(0,0,0, 0.5); background: rgba(0,0,0, 0.5);
color: white; color: white;
font-size: 12px; font-size: 12px;
} }
.meta {
overflow: hidden;
position: relative;
padding: 5px;
background: rgba(0,0,0, 0.5);
}

File diff suppressed because one or more lines are too long