Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to make a live demo with gh-pages #2

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Changes to make a live demo with gh-pages #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54def86
Set baseurl
mushishi78 Sep 7, 2015
0d22f66
Add baseurl to src and href attributes
mushishi78 Sep 7, 2015
5782e94
Add baseurl to css hrefs in js
mushishi78 Sep 7, 2015
680cea0
More baseurl changes
mushishi78 Sep 7, 2015
82a4c8d
Spell baseurl in _config right
mushishi78 Sep 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
name: Linear
description: Linear template for Jekyll
paginate: 10
baseurl: '/Linear-Jekyll-Theme'
10 changes: 5 additions & 5 deletions _includes/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<nav id="nav">
<ul>
{% assign current = page.url | downcase | split: '/' %}
<li {% if current[1] == 'index.html' %}class='current'{% endif %}><a href="/index.html">Homepage</a></li>
<li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="/blog">Blog</a></li>
<li {% if current[1] == 'left-sidebar.html' %}class='current'{% endif %}><a href="/left-sidebar.html">Left Sidebar</a></li>
<li {% if current[1] == 'right-sidebar.html' %}class='current'{% endif %}><a href="/right-sidebar.html">Right Sidebar</a></li>
<li {% if current[1] == 'no-sidebar.html' %}class='current'{% endif %}><a href="/no-sidebar.html">No Sidebar</a></li>
<li {% if current[1] == 'index.html' %}class='current'{% endif %}><a href="{{ site.baseurl }}/index.html">Homepage</a></li>
<li {% if current[1] == 'blog' %}class='current'{% endif %}><a href="{{ site.baseurl }}/blog">Blog</a></li>
<li {% if current[1] == 'left-sidebar.html' %}class='current'{% endif %}><a href="{{ site.baseurl }}/left-sidebar.html">Left Sidebar</a></li>
<li {% if current[1] == 'right-sidebar.html' %}class='current'{% endif %}><a href="{{ site.baseurl }}/right-sidebar.html">Right Sidebar</a></li>
<li {% if current[1] == 'no-sidebar.html' %}class='current'{% endif %}><a href="{{ site.baseurl }}/no-sidebar.html">No Sidebar</a></li>
</ul>
</nav>
</div>
2 changes: 1 addition & 1 deletion _includes/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h2>Recent Blog Posts</h2>
{% for post in site.posts offset: 0 limit: 2 %}
<li>
<p class="posted">{{ post.date | date_to_string }} | (10 ) Comments</p>
<p><a href="{{ site.prefix }}{{ post.url }}">{{ post.excerpt | remove: '<p>' | remove: '</p>' }}</a></p>
<p><a href="{{ site.baseurl }}{{ post.url }}">{{ post.excerpt | remove: '<p>' | remove: '</p>' }}</a></p>
</li>
{% endfor %}
</ul>
Expand Down
12 changes: 6 additions & 6 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<meta name="keywords" content="" />
<link href='http://fonts.googleapis.com/css?family=Roboto:400,100,300,700,500,900' rel='stylesheet' type='text/css'>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="/assets/js/skel.min.js"></script>
<script src="/assets/js/skel-panels.min.js"></script>
<script src="/assets/js/init.js"></script>
<script src="{{ site.baseurl }}/assets/js/skel.min.js"></script>
<script src="{{ site.baseurl }}/assets/js/skel-panels.min.js"></script>
<script src="{{ site.baseurl }}/assets/js/init.js"></script>
<noscript>
<link rel="stylesheet" href="/assets/css/skel-noscript.css" />
<link rel="stylesheet" href="/assets/css/style.css" />
<link rel="stylesheet" href="/assets/css/style-desktop.css" />
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/skel-noscript.css" />
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/style.css" />
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/style-desktop.css" />
</noscript>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div id="content" class="container">
<div class="row">
<section class="8u -2u">
<a href="{{ site.prefix }}{{ page.url }}" class="image full"><img src="/assets/{{ page.featured }}" alt=""></a>
<a href="{{ site.baseurl }}{{ page.url }}" class="image full"><img src="{{ site.baseurl }}/assets/{{ page.featured }}" alt=""></a>
<header>
<h2>{{ page.title }}</h2>
</header>
Expand Down
4 changes: 3 additions & 1 deletion assets/js/init (BirbMachine's conflicted copy 2014-10-05).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
---
/*
Linear by TEMPLATED
templated.co @templatedco
Released for free under the Creative Commons Attribution 3.0 license (templated.co/license)
*/

skel.init({
prefix: '/assets/css/style',
prefix: '{{ site.baseurl }}/assets/css/style',
resetCSS: true,
boxModel: 'border',
grid: {
Expand Down
4 changes: 3 additions & 1 deletion assets/js/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
---
/*
Linear by TEMPLATED
templated.co @templatedco
Released for free under the Creative Commons Attribution 3.0 license (templated.co/license)
*/

skel.init({
prefix: '/assets/css/style',
prefix: '{{ site.baseurl }}/assets/css/style',
resetCSS: true,
boxModel: 'border',
grid: {
Expand Down
4 changes: 2 additions & 2 deletions blog/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
{% for post in site.posts offset: 0 limit: 4 %}
<div class="row">
<section class="8u -2u">
<a href="{{ site.prefix }}{{ post.url }}" class="image full"><img src="/assets/{{ post.featured }}" alt=""></a>
<a href="{{ site.baseurl }}{{ post.url }}" class="image full"><img src="{{ site.baseurl }}/assets/{{ post.featured }}" alt=""></a>
<header>
<h2>{{ post.title }}</h2>
</header>
{{ post.excerpt }}
<a href="{{ site.prefix }}{{ post.url }}" class="button button-style1">Read More</a>
<a href="{{ site.baseurl }}{{ post.url }}" class="button button-style1">Read More</a>
</section>
</div>
{% endfor %}
Expand Down
8 changes: 4 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ <h3>Maecenas luctus lectus</h3>

<div class="row">
<section class="6u">
<a href="#" class="image full"><img src="/assets/images/pic01.jpg" alt=""></a>
<a href="#" class="image full"><img src="{{ site.baseurl }}/assets/images/pic01.jpg" alt=""></a>
<header>
<h2>Mauris vulputate dolor</h2>
</header>
<p>In posuere eleifend odio. Quisque semper augue mattis wisi. Maecenas ligula. Pellentesque viverra vulputate enim. Aliquam erat volutpat. Donec leo, vivamus fermentum nibh in augue praesent a lacus at urna congue rutrum.</p>
</section>
<section class="6u">
<a href="#" class="image full"><img src="/assets/images/pic02.jpg" alt=""></a>
<a href="#" class="image full"><img src="{{ site.baseurl }}/assets/images/pic02.jpg" alt=""></a>
<header>
<h2>Mauris vulputate dolor</h2>
</header>
Expand All @@ -57,14 +57,14 @@ <h2>Mauris vulputate dolor</h2>

<div class="row">
<section class="6u">
<a href="#" class="image full"><img src="/assets/images/pic03.jpg" alt=""></a>
<a href="#" class="image full"><img src="{{ site.baseurl }}/assets/images/pic03.jpg" alt=""></a>
<header>
<h2>Mauris vulputate dolor</h2>
</header>
<p>In posuere eleifend odio. Quisque semper augue mattis wisi. Maecenas ligula. Pellentesque viverra vulputate enim. Aliquam erat volutpat. Donec leo, vivamus fermentum nibh in augue praesent a lacus at urna congue rutrum.</p>
</section>
<section class="6u">
<a href="#" class="image full"><img src="/assets/images/pic04.jpg" alt=""></a>
<a href="#" class="image full"><img src="{{ site.baseurl }}/assets/images/pic04.jpg" alt=""></a>
<header>
<h2>Mauris vulputate dolor</h2>
</header>
Expand Down