Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: niklasbuschmann/contrast
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: slingman/blog_1
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Dec 29, 2020

  1. Update _config.yml

    slingman authored Dec 29, 2020
    Copy the full SHA
    36e5d9a View commit details
  2. Update _config.yml

    slingman authored Dec 29, 2020
    Copy the full SHA
    b8e11cc View commit details
  3. Update _config.yml

    slingman authored Dec 29, 2020
    Copy the full SHA
    ed5d908 View commit details
  4. Update _config.yml

    slingman authored Dec 29, 2020
    Copy the full SHA
    e65b7ca View commit details
  5. Update _config.yml

    slingman authored Dec 29, 2020
    Copy the full SHA
    2603f9b View commit details
  6. Update archive.html

    slingman authored Dec 29, 2020
    Copy the full SHA
    82ee21e View commit details
  7. Update _config.yml

    slingman authored Dec 29, 2020
    Copy the full SHA
    a168be0 View commit details
  8. Update archive.html

    slingman authored Dec 29, 2020
    Copy the full SHA
    b751152 View commit details
  9. Update archive.html

    slingman authored Dec 29, 2020
    Copy the full SHA
    fb02711 View commit details
  10. new post

    slingman committed Dec 29, 2020
    Copy the full SHA
    b51dfb8 View commit details
  11. rename

    slingman committed Dec 29, 2020
    Copy the full SHA
    41bb7cf View commit details
  12. trying inline css

    slingman committed Dec 29, 2020
    Copy the full SHA
    ab2d6e0 View commit details
  13. trying inline css

    slingman committed Dec 29, 2020
    Copy the full SHA
    5d63a90 View commit details
  14. trying inline css

    slingman committed Dec 29, 2020
    Copy the full SHA
    f364f99 View commit details
  15. trying inline css

    slingman committed Dec 29, 2020
    Copy the full SHA
    4d81f2e View commit details
  16. Update _config.yml

    don't show excerpts
    slingman authored Dec 29, 2020
    Copy the full SHA
    7dc42c6 View commit details
  17. Update archive.html

    slingman authored Dec 29, 2020
    Copy the full SHA
    f45d53f View commit details

Commits on Dec 30, 2020

  1. Update font.sass

    add font Raleway
    slingman authored Dec 30, 2020
    Copy the full SHA
    1a82c2f View commit details
  2. Update font.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    34cf681 View commit details
  3. Update font.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    a2bf12d View commit details
  4. Update font.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    56b31d0 View commit details
  5. Update font.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    1157e9d View commit details
  6. Copy the full SHA
    993a18e View commit details
  7. trying inline css

    slingman committed Dec 30, 2020
    Copy the full SHA
    7b3bd9e View commit details
  8. trying inline css

    slingman committed Dec 30, 2020
    Copy the full SHA
    ff10c52 View commit details
  9. add font Raleway

    slingman committed Dec 30, 2020
    Copy the full SHA
    8182611 View commit details
  10. add font Raleway

    slingman committed Dec 30, 2020
    Copy the full SHA
    2490558 View commit details
  11. move date in post

    slingman committed Dec 30, 2020
    Copy the full SHA
    5691433 View commit details
  12. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    c06a265 View commit details
  13. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    9f25db6 View commit details
  14. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    70055ea View commit details
  15. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    a46c14b View commit details
  16. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    c1a10b3 View commit details
  17. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    d51a2ca View commit details
  18. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    2296835 View commit details
  19. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    1d370bd View commit details
  20. Update basic.sass

    slingman authored Dec 30, 2020
    Copy the full SHA
    86a6b5b View commit details
  21. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    c58eb24 View commit details
  22. archive example posts

    slingman committed Dec 30, 2020
    Copy the full SHA
    8627452 View commit details
  23. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    c6401de View commit details
  24. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    8a85150 View commit details
  25. file name change

    slingman committed Dec 30, 2020
    Copy the full SHA
    4f5187f View commit details
  26. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    f8761bc View commit details
  27. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    68335aa View commit details
  28. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    c07c3f9 View commit details
  29. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    9bff31b View commit details
  30. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    1a67189 View commit details
  31. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    b666c7a View commit details
  32. Update _config.yml

    slingman authored Dec 30, 2020
    Copy the full SHA
    105c215 View commit details
  33. edit first post

    slingman committed Dec 30, 2020
    Copy the full SHA
    ee0e18d View commit details
Showing with 51 additions and 14 deletions.
  1. +11 −8 _config.yml
  2. +1 −2 _includes/archive.html
  3. +1 −1 _includes/meta.html
  4. +6 −0 _layouts/post.html
  5. +15 −0 _posts/2020-12-29-blog-setup.md
  6. +11 −3 _sass/basic.sass
  7. +6 −0 _sass/font.sass
  8. BIN assets/fonts/Raleway-Regular.woff
19 changes: 11 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
title: "Blog Title"
author: "Blog Author"
title: "sling.blog"
author: "Steve Ling"
description: "Made with <b style=\"color: #f45;\">&lt;3</b>"
permalink: /:title/
permalink: /:year/:month/:day/:title
lang: "en"
excerpt_separator: "\n\n\n"
date_format: "%B %d, %Y"

