Skip to content

Commit 118c92f

Browse files
vsochvsoch
committed
more updates, still some bugs
Signed-off-by: Vanessa Sochat <[email protected]>
1 parent 4e4dc50 commit 118c92f

File tree

12 files changed

+111
-20
lines changed

12 files changed

+111
-20
lines changed

‎_config.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,16 @@ accentColor: red # purple, green, etc.
4141
themeColor: red # purple, green, blue, orange, purple, grey
4242
fixedNav: 'true' # true or false
4343

44-
permalink: /:year/:title
44+
permalink: /:year/:title/
4545
markdown: kramdown
4646
include: [_pages]
4747
exclude: [_site, CHANGELOG.md, LICENSE, README.md]
48+
49+
# Defaults
50+
defaults:
51+
-
52+
scope:
53+
path: ""
54+
type: "pages"
55+
values:
56+
layout: "page"

‎_data/toc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
url: "/about"
33
slug: about
44
- title: "News"
5-
url: "/articles"
5+
url: "/news"
66
slug: news

‎_includes/footer.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="md-footer-copyright">
2323

2424
<div class="md-footer-copyright__highlight">
25-
Copyright &copy; 2018 - {{ site.author }}
25+
Copyright &copy; 2019 - {{ site.author }}
2626
</div>
2727
</div>
2828

@@ -43,4 +43,6 @@
4343
</footer>
4444
<script src="{{ site.baseurl }}/assets/js/application.js"></script>
4545
<!--<script src="{{ site.baseurl }}/assets/js/application.a59e2a89.js"></script>-->
46-
<script>app.initialize({version:"0.17.4",url:{base:"."}})</script>
46+
{% assign slashes = page.url | split: "/" %}
47+
<script>console.log('{{ slashes | size }}')</script>
48+
<script>app.initialize({version:"0.17.4", url:{base:'{% if page.url == "/" %}.{% else %}{% for slash in slashes %}.{% endfor %}{% endif %}'}})</script>

‎_includes/head.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
<meta name="lang:search.tokenizer" content="[\s\-]+">
2929
<script src="{{ site.baseurl }}/assets/js/modernizr.74668098.js"></script>
3030
<link rel="shortcut icon" href="{{ site.baseurl }}/assets/img/favicon.png">
31-
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/application.css">
31+
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/main.css">
3232
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/palette.css">

‎_layouts/default.html

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</div>
1616
</main>
1717
</div>
18-
1918
{% include footer.html %}
2019
</body>
2120
</html>

‎_posts/2019-06-28-hello-world.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
---
2-
layout: post
3-
title: "Two Thousand Fourteen"
4-
date: 2014-01-03 18:52:21
2+
title: "Two Thousand Nineteen"
3+
date: 2019-06-28 18:52:21
54
categories: jekyll update
5+
badges:
6+
- type: warning
7+
tag: warning-badge
8+
- type: danger
9+
tag: danger-badge
610
---
11+
712
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

‎_posts/2019-06-29-welcome.md

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
---
2-
layout: post
3-
title: "Welcome to Jekyll!"
4-
date: 2015-12-01 18:52:21 -0500
2+
title: "Welcome to MkDocs Jekyll"
3+
date: 2019-06-28 5:52:21 -0500
54
categories: jekyll update
5+
badges:
6+
- type: primary
7+
tag: primary-badge
8+
- type: secondary
9+
tag: secondary-badge
10+
- type: info
11+
tag: info-badge
12+
- type: success
13+
tag: success-badge
614
---
15+
16+
# Welcome!
17+
718
You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
819

20+
<!--more-->
21+
922
To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
1023

1124
Jekyll also offers powerful support for code snippets:

‎assets/css/application.css renamed to ‎assets/css/main.css

