8000 Merge branch 'master' into pr/103 · githublucas420/githubWebsite@05363b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 05363b6

Browse files
brandonrosagebrandonrosage
committed
Merge branch 'master' into pr/103
2 parents 1e4e1c5 + 478e3ed commit 05363b6

File tree

9 files changed

+83
-21
lines changed

9 files changed

+83
-21
lines changed

‎README.md

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,24 @@ bundle install
4343
```
4444
bundle exec jekyll serve
4545
```
46+
47+
You should see something like:
48+
49+
```
50+
Configuration file: /octocat/personal-website/_config.yml
51+
Source: /octocat/personal-website
52+
Destination: /octocat/_site
53+
Incremental build: disabled. Enable with --incremental
54+
Generating...
55+
GitHub Metadata: No GitHub API authentication could be found. Some fields may be missing or have incorrect data.
56+
done in 14.729 seconds.
57+
Auto-regeneration: enabled for '/octocat/personal-website'
58+
Server address: http://127.0.0.1:4000
59+
Server running... press ctrl-c to stop.
60+
```
61+
62+
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.
63+
4664
6. Now browse to [http://localhost:4000](http://localhost:4000)
4765

4866
### Publish
@@ -104,13 +122,18 @@ social_media:
104122
behance: your_username
105123
dribbble: your_username
106124
facebook: your_username
125+
hackerrank: your_username
126+
instagram: your_username
127+
keybase: your_username
107128
linkedin: your_username
108-
medium: @your_username
129+
medium: your_username
109130
stackoverflow: your_user_id
110131
telegram: your_username
111132
twitter: your_username
112-
youtube: your_username
133+
unsplash: your_username
113134
vk: your_username
135+
website: http://your_website_url
136+
youtube: your_username
114137
```
115138

116139
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.

‎_config.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,18 @@ projects:
3131
# behance: your_username
3232
# dribbble: your_username
3333
# facebook: your_username
34+
# hackerrank: your_username
35+
# instagram: your_username
36+
# keybase: your_username
3437
# linkedin: your_username
35-
# medium: @your_username
38+
# medium: your_username
3639
# stackoverflow: your_user_id
3740
# telegram: your_username
3841
# twitter: your_username
39-
# youtube: your_username
42+
# unsplash: your_username
4043
# vk: your_username
44+
# website: http://your_website_url
45+
# youtube: your_username
4146

4247
topics:
4348
- name: CSS

‎_data/social_media.yml

Lines changed: 35 additions & 10 deletions
Large diffs are not rendered by default.

‎_includes/header.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,23 @@
1111
{% assign user = site.github.owner %}
1212

1313
{% if page.path contains '_posts' %}
14+
{% assign page_title = page.title %}
1415
{% assign meta_description = page.content | strip_html | strip_newlines | xml_escape | truncate: 300 %}
1516
{% else %}
17+
{% assign page_title = user.name %}
1618
{% assign meta_description = user.bio | strip_html | strip_newlines | xml_escape | truncate: 300 %}
1719
{% endif %}
1820

1921
<!doctype html>
20-
<html class="height-full">
22+
<html class="min-height-full">
2123
<head>
2224
<meta charset="utf-8">
25+
<title>{{ page_title }}</title>
2326
<meta name="description" content="{{ meta_description }}" />
24-
<title>{{ user.name }}</title>
27+
<meta property="og:title" content="{{ user.name }}" />
28+
<meta property="og:image" content="{{ user.avatar_url }}" />
29+
<meta property="og:description" content="{{ meta_description }}" />
2530
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
2631
<link href="{{ "/assets/styles.css" | relative_url }}" rel="stylesheet" type="text/css">
2732
</head>
28-
<body class="bg-white height-full" {% if site.style == 'dark' %}style="background-color: #2f363d !important"{% endif %}>
33+
<body class="bg-white min-height-full" {% if site.style == 'dark' %}style="background-color: #2f363d !important"{% endif %}>

‎_includes/masthead.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1 class="{% if site.style == 'dark' %}text-white{% endif %} mb-2 lh-condensed"
4040
<div class="{% unless forloop.last == true %}mr-3{% endunless %} mb-3">
4141
{% assign service_shortname = account[0] %}
4242
{% assign service = site.data.social_media[service_shortname] %}
43-
<a href="{{ service.profile_url_prefix }}{{ account[1] }}" title="{{ service.name }}: {{ account[1] }}" class="tooltipped tooltipped-s" aria-label="{{ service.name }}: {{ account[1] }}">
43+
<a href="{{ service.profile_url_prefix }}{{ account[1] }}" class="tooltipped tooltipped-se" aria-label="{{ service.name }}: {{ account[1] }}">
4444
{{ service.icon_svg }}<span class="d-none">{{ service.name }}</span>
4545
</a>
4646
</div>

‎_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h1 class="f00-light lh-condensed mb-5">{{ page.title }}</h1>
1111
</div>
1212
</div>
1313
{% else %}
14-
<div class="d-md-flex height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
14+
<div class="d-md-flex min-height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
1515
<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">
1616
{% include masthead.html metadata=true %}
1717
</div>

‎_layouts/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{% endunless %}
2626
</div>
2727
{% else %}
28-
<div class="d-md-flex height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
28+
<div class="d-md-flex min-height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
2929
<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">
3030
{% include masthead.html metadata=true %}
3131
</div>

‎_layouts/post.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h1 class="f00-light lh-condensed">{{ page.title }}</h1>
4747
</div>
4848
</div>
4949
{% else %}
50-
<div class="d-md-flex height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
50+
<div class="d-md-flex min-height-full {% unless site.style == 'dark' %}border-md-bottom{% endunless %}">
5151
<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">
5252
{% include masthead.html metadata=true %}
5353
</div>

‎assets/styles.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@
3737
padding-left: 16px;
3838
}
3939
}
40+
41+
.min-height-full {
42+
min-height: 100vh;
43+
}

0 commit comments

Comments
 (0)
0