Set defaults for fields and components so bad empty states don't occur

daviddarnes · daviddarnes · commit 23201780aecc · 2017-08-28T14:54:23.000+01:00
diff --git a/_includes/button.html b/_includes/button.html
@@ -1 +1 @@
-<a class="button" href="{{ include.link }}"{% if include.color %} style="background: {{ include.color }}"{% endif %}>{{ include.text }}{% if include.icon %}&nbsp; {% include icon.html id=include.icon %}{% endif %}</a>
+<a class="button" href="{{ include.link | default: "#" }}"{% if include.color %} style="background: {{ include.color }}"{% endif %}>{{ include.text | default: "Button" }}{% if include.icon %}&nbsp; {% include icon.html id=include.icon %}{% endif %}</a>
diff --git a/_includes/figure.html b/_includes/figure.html
@@ -1,5 +1,5 @@
 {% if include.alt %}{% assign altText = include.alt %}{% else %}{% assign altText = include.caption %}{% endif %}
 <figure class="figure{% if include.position %}  figure--{{ include.position }}{% endif %}">
-  <img class="image" src="{{ include.image }}" {% if altText %}alt="Image - {{ altText }}"{% endif %}>
+  {% if include.image %}<img class="image" src="{{ include.image }}" {% if altText %}alt="Image - {{ altText }}"{% endif %}>{% else %}<small>Image not found</small>{% endif%}
   {% if include.caption %}<figcaption class="caption">{{ include.caption }}</figcaption>{% endif %}
 </figure>
diff --git a/_includes/icon.html b/_includes/icon.html
@@ -1 +1 @@
-<svg class="icon  icon--{{ include.id }}" role="img"{% if include.title %} aria-label="{{ include.title }} icon"{% endif %}>{% if include.title %}<title>{{ include.title }}</title>{% endif %}<use xlink:href="#{{ include.id }}"{% if include.color %} fill="{{ include.color }}"{% endif %}></use></svg>
+<svg class="icon  icon--{{ include.id | default: "link" }}" role="img"{% if include.title %} aria-label="{{ include.title }} icon"{% endif %}>{% if include.title %}<title>{{ include.title }}</title>{% endif %}<use xlink:href="#{{ include.id | default: "link" }}"{% if include.color %} fill="{{ include.color }}"{% endif %}></use></svg>
diff --git a/_includes/map.html b/_includes/map.html
@@ -1,3 +1,3 @@
 <div class="map">
-  <iframe src="https://www.google.com/maps/d/u/0/embed?mid={{ include.id }}"></iframe>
+  {% if include.id %}<iframe src="https://www.google.com/maps/d/u/0/embed?mid={{ include.id }}"></iframe>{% else %}<small>Map not found</small>{% endif %}
 </div>
diff --git a/_includes/nav-default.html b/_includes/nav-default.html
@@ -1,7 +1,7 @@
 <nav class="nav">
   <ul class="list list--nav">
-    {% for item in site.pages %}
-      {% unless item.title == false or item.url contains "/page" or item.url contains "/404.html" or item.url contains "/feed." or item.url contains ".json" %}
+    {% for item in site.html_pages %}
+      {% unless item.title == false or item.url contains "/page" or item.url contains "/404.html" %}
         <li class="item  item--nav{% if item.url == page.url %}  item--current{% endif %}">
 
           {% if item.url contains '://' %}
diff --git a/_includes/site-header.html b/_includes/site-header.html
@@ -1,6 +1,6 @@
 <header class="header">
   <div class="container">
-    {% include site-logo.html %}
+    {% if site.logo %}{% include site-logo.html %}{% endif %}
 
     {% include nav-header.html %}
   </div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -22,7 +22,7 @@
 
     <link rel="stylesheet" href="{{ "/assets/styles.css" | relative_url }}">
 
-		{% include site-favicons.html %}
+		{% if site.avatarurl %}{% include site-favicons.html %}{% endif %}
 	</head>
 	<body class="layout-{{ page.layout }}{% if page.title %}  {{ page.title | slugify }}{% endif %}">
 		{% include site-icons.svg %}
diff --git a/assets/styles.scss b/assets/styles.scss
@@ -432,4 +432,10 @@ pre code {
       margin: 0;
     }
   }
+  .nav a {
+    padding-left: 0;
+    padding-right: 0;
+    margin-left: .2rem;
+    margin-right: .2rem;
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<a class="button" href="{{ include.link }}"{% if include.color %} style="background: {{ include.color }}"{% endif %}>{{ include.text }}{% if include.icon %}  {% include icon.html id=include.icon %}{% endif %}</a>`
	`1`	`+<a class="button" href="{{ include.link \| default: "#" }}"{% if include.color %} style="background: {{ include.color }}"{% endif %}>{{ include.text \| default: "Button" }}{% if include.icon %}  {% include icon.html id=include.icon %}{% endif %}</a>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<svg class="icon icon--{{ include.id }}" role="img"{% if include.title %} aria-label="{{ include.title }} icon"{% endif %}>{% if include.title %}<title>{{ include.title }}</title>{% endif %}<use xlink:href="#{{ include.id }}"{% if include.color %} fill="{{ include.color }}"{% endif %}></use></svg>`
	`1`	`+<svg class="icon icon--{{ include.id \| default: "link" }}" role="img"{% if include.title %} aria-label="{{ include.title }} icon"{% endif %}>{% if include.title %}<title>{{ include.title }}</title>{% endif %}<use xlink:href="#{{ include.id \| default: "link" }}"{% if include.color %} fill="{{ include.color }}"{% endif %}></use></svg>`
Original file line number	Diff line number	Diff line change
`@@ -432,4 +432,10 @@ pre code {`
`432`	`432`	`margin: 0;`
`433`	`433`	`}`
`434`	`434`	`}`
	`435`	`+ .nav a {`
	`436`	`+ padding-left: 0;`
	`437`	`+ padding-right: 0;`
	`438`	`+ margin-left: .2rem;`
	`439`	`+ margin-right: .2rem;`
	`440`	`+ }`
`435`	`441`	`}`