Merge upstream and update Gemfile.lock
This commit is contained in:
@@ -8,10 +8,10 @@
|
||||
{% assign imgnum = forloop.index %}
|
||||
{% for imginfo in bigimg %}
|
||||
{% if imginfo[0] %}
|
||||
data-img-src-{{ imgnum }}="{{ imginfo[0] | prepend: site.baseurl | replace: '//', '/' }}"
|
||||
data-img-src-{{ imgnum }}="{{ imginfo[0] | relative_url }}"
|
||||
data-img-desc-{{ imgnum }}="{{ imginfo[1] }}"
|
||||
{% else %}
|
||||
data-img-src-{{ imgnum }}="{{ imginfo | prepend: site.baseurl | replace: '//', '/' }}"
|
||||
data-img-src-{{ imgnum }}="{{ imginfo | relative_url }}"
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
@@ -34,9 +34,9 @@
|
||||
<h2 class="{{ include.type }}-subheading">{{ page.subtitle }}</h2>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if include.type == "post" %}
|
||||
<span class="post-meta">Posted on {{ page.date | date: "%B %-d, %Y" }}</span>
|
||||
<span class="post-meta">Posted on {{ page.date | date: site.date_format }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -59,9 +59,9 @@
|
||||
<h2 class="{{ include.type }}-subheading">{{ page.subtitle }}</h2>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if include.type == "post" %}
|
||||
<span class="post-meta">Posted on {{ page.date | date: "%B %-d, %Y" }}</span>
|
||||
<span class="post-meta">Posted on {{ page.date | date: site.date_format }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
@@ -73,4 +73,4 @@
|
||||
|
||||
{% else %}
|
||||
<div class="intro-header"></div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user