Skip to content

Commit f996298

Browse files
rootkovskarootkovska
committed
New layout borrowed from the Qubes OS website
1st: It's pretty :) 2nd: As nearly all posts I wrote here are also published on the Qubes OS website, this eliminates the need to assure posts format and look ok on two different layout/CSSes.
1 parent 838b14b commit f996298

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+8950
-451
lines changed

‎_includes/footer.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<div class="wrapper">
44

5-
<div class="footer-col-wrapper">
5+
<div class="row footer-nav text-center more-top add-bottom">
66
<div class="footer-col footer-col-1">
77
<p>
88
Joanna Rutkowska<br />
9-
<a href="https://wiki.qubes-os.org">Qubes OS</a> &amp;
9+
<a href="https://qubes-os.org">Qubes OS</a> &amp;
1010
<a href="http://invisiblethingslab.com/">Invisible Things Lab</a><br />
1111
</p>
1212
</div>

‎_includes/head.html

+47-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,51 @@
11
<head>
2-
<meta charset="utf-8">
3-
<meta name="viewport" content="width=device-width initial-scale=1" />
4-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
2+
<meta charset="utf-8">
3+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
4+
<meta name="viewport" content="width=device-width, initial-scale=1">
55

6-
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
7-
<meta name="description" content="{{ site.description }}">
6+
<title>
7+
{% if page.title and page.title != site.title and page.layout != 'home' %}
8+
{{ page.title }} | {{ site.title }}
9+
{% elsif page.layout == 'home' %}
10+
{{ page.title }}
11+
{% else %}
12+
{{ site.title }}
13+
{% endif %}
14+
</title>
15+
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
16+
<!-- LD+JSON schema -->
17+
<script type='application/ld+json'>
18+
{
19+
"@context": "http://www.schema.org",
20+
"@type": "WebSite",
21+
"name": "Invisible Things Blog",
22+
"url": "https://blog.invisiblethings.org/"
23+
}
24+
</script>
825

9-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
10-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
26+
<!-- Open Graph data -->
27+
<!-- Qubes - Bootstrap Theme -->
28+
<link rel="stylesheet" href="/css/main.css">
29+
30+
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
31+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
32+
<!--[if lt IE 9]>
33+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
34+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
35+
<![endif]-->
36+
37+
<link rel="canonical" href="{{ page.url | replace:'index.html','' }}">
38+
<link rel="icon" type="image/x-icon" href="/attachment/icons/512x512/apps/qubes-logo-icon.png">
39+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }} - Feed" href="/feed.xml" />
40+
41+
<!-- Favicons -->
42+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=bOv986l09r">
43+
<link rel="icon" type="image/png" href="/favicon-32x32.png?v=bOv986l09r" sizes="32x32">
44+
<link rel="icon" type="image/png" href="/favicon-16x16.png?v=bOv986l09r" sizes="16x16">
45+
<link rel="manifest" href="/manifest.json?v=bOv986l09r">
46+
<link rel="mask-icon" href="/safari-pinned-tab.svg?v=bOv986l09r" color="#5bbad5">
47+
<link rel="shortcut icon" href="/favicon.ico?v=bOv986l09r">
48+
<meta name="apple-mobile-web-app-title" content="Qubes OS">
49+
<meta name="application-name" content="Qubes OS">
50+
<meta name="theme-color" content="#ffffff">
1151
</head>

‎_includes/header.html

+20-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
<header class="site-header">
2-
3-
<div class="wrapper">
4-
5-
<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
6-
7-
<nav class="site-nav">
8-
<a href="#" class="menu-icon">
9-
<svg viewBox="0 0 18 15">
10-
<path fill="#424242" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0 h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
11-
<path fill="#424242" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484 h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
12-
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
13-
</svg>
1+
<!-- Fixed navbar -->
2+
<nav class="navbar navbar-custom navbar-static-top">
3+
<div class="container">
4+
<div class="navbar-header">
5+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
6+
<span class="sr-only">Toggle navigation</span>
7+
<span class="icon-bar"></span>
8+
<span class="icon-bar"></span>
9+
<span class="icon-bar"></span>
10+
</button>
11+
<a class="page-link" href="/">
12+
<span><strong>Invisible Things Blog</strong> OS</span>
1413
</a>
15-
16-
<div class="trigger">
17-
{% for page in site.pages %}
18-
{% if page.title %}
19-
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
20-
{% endif %}
14+
</div>
15+
<div id="navbar" class="navbar-collapse collapse">
16+
<ul class="nav nav-justified">
17+
{% for section in site.data.architecture %}
18+
<li><a href="{{ section.url }}">{{ section.title }}</a></li>
2119
{% endfor %}
22-
</div>
23-
</nav>
24-
20+
</ul>
21+
</div><!--/.nav-collapse -->
2522
</div>
26-
27-
</header>
23+
</nav>

