Skip to content

Commit 6f3d8f4

Browse files
authored
Merge pull request #100 from kakawait/develop
Releasing 0.2.1-ALPHA
2 parents 6e39afc + 398b5c8 commit 6f3d8f4

27 files changed

+246
-67
lines changed

.github/CONTRIBUTING.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Contributing #
2+
3+
All kinds of contributions (enhancements, new features, documentation & code improvements, issues & bugs reporting) are welcome.
4+
5+
## Code style ##
6+
7+
### Javascript
8+
9+
We use [ESLint](http://eslint.org) based on Google code style to maintain code style.
10+
Check code status with:
11+
12+
``` bash
13+
npm run lint
14+
# or
15+
grunt eslint
16+
```
17+
18+
## Issues ##
19+
20+
When you create an issue to report a bug or ask a question, please fill template information, except if is **really not relevant**. And all others related information that are susceptible to help us.
21+
22+
## Pull requests ##
23+
24+
All pull requests must be done on the **develop** branch.
25+
26+
Before a pull request :
27+
28+
- There is no tests yet so verify that your code is running well. Blog generation (`hugo`) must not outputs errors
29+
- Check code style with eslint.
30+
- Don't forget to update user and/or developer documentation if it's necessary
31+

.github/ISSUE_TEMPLATE.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!-- use this template only to report a bug or ask a question -->
2+
<!-- fill this part for bugs reporting or questions -->
3+
### Configuration
4+
5+
- **Operating system with its version**:
6+
- **Browser with its version**:
7+
- **Hugo version**: <!-- You can get version by typing: hugo version -->
8+
- **Tranquilpeak version**: <!-- You can find version on package.json -->
9+
- **Do you reproduce on https://tranquilpeak.kakawait.com demo?**:
10+
11+
<!-- fill this part for bugs reporting if needed -->
12+
### Actual behavior
13+
14+
<!-- fill this part for bugs reporting if needed -->
15+
### Expected behavior
16+
17+
<!-- fill this part for bugs reporting if needed -->
18+
### Steps to reproduce the behavior

CHANGELOG.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,49 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [0.2.1-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/10) - 8 jan 2017
6+
7+
- Easy customization of head and foot via `/layouts/partials/(head|foot)_(start|end).html` ([#80](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/80)) (thank you [@blaubaer](https://github.com/blaubaer))
8+
- New front matters to hide/show pagination, social buttons and tags ([#81](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/81)) (thank you [@blaubaer](https://github.com/blaubaer))
9+
- Sidebar author avatar link modifiable ([#81](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/81)) (thank you [@blaubaer](https://github.com/blaubaer))
10+
11+
```toml
12+
[params.sidebar.profile]
13+
url = ...
14+
```
15+
16+
- Alert shortcode support markdown content ([#91](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/91))
17+
18+
```
19+
{{< alert info >}}
20+
Praesent diam elit, **interdum** ut [pulvinar](http://foo.bar) placerat, imperdiet at magna.
21+
{{< /alert >}}
22+
```
23+
24+
- Add basic post archetype ([#76](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/76))
25+
- Remove `en.yaml` symlink ([#84](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/84))
26+
- Fix gravatar integration that was broken ([#87](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/87))
27+
- Fix missing css for post meta ([#89](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/89))
28+
- Fix front matters `coverSize` ([#93](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/93))
29+
30+
### Breaking changes
31+
32+
Related to [#84](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/84), language code `en` does not exist anymore.
33+
34+
Replace if relevant
35+
36+
```toml
37+
languageCode = "en"
38+
defaultContentLanguage = "en"
39+
```
40+
41+
to
42+
43+
```toml
44+
languageCode = "en-us"
45+
defaultContentLanguage = "en-us"
46+
```
47+
548
## [0.2.0-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/2) - 4 dec 2016
649

750
- *De-bundlize* every external scripts/css ([#66](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/66)) for many reasons:

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
3434
## General
3535

3636
- **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
37-
- **Version**: 0.2.0-ALPHA (based on Hexo version 1.9.1)
37+
- **Version**: 0.2.1-ALPHA (based on Hexo version 1.9.1)
3838
- **Compatibility**: Hugo v0.17
3939

4040
## Features
@@ -141,6 +141,8 @@ To understand the code, the workflow and edit the theme, consult the following d
141141

142142
All kinds of contributions (enhancements, new features, documentation & code improvements, issues & bugs reporting) are welcome.
143143

144+
Read [guidelines for contributing](https://github.com/kakawait/hugo-tranquilpeak-theme/blob/master/.github/CONTRIBUTING.md) for more information.
145+
144146
As explained on [Credits](#credits):
145147

146148
> *Hugo* version keeps every `.js` and `.css` files untouched from original *Hexo* version in order to enjoy futur original *Hexo* version updates or features!

archetypes/post.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: "New Post"
3+
date: 2015-05-28
4+
categories:
5+
- category
6+
- subcategory
7+
tags:
8+
- tag1
9+
- tag2
10+
keywords:
11+
- tech
12+
#thumbnailImage: //example.com/image.jpg
13+
---
14+
15+
<!-- more /-->

docs/developer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
2828
## General ##
2929

3030
- **Author** : Thibaud Leprêtre
31-
- **Version** : 0.2.0-ALPHA (based on Hexo version 1.9.1)
31+
- **Version** : 0.2.1-ALPHA (based on Hexo version 1.9.1)
3232
- **Compatibility** : Hugo v0.17
3333

3434
## Requirements ##

docs/user.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
5252
## General
5353

5454
- **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
55-
- **Version**: 0.2.0-ALPHA (based on Hexo version 1.9.1)
55+
- **Version**: 0.2.1-ALPHA (based on Hexo version 1.9.1)
5656
- **Compatibility**: Hugo v0.17
5757

5858
## Features
@@ -144,7 +144,7 @@ If your language is not available, follow this guidelines (E.g : add swedish lan
144144

145145
1. Set `defaultContentLanguage` to `sv-se` in Hugo configuration file `config.{toml,yaml,json}`
146146
2. Create `sv-se.yaml` file in `theme/tranquilpeak/i18n/` folder
147-
3. Copy the content of `theme/tranquilpeak/i18n/en.yaml` and paste it to `sv-se.yml` file
147+
3. Copy the content of `theme/tranquilpeak/i18n/en-us.yaml` and paste it to `sv-se.yml` file
148148
4. Replace all strings in english by their translation in swedish
149149

150150
#### Menu translation
@@ -479,6 +479,9 @@ gallery:
479479
- http://i.imgur.com/o9r19kD.jpg "Dubai"
480480
- https://example.com/orignal.jpg https://example.com/thumbnail.jpg "Sidney"
481481
comments: false
482+
showTags: true
483+
showPagination: true
484+
showSocial: true
482485
```
483486

484487
|Variable|Description|
@@ -496,6 +499,9 @@ comments: false
496499
|coverMeta|`in`: display post meta (title, date and categories) on cover image, `out`: display meta (title, date and categories) under cover image as usual. Default behavior : `in`|
497500
|gallery|Images displayed in an image gallery (with fancybox) at the end of the post. If thumbnail image is not configured and cover image too, the first photo is used as thumbnail image. format: `original url [thumbnail url] [caption]`, E.g : `https://example.com/original.jpg https://example.com/thumbnail.jpg "New York"`|
498501
|comments|Disable the comment of the post.
502+
|showTags|`true`: show tags of this page. Default behavior: `true`
503+
|showPagination|`true`: show pagination. Default behavior: `true`
504+
|showSocial|`true`: show social button such as share on Twitter, Facebook... Default behavior: `true`
499505

500506
Example:
501507
A post on index page will look like this with :`thumbnailImagePosition` set to `bottom`:

exampleSite/config.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tranquilpeak
2-
# Version : 0.2.0-ALPHA
2+
# Version : 0.2.1-ALPHA
33
# Author : Thibaud Leprêtre
44

55
# I STRONGLY recommend you to use a CDN to speed up loading of pages.
@@ -14,13 +14,13 @@
1414

1515
baseurl = ""
1616
languageCode = "en-us"
17+
defaultContentLanguage = "en-us"
1718
title = "Hugo tranquilpeak theme"
1819
theme = "hugo-tranquilpeak-theme"
1920
disqusShortname = "hugo-tranquilpeak-theme"
2021
# googleAnalytics = "UA-123-45"
2122
paginate = 7
2223
canonifyurls = true
23-
defaultContentLanguage = "en-us"
2424

2525
[permalinks]
2626
post = "/:year/:month/:slug/"
@@ -165,6 +165,10 @@ defaultContentLanguage = "en-us"
165165
icon = ""
166166
url = "/#about"
167167

168+
# Customize like of athor avatar in sidebar
169+
# [params.sidebar.profile]
170+
# url = "/#about"
171+
168172
# Customize copyright value "© 2016 <CUSTOMIZATION>. All Rights Reserved"
169173
# [params.footer]
170-
# copyright = "<a href=\"https://github.com/kakawait\">kakawait</a>"
174+
# copyright = "<a href=\"https://github.com/kakawait\">kakawait</a>"
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
title: "Hidden pagination showcase"
3+
thumbnailImagePosition: left
4+
thumbnailImage: //d1u9biwaxjngwg.cloudfront.net/cover-image-showcase/city-750.jpg
5+
date: 2014-08-15
6+
categories:
7+
- tranquilpeak
8+
- features
9+
tags:
10+
- pagination
11+
showPagination: false
12+
---
13+
14+
This post is used to show how a site looks if the pagination is hidden.
15+
<!--more-->
16+
17+
In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
title: "Hidden social section showcase"
3+
thumbnailImagePosition: left
4+
thumbnailImage: //d1u9biwaxjngwg.cloudfront.net/cover-image-showcase/city-750.jpg
5+
date: 2014-08-17
6+
categories:
7+
- tranquilpeak
8+
- features
9+
tags:
10+
- social
11+
showSocial: false
12+
---
13+
14+
This post is used to show how a site looks if the social section is hidden.
15+
<!--more-->
16+
17+
In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus.

0 commit comments

Comments
 (0)