+39
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,44 @@ input {
6363
border: 0;
6464
outline: 0;
6565
}
66+
67+
.changelog,
68+
.changelog > div {
69+
margin: 0;
70+
padding: 0;
71+
list-style: none; }
72+
.changelog .date {
73+
color: #888;
74+
font-style: italic; }
75+
76+
span.badge {
77+
font-family: "Open Sans", sans-serif;
78+
padding: 2px 5px;
79+
margin-right: 5px;
80+
text-transform: uppercase;
81+
font-size: 1.0rem;
82+
border-radius: 2px;
83+
background: #eee;
84+
font-weight: bold; }
85+
span.badge-primary {
86+
background: #3c7dae;
87+
color: #fff; }
88+
span.badge-secondary {
89+
background: #999;
90+
color: #fff; }
91+
span.badge-danger {
92+
background: firebrick;
93+
color: #fff; }
94+
span.badge-warning {
95+
background: darkorange;
96+
color: #fff; }
97+
span.badge-info {
98+
background: royalblue;
99+
color: #fff; }
100+
span.badge-success {
101+
background: forestgreen;
102+
color: #fff; }
103+
66104
.md-clipboard:before, .md-icon, .md-nav__button, .md-nav__link:after, .md-nav__title:before, .md-search-result__article--document:before, .md-source-file:before, .md-typeset .admonition>.admonition-title:before, .md-typeset .admonition>summary:before, .md-typeset .critic.comment:before, .md-typeset .footnote-backref, .md-typeset .task-list-control .task-list-indicator:before, .md-typeset details>.admonition-title:before, .md-typeset details>summary:before, .md-typeset summary:after {
67105
font-family: Material Icons;
68106
font-style: normal;
@@ -75,6 +113,7 @@ input {
75113
word-wrap: normal;
76114
direction: ltr;
77115
}
116+
78117
.md-content__icon, .md-footer-nav__button, .md-header-nav__button, .md-nav__button, .md-nav__title:before, .md-search-result__article--document:before {
79118
display: inline-block;
80119
margin: .4rem;

‎pages/about.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
layout: page
32
title: About
43
permalink: /about/
54
---

‎pages/articles.md renamed to ‎pages/archive.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
---
22
layout: page
33
title: Articles
4-
permalink: /articles/
4+
permalink: /archive/
55
---
6-
{% for post in site.posts %}
7-
{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}
8-
{% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %}
6+
# News Archive
7+
8+
{% for post in site.posts %}{% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}{% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %}
99

1010
{% if forloop.first %}<h2 class="c-archives__year" id="{{ this_year }}-ref">{{this_year}}</h2>
1111
<ul class="c-archives__list">{% endif %}
1212
<li class="c-archives__item">
13-
<h3><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h3>
14-
<p>{{ post.date | date: "%b %-d, %Y" }}</p>
13+
{{ post.date | date: "%b %-d, %Y" }}: <a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
1514
</li>{% if forloop.last %}</ul>{% else %}{% if this_year != next_year %}
1615
</ul>
1716
<h2 class="c-archives__year" id="{{ next_year }}-ref">{{next_year}}</h2>

‎pages/news.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
title: News
3+
permalink: /news/
4+
---
5+
6+
# News
7+
8+
<p>Subscribe with <a href="{{ site.baseurl }}/feed.xml">RSS</a> to keep up with the latest news.
9+
For site changes, see the <a href="https://github.com/{{ site.github_user }}/{{ site.github_repo }}/blob/master/CHANGELOG.md">changelog</a> kept with the code base.</p>
10+
11+
<p class="editor-link"><a href="cloudcannon:collections/_posts" class="btn"><strong>&#9998;</strong> Update Change Log</a></p>
12+
13+
{% for post in site.posts limit:10 %}
14+
<div class="post-preview">
15+
<h2><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h2>
16+
<span class="post-date">{{ post.date | date: "%B %d, %Y" }}</span><br>
17+
{% if post.badges %}{% for badge in post.badges %}<span class="badge badge-{{ badge.type }}">{{ badge.tag }}</span>{% endfor %}{% endif %}
18+
{{ post.content | split:'<!--more-->' | first }}
19+
{% if post.content contains '<!--more-->' %}
20+
<a href="{{ site.baseurl }}{{ post.url }}">read more</a>
21+
{% endif %}
22+
</div>
23+
<hr>
24+
{% endfor %}
25+
26+
Want to see more? See the <a href="{{ site.baseurl }}/archive/">News Archive</a>.

‎search/search_index.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
layout: null
33
---
4-
{"config":{"lang":["en"],"prebuild_index":false,"separator":"[\\s\\-]+"},"docs": [{% for page in site.pages %}{"location": "{{ page.url }}", "text": "{{ page.content | strip_html | strip_newlines | escape }}", "title": "{{ page.title }}"}{% if forloop.last %}]{% else %},{% endif %}{% endfor %}}
4+
{"config":{"lang":["en"],"prebuild_index":false,"separator":"[\\s\\-]+"},"docs":[{% for page in site.pages %}{% unless page.excluded_in_search %}{% if added %},{% endif %}{% assign added = false %}{"location": "{{ page.url }}", "text": "{{ page.content | strip_html | strip_newlines | escape }}", "title": "{{ page.title }}"}{% assign added = true %}{% endunless %}{% endfor %},{% for post in site.posts %}{% unless page.excluded_in_search %}{% if added %},{% endif %}{% assign added = false %}{"location": "{{ post.url }}", "text": "{{ post.content | strip_html | strip_newlines | escape }}", "title": "{{ page.title }}"}{% assign added = true %}{% endunless %}{% endfor %}}]

0 commit comments

Comments
 (0)