diff options
author | luxagraf <sng@luxagraf> | 2021-01-15 14:54:30 -0500 |
---|---|---|
committer | luxagraf <sng@luxagraf> | 2021-01-15 14:54:30 -0500 |
commit | 47b79fd9d4329e73cef7929ed8f64d9eeb287ae5 (patch) | |
tree | 189381bfe0d81fdc1105679910114deaab3cdb58 /design/templates/lib | |
parent | e61f3d2c4537a2670c40b33eb02231a71dfb028a (diff) |
Proj: Massive design overhaul to simplify code
Cut out Sass syntax, deleted old CSS rules, changed HTML to use
fewer lists and more cascading instead of specific rules. Still requires
compiling with sass to strip comments and compress, but would in theory
work on its own.
Reduced CSS file size by 2/3
Diffstat (limited to 'design/templates/lib')
-rw-r--r-- | design/templates/lib/breadcrumbs.html | 24 | ||||
-rw-r--r-- | design/templates/lib/img_cluster.html | 6 | ||||
-rw-r--r-- | design/templates/lib/img_picwide.html | 4 |
3 files changed, 15 insertions, 19 deletions
diff --git a/design/templates/lib/breadcrumbs.html b/design/templates/lib/breadcrumbs.html index ac47d5a..025b8e4 100644 --- a/design/templates/lib/breadcrumbs.html +++ b/design/templates/lib/breadcrumbs.html @@ -1,14 +1,14 @@ -<ol class="bl" id="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList"> - <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a itemprop="item" href="/"><span itemprop="name">Home</span></a> → +<nav class="breadcrumbs" itemscope itemtype="http://schema.org/BreadcrumbList"> + <span class="nav-item" itemprop="item"> + <a href="/" itemprop="name">Home</a> <meta itemprop="position" content="1" /> - </li> - {% for crumb in breadcrumbs %}<li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"> - {% if crumb_url %} - <a href="{{crumb_url}}" itemprop="item"><span itemprop="name">{{crumb}}</span></a> - <meta itemprop="position" content="{{ forloop.counter|add:"+1" }}" />{% else %} - <span itemprop="item"> - <span itemprop="name">{{crumb}}</span> - </span>{% endif %} + </span>{% for crumb in breadcrumbs %}{% if crumb_url %} + <span class="nav-item" itemprop="item"> + <a href="{{crumb_url}}" itemprop="name">{{crumb}}</a> + <meta itemprop="position" content="{{ forloop.counter|add:"+1" }}" /> + </span>{% else %} + <span class="nav-item" itemprop="item"> + <span itemprop="name">{{crumb}}</span> <meta itemprop="position" content="2" /> - </li>{%endfor%} - </ol> + </span>{% endif %}{%endfor%} + </nav> diff --git a/design/templates/lib/img_cluster.html b/design/templates/lib/img_cluster.html index 48b9b99..9e7d8a3 100644 --- a/design/templates/lib/img_cluster.html +++ b/design/templates/lib/img_cluster.html @@ -1,8 +1,6 @@ -{% load get_image_by_size %} -{% if caption or exif %} -<figure {%if cluster_class != "picwide"%}class="{{cluster_class}}"{%endif%}>{%endif%} +{% load get_image_by_size %}{% if caption or exif %}<figure {%if cluster_class != "picwide"%}class="{{cluster_class}}"{%endif%}>{%endif%} <a href="{%get_image_by_size image "original"%}" title="view larger image {% if image.photo_credit_source%}(photo by {{image.photo_credit_source}}){%endif%}"> - <img class="{% if caption or exif %}{%else%}{%if cluster_class != "picwide"%}{{cluster_class}}{%endif%}{%endif%} {%if extra%}{{extra}}{%endif%}" {%if cluster_class == "picwide"%} sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.slug %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.slug%}"{%endif%}{%endfor%}{%else%} src="{% get_image_by_size image cluster_class %}"{%endif%} alt="{%if image.alt %}{{image.alt}}{%else%}{{image.title}}{%endif%} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" data-jslghtbx="{%get_image_by_size image "original"%}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}></a> + <img class="{% if caption or exif %}{%else%}{%if cluster_class != "picwide"%}{{cluster_class}}{%endif%}{%endif%} {%if extra%}{{extra}}{%endif%}" {%if cluster_class == "picwide"%} sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.slug %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.slug%}"{%endif%}{%endfor%}{%else%} src="{% get_image_by_size image cluster_class %}"{%endif%} alt="{%if image.alt %}{{image.alt}}{%else%}{{image.title}}{%endif%} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}"></a> {% if caption or exif %}<figcaption>{% endif %}{% if caption %}{{image.caption|safe}}{% endif %}{% if exif %} | <small>Camera: {{image.exif_make}} {{image.exif_model}} with {{image.exif_lens}}</small>{% endif %}{% if caption or exif %}</figcaption> </figure> {% endif %} diff --git a/design/templates/lib/img_picwide.html b/design/templates/lib/img_picwide.html index 2c9b17b..9f98020 100644 --- a/design/templates/lib/img_picwide.html +++ b/design/templates/lib/img_picwide.html @@ -1,6 +1,4 @@ -{% load get_image_by_size %} -{% if caption or exif or image.photo_credit_source %} -<figure{%if not is_cluster %} class="picwide"{%endif%}>{%else%}{%if not is_cluster %}<div class="picwide">{%endif%}{%endif%} +{% load get_image_by_size %}{% if caption or exif or image.photo_credit_source %}<figure{%if not is_cluster %} class="picwide"{%endif%}>{%else%}{%if not is_cluster %}<div class="picwide">{%endif%}{%endif%} <a itemscope itemtype="http://schema.org/ImageObject" href="{%get_image_by_size image "original"%} " title="view larger image"> <img class="u-photo" itemprop="contentUrl" sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.slug %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.slug %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" data-jslghtbx="{%get_image_by_size image "original"%}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}> </a> |