Skip to content

Commit 59db383

Browse files
committed
Changing how categories and tags are rendered in the UI - issue#3
1 parent a91b349 commit 59db383

File tree

6 files changed

+22
-27
lines changed

6 files changed

+22
-27
lines changed

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ defaults:
2626
layout: "post"
2727

2828
# Custom variables
29-
version: "1.1.0"
29+
version: "1.0.0"
3030

3131
# Options
3232
custom_header: false

_layouts/post.html

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,14 @@
55
<h2>{{ page.title }}</h2>
66
<time datetime="{{ page.date | date_to_xmlschema }}" class="by-line">{{ page.date | date_to_string }}</time>
77
{% for category in page.categories %}
8-
<a href="/categories/#{{ category }}">
9-
<span class="label label-category">
10-
{{ category | replace:'-', ' ' }}
11-
</span>
12-
</a>
13-
<span> &nbsp;</span>
8+
<a href="/categories/#{{ category }}" class="label label-category">
9+
{{ category | replace:'-', ' ' }}
10+
</a>
1411
{% endfor %}
1512
{% for tag in page.tags %}
16-
<a href="/tags/#{{ tag }}">
17-
<span class="label label-tag">{{ tag | replace:'-', ' ' }}</span>
13+
<a href="/tags/#{{ tag }}" class="label label-tag">
14+
{{ tag | replace:'-', ' ' }}
1815
</a>
19-
<span> &nbsp;</span>
2016
{% endfor %}
2117
<div class="content">
2218

_posts/2014-08-24-working-on-github-projects.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
layout: post
33
title: Working with projects on Github
44
categories:
5-
- technical
5+
- technical
66
tags:
7-
- github
7+
- github
88
---
99

1010
# Collaborating on Github projects
11+
1112
Its safe to say that [github](http://github.com) is one of the most widely used source code management systems for software development.
1213

13-
Every-time I start working on a new project on github, I always turn to good old [Google](www.google.com) to _get me started_ for the same set of questions.
14+
Every time I start working on a new project on github, I always turn to good old [Google](www.google.com) to *get me started* for the same set of questions.
1415

1516
So here are the steps that I follow to start working on a project on github:
1617

17-
### 1. [Fork the project code](http://help.github.com/articles/fork-a-repo)
18+
### 1. [Fork the project code](http://help.github.com/articles/fork-a-repo)
1819

1920
```bash
2021
# Original project
@@ -23,7 +24,7 @@ So here are the steps that I follow to start working on a project on github:
2324
https://github.com/finiteloopme/apiman
2425
```
2526

26-
### 2. Clone your fork
27+
### 2. Clone your fork
2728

2829
```bash
2930
# Clone the project locally
@@ -34,7 +35,7 @@ So here are the steps that I follow to start working on a project on github:
3435
git remote add upstream https://github.com/apiman/apiman
3536
```
3637

37-
### 3. Contribute fixes and/or features to the project
38+
### 3. Contribute fixes and/or features to the project
3839

3940
```bash
4041
# Create a branch for a specific issue
@@ -51,4 +52,4 @@ So here are the steps that I follow to start working on a project on github:
5152
git push origin apiman-issue123
5253
```
5354

54-
### 4. Generate a [pull-request](http://help.github.com/articles/using-pull-requests) for your changes
55+
### 4. Generate a [pull-request](http://help.github.com/articles/using-pull-requests) for your changes

_sass/custom.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $tag-color: #C0C0C0;
88

99
.label-category {
1010
background-color: $category-color;
11+
margin-right: 5px;
1112
}
1213
.label-category:hover {
1314
background-color: darken($category-color, 5%);
@@ -16,6 +17,7 @@ $tag-color: #C0C0C0;
1617

1718
.label-tag {
1819
background-color: $tag-color;
20+
margin-right: 5px;
1921
}
2022
.label-tag:hover {
2123
background-color: darken($tag-color, 5%);

_sass/layout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@
169169
}
170170

171171
.by-line {
172-
/*display: block;*/
172+
display: block;
173173
color: lighten($text-color, 25%);
174174
line-height: 1.5em; /* 24px/16px */
175175
margin-bottom: 1.5em; /* 24px/16px */
176176
font-weight: 200;
177177
@media (min-width: 940px) {
178-
/*display: block;*/
178+
display: block;
179179
color: lighten($text-color, 25%);
180180
line-height: 1.3334em; /* 24px/18px */
181181
margin-bottom: 1.3334em; /* 24px/18px */

index.html

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@
77
{% for post in paginator.posts %}
88

99
<li class="post">
10-
<h2><a href="{% if site.baseurl == "/" %}{{ post.url }}{% else %}{{ post.url | prepend: site.baseurl }}{% endif %}">{{ post.title }}</a></h2>
10+
<h2><a href="{% if site.baseurl == "/" %}{{ post.url }}{% else %}{{ post.url | prepend: site.baseurl }}{% endif %}">{{ post.title}}</a></h2>
1111
<time datetime="{{ post.date | date_to_xmlschema }}" class="by-line">{{ post.date | date_to_string }}</time>
1212
{% for category in post.categories %}
13-
<a href="/categories/#{{ category }}">
14-
<span class="label label-category">
13+
<a href="/categories/#{{ category }}" class="label label-category">
1514
{{ category | replace:'-', ' ' }}
16-
</span>
1715
</a>
18-
<span> &nbsp;</span>
1916
{% endfor %}
2017
{% for tag in post.tags %}
21-
<a href="/tags/#{{ tag }}">
22-
<span class="label label-tag">{{ tag | replace:'-', ' ' }}</span>
18+
<a href="/tags/#{{ tag }}" class="label label-tag">
19+
{{ tag | replace:'-', ' ' }}
2320
</a>
24-
<span> &nbsp;</span>
2521
{% endfor %}
2622
<p>{{ post.content | strip_html | truncatewords:50 }}</p>
2723
</li>

0 commit comments

Comments
 (0)