diff --git a/_config.yml b/_config.yml index d37a466..6d4b217 100644 --- a/_config.yml +++ b/_config.yml @@ -24,7 +24,6 @@ source: "." # Plugins plugins: - - jekyll-feed # I have manually generated rss.xml https://jekyllrb.com/tutorials/convert-site-to-jekyll/#10-rss-feed - jekyll-menus - jekyll-archives - jekyll-paginate-v2 @@ -33,22 +32,6 @@ plugins: # Latent Semantic Indexing for similarity bewtween documents. lsi: true -feed: - collections: - posts: - path: "/feed/posts-feed.xml" - categories: - - company - - tutorials - - devops - products: - path: "/feed/products-feed.xml" - categories: - - company - - tutorials - - legal - - devops - # =================================================================================== # the API dashboard configuration api: diff --git a/_data/social.yml b/_data/social.yml index 77afcce..f465523 100644 --- a/_data/social.yml +++ b/_data/social.yml @@ -11,6 +11,6 @@ facebook_user: sharpetronics facebook_link: https://facebook.com/SharpeeTronics discord_invite: https://discord.gg/HQcvr2JBQv -rss_link: https://www.sharpetronics.com/feed/posts-feed.xml/ +rss_link: https://www.sharpetronics.com/feed.xml --- diff --git a/_includes/head.html b/_includes/head.html index cf6f349..042da5c 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -18,50 +18,45 @@ Quality Assurance: @odinzu_me - + - + - - - + + + - - - - - - - - - - - + + + + - - - - - - + + + + + + + + - + + - - - + + + - - - {%- feed_meta -%} + + {{ site.data.global.title }} | {{ page.title }} diff --git a/_layouts/post.html b/_layouts/post.html index 501f2ea..014e59b 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -9,7 +9,7 @@ pagination:
- {% unless page.layout == "posts" %} + {% unless page.layout == "posts" or page.layout == "products" %}
diff --git a/_scss/custom.scss b/_scss/custom.scss index aaee00f..403fbdc 100644 --- a/_scss/custom.scss +++ b/_scss/custom.scss @@ -278,6 +278,20 @@ a.author { ul.actions:not(.fixed) li { padding: .5em 0 .5em 0; } + /* ----- mobile featured product ----- */ + + .post.featured.product.no-padding { + margin: 0 0 1em 0; + } + .col-6.col-12-small.product-hero-text.vert-expand { + padding: 0 0 0 1.3em; + } + .button.primary.fit.snipcart-add-item { + margin-bottom: 1.5em; + } + + /* ----- end mobile featured product ----- */ + ul.actions:not(.fixed) li:first-child { padding-top: .5em; } @@ -495,7 +509,7 @@ a.author { //Product Shopping Cart .product-cart ul { list-style:none; - padding: 1em; + padding: .2em 0 0 0; display: flex; justify-content: flex-end; margin: 0 0 1em 0; @@ -555,6 +569,9 @@ a.author { margin-bottom: .5em; } + .fas.fa-shopping-basket.fa-2x:hover { + color: #e1bc63; + } /* ---------Comment Discussion Styling------------- */ ul.simple-nested li { margin-left: 3em; diff --git a/feed.xml b/feed.xml index 78ca067..8a98870 100644 --- a/feed.xml +++ b/feed.xml @@ -1,32 +1,31 @@ --- -layout: null +layout: --- - - - - - {{ site.data.global.title }} - {{ site.url }} - - {{ site.data.global.description }} - {{ site.data.global.time | date_to_rfc822 }} - {% for post in site.posts %} - - {{ post.image }} - {{ post.title }} - - {{ post.url | prepend: site.url }} - - {{ post.author }} - - {{ post.content | escape | truncate: '400' }} - - {{ post.date | date_to_rfc822 }} - - {{ post.url | prepend: site.url }} - - + + + + {{ site.title | xml_escape }} + {{ site.description | xml_escape }} + {{ site.url }}{{ site.baseurl }}/ + + {{ site.time | date_to_rfc822 }} + {{ site.time | date_to_rfc822 }} + Jekyll v{{ jekyll.version }} + {% for post in site.posts limit:10 %} + + {{ post.title | xml_escape }} + {{ post.content | xml_escape }} + {{ post.date | date_to_rfc822 }} + {{ post.url | prepend: site.baseurl | prepend: site.url }} + {{ post.url | prepend: site.baseurl | prepend: site.url }} + {% for tag in post.tags %} + {{ tag | xml_escape }} {% endfor %} - + {% for cat in post.categories %} + {{ cat | xml_escape }} + {% endfor %} + + {% endfor %} + diff --git a/sitemap.xml b/sitemap.xml index d319995..a559a26 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,27 +1,67 @@ --- layout: null -search: exclude +sitemap: + exclude: 'yes' --- - - + {% for page in site.pages %} - - {{page.url}} - {{site.time | date: '%Y-%m-%d' }} - daily - 0.5 - + {% unless page.sitemap.exclude == "yes" or page.name == "feed.xml" %} + + + {{ site.liveUrl }}{{ page.url | remove: "index.html" }} + + {% if page.sitemap.lastmod %} + {{ page.sitemap.lastmod | date: "%Y-%m-%d" }} + {% elsif page.date %} + {{ page.date | date_to_xmlschema }} + {% else %} + {{ site.time | date_to_xmlschema }} + {% endif %} + {% if page.sitemap.changefreq %} + {{ page.sitemap.changefreq }} + {% else %} + monthly + {% endif %} + {% if page.sitemap.priority %} + {{ page.sitemap.priority }} + {% else %} + 0.3 + {% endif %} + + {% endunless %} {% endfor %} - {% for post in site.posts %} - - {{post.url}} - {{site.time | date: '%Y-%m-%d' }} - daily - 0.5 - + {% for collection in site.collections %} + {% for post in collection.docs %} + {% unless post.published == false or post.sitemap.exclude == "yes" or page.name == "feed.xml" %} + + {{ site.liveUrl }}{{ post.url }} + {% if post.sitemap.lastmod %} + {{ post.sitemap.lastmod | date: "%Y-%m-%d" }} + {% elsif post.date %} + {{ post.date | date_to_xmlschema }} + {% else %} + {{ site.time | date_to_xmlschema }} + {% endif %} + {% if post.sitemap.changefreq %} + {{ post.sitemap.changefreq }} + {% else %} + monthly + {% endif %} + {% if post.sitemap.priority %} + {{ post.sitemap.priority }} + {% else %} + 0.5 + {% endif %} + + {% endunless %} + {% endfor %} {% endfor %} - +