‎_layouts/default.html

+19-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<!DOCTYPE html>
22
<html>
3-
43
{% include head.html %}
5-
6-
<body>
7-
8-
{% include header.html %}
9-
10-
<div class="page-content">
11-
<div class="wrapper">
4+
<body>
5+
<div class="container">
6+
<h1 class="more-top add-left">
7+
{% for section in site.data.architecture %}
8+
{% if section.url == page.permalink %}
9+
<i class="fa {{section.icon}}"></i>
10+
{% else %}
11+
{% for sub in section.sub-pages %}
12+
{% if sub.url == page.permalink %}
13+
<i class="fa {{sub.icon}}"></i>
14+
{% endif %}
15+
{% endfor %}
16+
{% endif %}
17+
{% endfor %}
18+
{{ page.title }}
19+
</h1>
20+
<div class="white-box more-bottom page-content">
1221
{{ content }}
22+
</div>
23+
{% include footer.html %}
1324
</div>
14-
</div>
15-
16-
{% include footer.html %}
17-
1825
</body>
19-
2026
</html>

‎_layouts/page.html

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
---
2-
layout: default
3-
---
4-
<div class="post">
5-
6-
<article class="post-content">
7-
{{ content }}
8-
</article>
9-
10-
</div>
1+
<!DOCTYPE html>
2+
<html>
3+
{% include head.html %}
4+
<body>
5+
{% include header.html %}
6+
<div class="container">
7+
<h1 class="more-top add-left">
8+
</h1>
9+
<div class="white-box more-bottom">
10+
{{ content }}
11+
</div>
12+
{% include footer.html %}
13+
</div>
14+
</body>
15+
</html>

‎_layouts/post.html

+45-21
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,45 @@
1-
---
2-
layout: default
3-
---
4-
<div class="post">
5-
6-
<header class="post-header">
7-
<h1 class="post-title">{{ page.title }}</h1>
8-
<p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}
9-
{% if page.author %} • {{ page.author }}{% endif %}
10-
{% if page.meta %} • {{ page.meta }}{% endif %}
11-
{% if page.blogger_orig_url %} •
12-
Automatically converted from Blogger (<a href="{{ page.blogger_orig_url}}">original</a>)
13-
{% endif %}
14-
</p>
15-
</header>
16-
17-
<article class="post-content">
18-
{{ content }}
19-
</article>
20-
21-
</div>
1+
<!DOCTYPE html>
2+
<html>
3+
{% include head.html %}
4+
<body>
5+
{% include header.html %}
6+
<div class="container">
7+
<div class="row more-top">
8+
</div>
9+
10+
<div class="more-bottom white-box page-content">
11+
<div class="row">
12+
<div class="col-lg-10 col-md-10 col-xs-10">
13+
<header class="post-header">
14+
<h1 class="post-title remove-bottom">{{ page.title }}</h1>
15+
<p class="post-meta">
16+
{{ page.date | date: "%b %-d, %Y" }}
17+
by <strong>
18+
{% assign author_team = false %}
19+
{% for member in site.data.team %}
20+
{% if page.author == member.name %}
21+
{% assign author_team = true %}
22+
{% endif %}
23+
{% endfor %}
24+
{% if page.author %}
25+
{% if author_team %}
26+
<a href="/team/#{{ page.author | slugify }}">{{ page.author }}</a>
27+
{% else %}
28+
{{ page.author }}
29+
{% endif %}
30+
{% else %}
31+
{{ site.default_author }}
32+
{% endif %}
33+
</strong>
34+
</p>
35+
</header>
36+
<article class="post-content">
37+
{{ content }}
38+
</article>
39+
</div>
40+
</div>
41+
</div>
42+
{% include footer.html %}
43+
</div>
44+
</body>
45+
</html>

0 commit comments

Comments
 (0)