Merge pull request #2737 from Aloso/fix-missing-asset-url

nellshamrell · web-flow · commit 9d5e1b1b9f2a · 2021-12-26T15:46:54.000-08:00
Update deps in order to fix #2732
diff --git a/pelicanconf.py b/pelicanconf.py
@@ -25,8 +25,8 @@
 FEED_ALL_ATOM = 'atom.xml'
 FEED_ALL_RSS = 'rss.xml'
 FEED_MAX_ITEMS = 4
-CATEGORY_FEED_ATOM = 'categories/%s/atom.xml'
-CATEGORY_FEED_RSS = 'categories/%s/rss.xml'
+CATEGORY_FEED_ATOM = 'categories/{slug}/atom.xml'
+CATEGORY_FEED_RSS = 'categories/{slug}/rss.xml'
 
 DEFAULT_PAGINATION = 10
 
@@ -46,4 +46,4 @@
 """
 }
 
-MD_EXTENSIONS = ['headerid']
+PLUGINS = ['webassets']
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
-Markdown==2.4
-pelican==3.5
-feedgenerator==1.7
-webassets==0.11.1
+Markdown==3.3.6
+pelican==4.7.1
+feedgenerator==2.0
+pelican-webassets==2.0.0
 cssmin==0.2.0
 jinja2==2.11.3
+libsass==0.21.0
diff --git a/themes/rusted/templates/base.html b/themes/rusted/templates/base.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     {% if article and article.author %}
     <meta name="author" content="{{ article.author }}" />
@@ -31,13 +31,13 @@
     <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME|striptags }} - Full RSS Feed" />
     <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} - Full Atom Feed" />
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
-    {% assets filters="scss,cssmin", output="css/web-min.css", "css/main.scss" %}
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
+    {% assets filters="libsass,cssmin", output="css/web-min.css", "css/main.scss" %}
 
-    <link rel="stylesheet" href="/{{ ASSET_URL }}">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://www.rust-lang.org/static/images/favicon-32x32.png">
-    <link rel="icon" type="image/svg+xml" href="https://www.rust-lang.org/static/images/favicon.svg">
-    <link rel="mask-icon" href="https://www.rust-lang.org/static/images/safari-pinned-tab.svg" color="#000">
+    <link rel="stylesheet" href="/{{ ASSET_URL }}" />
+    <link rel="icon" type="image/png" sizes="32x32" href="https://www.rust-lang.org/static/images/favicon-32x32.png" />
+    <link rel="icon" type="image/svg+xml" href="https://www.rust-lang.org/static/images/favicon.svg" />
+    <link rel="mask-icon" href="https://www.rust-lang.org/static/images/safari-pinned-tab.svg" color="#000" />
 
     {% endassets %}
   </head>
