Skip to content

Commit 92294a9

Browse files
committed
refactor style 1
1 parent 53ace85 commit 92294a9

13 files changed

Lines changed: 856 additions & 31 deletions

File tree

_config.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,22 @@ description: >- # this means to ignore newlines until "baseurl:"
66
baseurl: "" # the subpath of your site, e.g. /blog
77
url: "" # the base hostname & protocol for your site, e.g. http://example.com
88
github_username: OrderLab
9+
permalink: /blog/:year/:month/:day/:title/
910

1011
# Build settings
1112
markdown: kramdown
1213
theme: minima
1314
plugins:
1415
- jekyll-last-modified-at
1516

17+
defaults:
18+
- scope:
19+
path: ""
20+
type: "posts"
21+
values:
22+
layout: post
23+
author: OrderLab
24+
1625
exclude:
1726
- Gemfile
1827
- Gemfile.lock

_includes/banner.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="main_menu">
33
<nav class="navbar navbar-expand-lg navbar-light">
44
<div class="container box_1620">
5-
<a class="navbar-brand logo_h" href="{{ '/index.html' | relative_url }}"><img src="{{ '/assets/img/logo.png' | relative_url }}" alt=""></a>
5+
<a class="navbar-brand logo_h" href="{{ '/' | relative_url }}"><img src="{{ '/assets/img/logo.png' | relative_url }}" alt=""></a>
66
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
77
<span class="icon-bar"></span>
88
<span class="icon-bar"></span>
@@ -11,14 +11,15 @@
1111
<div class="collapse navbar-collapse offset" id="navbarSupportedContent">
1212
{% assign current = page.url | downcase | split: '/' %}
1313
<ul class="nav navbar-nav menu_nav justify-content-end">
14-
<li class="nav-item {% if current[1] == 'index' %}'active'{% endif %}"><a class="nav-link" href="{{ '/index.html' | relative_url }}">Home</a></li>
15-
<li class="nav-item {% if current[1] == 'team' %}'active'{% endif %}"><a class="nav-link" href="{{ '/team.html' | relative_url }}">People</a></li>
16-
<li class="nav-item {% if current[1] == 'news' %}'active'{% endif %}"><a class="nav-link" href="{{ '/news.html' | relative_url }}">News</a></li>
17-
<li class="nav-item {% if current[1] == 'pubs' %}'active'{% endif %}"><a class="nav-link" href="{{ '/pubs.html' | relative_url }}">Publications</a>
18-
<li class="nav-item {% if current[1] == 'projects' %}'active'{% endif %}"><a class="nav-link" href="{{ '/projects.html' | relative_url }}">Projects</a></li>
19-
<li class="nav-item {% if current[1] == 'software' %}'active'{% endif %}"><a class="nav-link" href="{{ '/software.html' | relative_url }}">Software</a></li>
14+
<li class="nav-item {% if current[1] contains 'index' or page.url == '/' %}active{% endif %}"><a class="nav-link" href="{{ '/' | relative_url }}">Home</a></li>
15+
<li class="nav-item {% if current[1] == 'team' %}active{% endif %}"><a class="nav-link" href="{{ '/team/' | relative_url }}">People</a></li>
16+
<li class="nav-item {% if current[1] == 'news' %}active{% endif %}"><a class="nav-link" href="{{ '/news/' | relative_url }}">News</a></li>
17+
<li class="nav-item {% if current[1] == 'pubs' %}active{% endif %}"><a class="nav-link" href="{{ '/pubs/' | relative_url }}">Publications</a></li>
18+
<li class="nav-item {% if current[1] == 'projects' %}active{% endif %}"><a class="nav-link" href="{{ '/projects/' | relative_url }}">Projects</a></li>
19+
<li class="nav-item {% if current[1] == 'software' %}active{% endif %}"><a class="nav-link" href="{{ '/software/' | relative_url }}">Software</a></li>
20+
<li class="nav-item {% if current[1] == 'blog' %}active{% endif %}"><a class="nav-link" href="{{ '/blog/' | relative_url }}">Blog</a></li>
2021
<li class="nav-item"><a class="nav-link" href="https://orderlab.io/reading-group" target="_blank">Reading</a></li>
21-
<li class="nav-item {% if current[1] == 'join' %}'active'{% endif %}"><a class="nav-link" href="{{ '/join.html' | relative_url }}">Join</a></li>
22+
<li class="nav-item {% if current[1] == 'join' %}active{% endif %}"><a class="nav-link" href="{{ '/join/' | relative_url }}">Join</a></li>
2223
</ul>
2324
</div>
2425
</div>