# Layout

show_social: true # show site description and social links in the footer
show_excerpts: false # show article excerpts on the home page
show_excerpts: true # show article excerpts on the home page
show_frame: false # adds a gray frame to the site
show_sidebar: false # show a sidebar instead of the usual header

# Menu

navigation:
- {file: "index.html", icon: home}
- {file: "README.md", icon: address-card}
# - {file: "index.html", icon: Portfolio}
# - {file: "README.md", icon: address-card}
- {title: Portfolio, url: "https://slingman.github.io"}

external: # see http://fontawesome.com/icons
- {title: Mail, icon: envelope, url: "mailto:niklasbuschmann@users.noreply.github.com"}
- {title: Github, icon: github, url: "https://github.com/niklasbuschmann/contrast"}
- {title: Mail, icon: envelope, url: "mailto:steveling@users.noreply.github.com"}
- {title: Github, icon: github, url: "https://github.com/slingman"}
- {title: Instagram, icon: instagram, url: "https://instagram.com/s.l.i.n.g"}
- {title: Flickr, icon: flickr, url: "https://flickr.com/sling_flickr"}
- {title: Subscribe, icon: rss, url: "/feed.xml"}

comments:
3 changes: 1 addition & 2 deletions _includes/archive.html
Original file line number Diff line number Diff line change
@@ -2,8 +2,7 @@
<header><h1>{{ include.title | default: page.title }}</h1></header>
<ul class="archive">
{% for post in site.posts %}
<li>
<time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: "%Y-%m-%d" }}</time>
<li><time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: "%B %d, %Y" }}</time><br>
<a href="{{ post.url | relative_url }}">{{ post.title }}</a>
</li>
{% endfor %}
2 changes: 1 addition & 1 deletion _includes/meta.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<header>
<h1><a href="{{ include.post.url | relative_url }}">{{ include.post.title }}</a></h1>
{%- assign date_format = site.date_format | default: "%B %d, %Y" -%}
<time datetime="{{ include.post.date | date_to_xmlschema }}">{{ include.post.date | date: date_format }}</time>
<h1><a href="{{ include.post.url | relative_url }}">{{ include.post.title }}</a></h1>
</header>
6 changes: 6 additions & 0 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -4,7 +4,13 @@

<article>
{% include meta.html post=page %}

{% if page.tags.size > 0 %}
{{ page.tags | sort | join: ", " }}
{% endif %}

{{ content }}

{% if page.comments != false and site.comments.isso or site.comments.disqus %}
<hr>
{% if site.comments.isso_domain %}<div id="isso-thread"></div>{% endif %}
15 changes: 15 additions & 0 deletions _posts/2020-12-29-blog-setup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
title: "Setting up my blog via Github"
layout: post
categories: media
tags: [jekyll, learn, blog, github]
---

Let's see what this thing can do, I am gonna have to learn markdown now :-)

Setting this blog up has been an interesting couple of days. Since my portfolio site has been set up on <https://slingman.github.io>, I wanted to add another path below that /blog.

The reason for this set up is because I want to try to do a **Project 365** again for 2021.
I did one back in 2013 but stopped short towards the end of March. That is some hard stuff to do, but I think i am up for the challenge again with this new blog set up!

![Nike Air Max 90 x Denham](https://live.staticflickr.com/65535/50753868341_7e1f42b09e_c.jpg)
14 changes: 11 additions & 3 deletions _sass/basic.sass
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ html
body
background: $light
color: $dark
font-family: "PT Sans", -apple-system, "Helvetica Neue", "Segoe UI", "Roboto", sans-serif
font-family: "Raleway", "PT Sans", -apple-system, "Helvetica Neue", "Segoe UI", "Roboto", sans-serif
font-weight: $font-weight
line-height: $line-height
margin: 0
@@ -20,6 +20,9 @@ body

h1, h2, h3, h4, h5, h6
font-weight: $heading-weight

h1
font-family: "Raleway", sans-serif

b, strong, th
font-weight: $font-weight + 200
@@ -55,10 +58,15 @@ blockquote, figure
img, li
margin: .5em 0

/*p > img
position:relative*/

img
border-radius: 2px
max-width: 100%
/*border-radius: 2px*/
max-width: 95%
width: auto
height: auto
border: 5px solid #eee

table
display: inline-block
6 changes: 6 additions & 0 deletions _sass/font.sass
Original file line number Diff line number Diff line change
@@ -9,3 +9,9 @@
src: local('PT Sans Bold'), local('PTSans-Bold'), url('../fonts/PTSans-Bold.woff') format('woff')
font-weight: bold
font-style: normal

@font-face
font-family: 'Raleway'
src: local('Raleway'), local('Raleway-Regular'), url('../fonts/Raleway-Regular.woff') format('woff')
font-weight: normal
font-style: normal
Binary file added assets/fonts/Raleway-Regular.woff
Binary file not shown.