Skip to content

Commit

Permalink
Merge branch 'master' into pr/103
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonrosage committed Apr 1, 2019
2 parents 1e4e1c5 + 478e3ed commit 05363b6
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 21 deletions.
27 changes: 25 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,24 @@ bundle install
```
bundle exec jekyll serve
```

You should see something like:

```
Configuration file: /octocat/personal-website/_config.yml
Source: /octocat/personal-website
Destination: /octocat/_site
Incremental build: disabled. Enable with --incremental
Generating...
GitHub Metadata: No GitHub API authentication could be found. Some fields may be missing or have incorrect data.
done in 14.729 seconds.
Auto-regeneration: enabled for '/octocat/personal-website'
Server address: http://127.0.0.1:4000
Server running... press ctrl-c to stop.
```

Don't worry about the "No GitHub API authentication could be found" message. [API authentication is only necessary](https://github.com/jekyll/github-metadata/blob/master/docs/authentication.md) if you intend to display more detailed metadata, like a branch name.

6. Now browse to [http://localhost:4000](http://localhost:4000)

### Publish
Expand Down Expand Up @@ -104,13 +122,18 @@ social_media:
behance: your_username
dribbble: your_username
facebook: your_username
hackerrank: your_username
instagram: your_username
keybase: your_username
linkedin: your_username
medium: @your_username
medium: your_username
stackoverflow: your_user_id
telegram: your_username
twitter: your_username
youtube: your_username
unsplash: your_username
vk: your_username
website: http://your_website_url
youtube: your_username
```

Links to your profile for each of the services you define will appear in the `<header>` of your website, appended to your bio. And if those services support sharing, any blog posts that you publish will include links to share that post using each social media service.
Expand Down
9 changes: 7 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,18 @@ projects:
# behance: your_username
# dribbble: your_username
# facebook: your_username
# hackerrank: your_username
# instagram: your_username
# keybase: your_username
# linkedin: your_username
# medium: @your_username
# medium: your_username
# stackoverflow: your_user_id
# telegram: your_username
# twitter: your_username
# youtube: your_username
# unsplash: your_username
# vk: your_username
# website: http://your_website_url
# youtube: your_username

topics:
- name: CSS
Expand Down
45 changes: 35 additions & 10 deletions _data/social_media.yml

Large diffs are not rendered by default.

11 changes: 8 additions & 3 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,23 @@
{% assign user = site.github.owner %}

{% if page.path contains '_posts' %}
{% assign page_title = page.title %}
{% assign meta_description = page.content | strip_html | strip_newlines | xml_escape | truncate: 300 %}
{% else %}
{% assign page_title = user.name %}
{% assign meta_description = user.bio | strip_html | strip_newlines | xml_escape | truncate: 300 %}
{% endif %}

<!doctype html>
<html class="height-full">
<html class="min-height-full">
<head>
<meta charset="utf-8">
<title>{{ page_title }}</title>
<meta name="description" content="{{ meta_description }}" />
<title>{{ user.name }}</title>
<meta property="og:title" content="{{ user.name }}" />
<meta property="og:image" content="{{ user.avatar_url }}" />
<meta property="og:description" content="{{ meta_description }}" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="{{ "/assets/styles.css" | relative_url }}" rel="stylesheet" type="text/css">
</head>
<body class="bg-white height-full" {% if site.style == 'dark' %}style="background-color: #2f363d !important"{% endif %}>
<body class="bg-white min-height-full" {% if site.style == 'dark' %}style="background-color: #2f363d !important"{% endif %}>
2 changes: 1 addition & 1 deletion _includes/masthead.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h1 class="{% if site.style == 'dark' %}text-white{% endif %} mb-2 lh-condensed"
<div class="{% unless forloop.last == true %}mr-3{% endunless %} mb-3">
{% assign service_shortname = account[0] %}
{% assign service = site.data.social_media[service_shortname] %}
<a href="{{ service.profile_url_prefix }}{{ account[1] }}" title="{{ service.name }}: {{ account[1] }}" class="tooltipped tooltipped-s" aria-label="{{ service.name }}: {{ account[1] }}">
<a href="{{ service.profile_url_prefix }}{{ account[1] }}" class="tooltipped tooltipped-se" aria-label="{{ service.name }}: {{ account[1] }}">
{{ service.icon_svg }}<span class="d-none">{{ service.name }}</span>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1 class="f00-light lh-condensed mb-5">{{ page.title }}</h1>
</div>
</div>
{% else %}
<div class="d-md-flex height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
<div class="d-md-flex min-height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
<div class="flex-self-stretch {% if site.style == 'dark' %}bg-gray-dark{% else %}border-md-right border-gray-light bg-white{% endif %} col-md-5 col-lg-4 col-xl-3 px-4 px-md-6 px-lg-7 py-6">
{% include masthead.html metadata=true %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{% endunless %}
</div>
{% else %}
<div class="d-md-flex height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
<div class="d-md-flex min-height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
<div class="flex-self-stretch {% if site.style == 'dark' %}bg-gray-dark{% else %}border-md-right border-gray-light bg-white{% endif %} col-md-5 col-lg-4 col-xl-3 px-4 px-md-6 px-lg-7 py-6">
{% include masthead.html metadata=true %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h1 class="f00-light lh-condensed">{{ page.title }}</h1>
</div>
</div>
{% else %}
<div class="d-md-flex height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
<div class="d-md-flex min-height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
<div class="flex-self-stretch {% if site.style == 'dark' %}bg-gray-dark{% else %}border-md-right border-gray-light bg-white{% endif %} col-md-5 col-lg-4 col-xl-3 px-4 px-md-6 px-lg-7 py-6">
{% include masthead.html metadata=true %}
</div>
Expand Down
4 changes: 4 additions & 0 deletions assets/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@
padding-left: 16px;
}
}

.min-height-full {
min-height: 100vh;
}

0 comments on commit 05363b6

Please sign in to comment.