V2 #1

Merged
danieljsummers merged 102 commits from v2 into main 2022-06-23 00:35:12 +00:00
7 changed files with 21 additions and 33 deletions
Showing only changes of commit b15fb78d5b - Show all commits

View File

@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.7" /> <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.7" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RethinkDb.Driver" Version="2.3.150" /> <PackageReference Include="RethinkDb.Driver" Version="2.3.150" />
<PackageReference Include="RethinkDb.Driver.FSharp" Version="0.9.0-beta-01" /> <PackageReference Include="RethinkDb.Driver.FSharp" Version="0.9.0-beta-03" />
<PackageReference Update="FSharp.Core" Version="6.0.4" /> <PackageReference Update="FSharp.Core" Version="6.0.4" />
</ItemGroup> </ItemGroup>

View File

@ -22,7 +22,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DotLiquid" Version="2.2.656" /> <PackageReference Include="DotLiquid" Version="2.2.656" />
<PackageReference Include="Giraffe" Version="6.0.0" /> <PackageReference Include="Giraffe" Version="6.0.0" />
<PackageReference Include="RethinkDB.DistributedCache" Version="0.9.0-alpha05" /> <PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" />
<PackageReference Update="FSharp.Core" Version="6.0.4" /> <PackageReference Update="FSharp.Core" Version="6.0.4" />
<PackageReference Include="System.ServiceModel.Syndication" Version="6.0.0" /> <PackageReference Include="System.ServiceModel.Syndication" Version="6.0.0" />
</ItemGroup> </ItemGroup>

View File

@ -3,7 +3,7 @@
"hostname": "data02.bitbadger.solutions", "hostname": "data02.bitbadger.solutions",
"database": "myWebLog_dev" "database": "myWebLog_dev"
}, },
"Generator": "myWebLog 2.0-alpha12", "Generator": "myWebLog 2.0-alpha13",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"MyWebLog.Handlers": "Debug" "MyWebLog.Handlers": "Debug"

View File

@ -19,24 +19,22 @@
<div class="entry-content">{{ post.text }}</div> <div class="entry-content">{{ post.text }}</div>
{%- assign cat_count = post.category_ids | size -%} {%- assign cat_count = post.category_ids | size -%}
{%- if cat_count > 0 %} {%- if cat_count > 0 %}
<small class="category-list"> <small>
Categorized under Categorized under
{%- for cat_id in post.category_ids %} {% for cat_id in post.category_ids -%}
{%- assign cat = categories | where: "id", cat_id | first -%} {%- assign cat = categories | where: "id", cat_id | first -%}
<span> <a href="{{ cat | category_link }}" title="Categorized under {{ cat.name | strip_html | escape }}"
<a href="{{ cat | category_link }}" rel="tag">{{ cat.name }}</a>{% unless forloop.last %}, {% endunless %}
title="Categorized under {{ cat.name | strip_html | escape }}" rel="tag">{{ cat.name }}</a></span>
{%- endfor %} {%- endfor %}
</small><br> </small><br>
{%- endif %} {%- endif %}
{%- assign tag_count = post.tags | size -%} {%- assign tag_count = post.tags | size -%}
{%- if tag_count > 0 %} {%- if tag_count > 0 %}
<small class="category-list"> <small>
Tagged Tagged
{%- for tag in post.tags %} {% for tag in post.tags -%}
<span> <a href="{{ tag | tag_link }}" title="Tagged &ldquo;{{ tag | escape }}&rdquo;"
<a href="{{ tag | tag_link }}" title="Tagged &ldquo;{{ tag | escape }}&rdquo;" rel="tag">{{ tag }}</a> rel="tag">{{ tag }}</a>{% unless forloop.last %}, {% endunless %}
</span>
{%- endfor %} {%- endfor %}
</small><br> </small><br>
{%- endif %} {%- endif %}

View File

@ -18,6 +18,7 @@
href="{{ "feed.xml" | absolute_link }}"> href="{{ "feed.xml" | absolute_link }}">
<link rel="canonical" href="{{ "" | absolute_link }}"> <link rel="canonical" href="{{ "" | absolute_link }}">
{%- endif %} {%- endif %}
<link rel="icon" href="/themes/bit-badger/favicon.ico">
</head> </head>
<body> <body>
<header class="site-header"> <header class="site-header">

View File

@ -8,16 +8,12 @@
{%- assign cat_count = post.category_ids | size -%} {%- assign cat_count = post.category_ids | size -%}
{%- if cat_count > 0 %} {%- if cat_count > 0 %}
<br> <br>
<small class="category-list"> <small>
Categorized under Categorized under
{%- for cat_id in post.category_ids %} {% for cat_id in post.category_ids -%}
{%- assign cat = categories | where: "id", cat_id | first -%} {%- assign cat = categories | where: "id", cat_id | first -%}
<span> <a href="{{ cat | category_link }}" title="Categorized under {{ cat.name | strip_html | escape }}"
<a href="{{ cat | category_link }}" title="Categorized under {{ cat.name | strip_html | escape }}" rel="tag">{{ cat.name }}</a>{% unless forloop.last %}, {% endunless %}
rel="tag">
{{ cat.name }}
</a>
</span>
{%- endfor %} {%- endfor %}
</small> </small>
{%- endif %} {%- endif %}
@ -27,12 +23,11 @@
<div class="entry-footer"> <div class="entry-footer">
{%- assign tag_count = post.tags | size -%} {%- assign tag_count = post.tags | size -%}
{%- if tag_count > 0 %} {%- if tag_count > 0 %}
<span class="category-list"> <span>
Tagged Tagged
{%- for tag in post.tags %} {% for tag in post.tags -%}
<span> <a href="{{ tag | tag_link }}" title="Tagged &ldquo;{{ tag | escape }}&rdquo;"
<a href="{{ tag | tag_link }}" title="Tagged &ldquo;{{ tag | escape }}&rdquo;" rel="tag">{{ tag }}</a> rel="tag">{{ tag }}</a>{% unless forloop.last %}, {% endunless %}
</span>
{%- endfor %} {%- endfor %}
</span> &bull; </span> &bull;
{%- endif %} {%- endif %}

View File

@ -58,7 +58,7 @@ p {
} }
code, pre { code, pre {
font-family: "JetBrains Mono","SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace; font-family: "JetBrains Mono","SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
font-size: 1rem; font-size: 80%;
} }
code { code {
background-color: rgba(0, 0, 0, .1); background-color: rgba(0, 0, 0, .1);
@ -153,12 +153,6 @@ article.page .metadata {
.strike { .strike {
text-decoration: line-through; text-decoration: line-through;
} }
.category-list span:after {
content: ", ";
}
.category-list span:last-of-type:after {
content: "";
}
footer { footer {
padding: 20px 15px 10px 15px; padding: 20px 15px 10px 15px;
display: flex; display: flex;