_includes/head.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<link rel="stylesheet" href="{{ '/vendors/flaticon/flaticon.css' | relative_url }}" />
1818
<link rel="stylesheet" href="{{ '/vendors/owl-carousel/owl.carousel.min.css' | relative_url }}">
1919
<link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
20+
<link rel="stylesheet" href="{{ '/assets/css/modern.css' | relative_url }}">
2021
<link rel="stylesheet" href="{{ '/assets/css/site.css' | relative_url }}">
2122
</head>

_layouts/post.html

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!DOCTYPE html>
2+
<html lang="en-us">
3+
{% include head.html %}
4+
<body>
5+
{% include banner.html %}
6+
<main class="side-main">
7+
<section class="hero-banner mb-30px">
8+
<div class="container">
9+
<div class="hero-banner--sm__content">
10+
<h1>{{ page.title }}</h1>
11+
<h4>{{ page.date | date: "%B %-d, %Y" }}</h4>
12+
</div>
13+
</div>
14+
</section>
15+
<section class="section-margin">
16+
<div class="container">
17+
<article class="post-shell">
18+
<div class="post-meta">
19+
<span><strong>Published:</strong> {{ page.date | date: "%b %-d, %Y" }}</span>
20+
{% if page.author %}<span><strong>Author:</strong> {{ page.author }}</span>{% endif %}
21+
{% if page.last_modified_at %}<span><strong>Updated:</strong> {{ page.last_modified_at | date: "%b %-d, %Y" }}</span>{% endif %}
22+
</div>
23+
<div class="single-post-content">
24+
{{ content }}
25+
</div>
26+
</article>
27+
</div>
28+
</section>
29+
{% include footer.html %}
30+
</main>
31+
{% include bottom.html %}
32+
</body>
33+
</html>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: Launching the OrderLab Blog
3+
author: OrderLab
4+
---
5+
6+
We have added a dedicated blog to the lab website to share technical updates in a faster, more narrative format than conference papers.
7+
8+
Posts here will usually cover:
9+
10+
- research ideas in progress,
11+
- implementation notes from lab systems,
12+
- paper highlights and context,
13+
- and student milestones.
14+
15+
For archival milestones and announcements, the [News]({{ '/news/' | relative_url }}) page remains the canonical timeline.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
title: Writing Posts for This Site
3+
author: OrderLab
4+
---
5+
6+
Blog entries are standard Jekyll posts. Create a markdown file under `_posts/` with this naming pattern:
7+
8+
`YYYY-MM-DD-title.md`
9+
10+
Recommended front matter:
11+
12+
```yaml
13+
---
14+
title: Your Post Title
15+
author: Your Name
16+
---
17+
```
18+
19+
The site will automatically:
20+
21+
- list the post on `/blog/`,
22+
- render it with the post layout,
23+
- and include the newest posts on the homepage.

_scss/style.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@import "theme/btn";
1212
@import "theme/footer";
1313
@import "theme/projects";
14-
@import "theme/publications";
15-
@import "theme/news";
16-
@import "theme/about";
14+
@import "theme/publications";
15+
@import "theme/news";
16+
@import "theme/about";
17+
@import "theme/modern";

0 commit comments

Comments
 (0)