Skip to content

Commit e4148c8

Browse files
authored
Merge pull request #355 from kakawait/develop
Release 0.4.5-BETA
2 parents fa3c1b4 + 0844dbf commit e4148c8

30 files changed

+3230
-2013
lines changed

.eslintrc

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"parserOptions": {
3+
"ecmaVersion": 6
4+
},
25
"extends": "google",
36
"rules": {
47
"comma-dangle": [2,"never"],
@@ -10,6 +13,22 @@
1013
"no-trailing-spaces": [2, {"skipBlankLines": true }],
1114
"eqeqeq":[1],
1215
"max-len": [1, 100, 4, {"ignoreUrls": true}],
13-
"no-useless-escape":0
16+
"no-useless-escape":0,
17+
"quote-props": [
18+
2,
19+
"as-needed"
20+
],
21+
"no-var": "off",
22+
"no-invalid-this": "off",
23+
"indent": [
24+
"error",
25+
2,
26+
{
27+
"FunctionDeclaration": {
28+
"body": 1,
29+
"parameters": 2
30+
}
31+
}
32+
]
1433
}
15-
}
34+
}

.github/CONTRIBUTING.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ All kinds of contributions (enhancements, new features, documentation & code imp
66

77
### Javascript
88

9-
We use [ESLint](http://eslint.org) based on Google code style to maintain code style.
9+
We use [ESLint](http://eslint.org) based on Google code style to maintain code style.
1010
Check code status with:
1111

1212
``` bash
1313
npm run lint
14-
# or
15-
grunt eslint
1614
```
1715

1816
## Issues ##
@@ -28,4 +26,3 @@ Before a pull request :
2826
- There is no tests yet so verify that your code is running well. Blog generation (`hugo`) must not outputs errors
2927
- Check code style with eslint.
3028
- Don't forget to update user and/or developer documentation if it's necessary
31-

CHANGELOG.md

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,32 @@
22

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

5+
## [0.4.5-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/20) - 03 jul 2019
6+
7+
- Remove algolia search if site config is not enable ([#283](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/283))
8+
- Site config `coverImage` is more consistent with other existing image config, refer to _breaking changes_ ([#327](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/327))
9+
- `param` `coverImage` if relative now based on site base url ([#236](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/236))
10+
- Fix `grunt` build to support newer `node` version ([#315](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/315))
11+
- Fix `hugo` warnings/deprecations ([#340](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/340) & [#349](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/349))
12+
- Add swedish translation ([#345](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/345)) (thank you [flojon](https://github.com/flojon))
13+
14+
### Breaking changes
15+
16+
Do not support anymore Hugo version <= 0.30!
17+
18+
`coverImage` from `config.toml` now more consistent by do not fix default static folder to `images` (see [#327](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/327) for more details).
19+
`coverImage` from `param` will now always based on base path and not relative to current url, thus
20+
21+
```yml
22+
coverImage: img/a.jpg
23+
```
24+
25+
will the be the same as
26+
27+
```yml
28+
coverImage: /img/a.jpg
29+
```
30+
531
## [0.4.4-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/19) - 09 sep 2018
632
733
- Revamp _open sidebar_ behavior to not push the content out of container ([#278](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/278)) (thank you [johnsoncodehk](https://github.com/johnsoncodehk))
@@ -23,7 +49,7 @@ Since I did an error on `highlight.js` for parameter `syntaxHighlighter`, sorry
2349
```toml
2450
[params]
2551
syntaxHighlighter = "highlight.js"
26-
```
52+
```
2753

2854
## [0.4.2-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/17) - 1 nov 2017
2955

@@ -107,7 +133,7 @@ With new _Sharing options_ that allow extensible list of sharing options, there
107133

108134
### Breaking changes
109135

110-
Do not support anymore Hugo version < 0.20!
136+
Do not support anymore Hugo version < 0.20!
111137

112138
## [0.2.3-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/12) - 31 mar 2017
113139

@@ -200,7 +226,7 @@ defaultContentLanguage = "en-us"
200226
- `de-de` (thank you [@Martin1001](https://github.com/Martin1001))
201227
- Allow some customization on *copyright* section ([#48](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/48))
202228

203-
using
229+
using
204230

205231
```toml
206232
[params.footer]
@@ -333,4 +359,4 @@ to (top level)
333359

334360
```toml
335361
googleAnalytics = "UA-XXX-X"
336-
```
362+
```

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ Please all the credit should be attributed to [original *Hexo* version](https://
3636
## General
3737

3838
- **Authors**: [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro) and [Thibaud Leprêtre (kakawait)](https://github.com/kakawait)
39-
- **Version**: 0.4.4-BETA (based on Hexo version 1.10.0)
40-
- **Compatibility**: Hugo v0.20.1
39+
- **Version**: 0.4.5-BETA (based on Hexo version 1.10.0)
40+
- **Compatibility**: Hugo v0.30
4141

4242
## Features
4343

@@ -97,7 +97,7 @@ cd themes
9797
git clone https://github.com/kakawait/hugo-tranquilpeak-theme.git
9898
```
9999

100-
After installing the Tranquilpeak theme successfully, we recommend you to take a look at the [exampleSite](exampleSite) directory. You will find a working Hugo site configured with the Universal theme that you can use as a starting point for your site.
100+
After installing the Tranquilpeak theme successfully, we recommend you to take a look at the [exampleSite](exampleSite) directory. You will find a working Hugo site configured with the Tranquilpeak theme that you can use as a starting point for your site.
101101

102102
First, let's take a look at the [config.toml](exampleSite/config.toml). It will be useful to learn how to customize your site. Feel free to play around with the settings.
103103

docs/developer.md

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Developer documentation #
22

3-
This documentation will help you to understand Tranquilpeak Hugo theme code.
3+
This documentation will help you to understand Tranquilpeak Hugo theme code.
44

55
If you want to report a bug or ask a question, [create an issue](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/new).
66

@@ -28,8 +28,8 @@ 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.4.4-BETA (based on Hexo version 1.10.0)
32-
- **Compatibility** : Hugo v0.20.1
31+
- **Version** : 0.4.5-BETA (based on Hexo version 1.10.0)
32+
- **Compatibility** : Hugo v0.30
3333

3434
## Requirements ##
3535

@@ -45,16 +45,14 @@ If you want to report a bug or ask a question, [create an issue](https://github.
4545
5. Install [requirements](#requirements)
4646
6. Run `npm install` to install [NPM dependencies](#npm-dependencies)
4747

48-
If you want to configure the theme, please follow the [user documentation](https://github.com/kakawait/hugo-tranquilpeak-theme/blob/master/docs/user.md)
48+
If you want to configure the theme, please follow the [user documentation](https://github.com/kakawait/hugo-tranquilpeak-theme/blob/master/docs/user.md)
4949

5050
## Code style ##
5151

52-
We use [ESLint](http://eslint.org) based on Google code style to maintain javascript code style.
52+
We use [ESLint](http://eslint.org) based on Google code style to maintain javascript code style.
5353
Check code style with :
5454
``` bash
5555
npm run lint
56-
# or
57-
grunt eslint
5856
```
5957

6058
## Code structure ##
@@ -76,7 +74,7 @@ tranquilpeak
7674

7775
<!--### Languages ###
7876
79-
Each files contains all labels used in the theme.
77+
Each files contains all labels used in the theme.
8078
If you want to add a new language, duplicate an existing language file and replace all string by their translation.-->
8179

8280
### Views
@@ -99,10 +97,10 @@ If you want to add a new language, duplicate an existing language file and repla
9997

10098
#### Stylesheets
10199

102-
SCSS structure follow 7-1 pattern of [sass guidelines](http://sass-guidelin.es/#the-7-1-pattern)
103-
If you want more information and to understand better this code, consult [sass guidelines](http://sass-guidelin.es/)
100+
SCSS structure follow 7-1 pattern of [sass guidelines](http://sass-guidelin.es/#the-7-1-pattern)
101+
If you want more information and to understand better this code, consult [sass guidelines](http://sass-guidelin.es/)
104102

105-
#### Images
103+
#### Images
106104

107105
```
108106
├── images
@@ -111,8 +109,8 @@ If you want more information and to understand better this code, consult [sass g
111109
|File|Description|
112110
|---|---|
113111
|cover.png|Default background cover of the blog|
114-
115-
Contains all images of the theme.
112+
113+
Contains all images of the theme.
116114

117115
#### Javascript
118116

@@ -148,13 +146,13 @@ Contains all images of the theme.
148146
|smartresize.js|Debouncing function from [John Hann](https://github.com/unscriptable)|
149147
|tabbed-codeblocks.js|Animate tabs of tabbed code blocks|
150148
|tags-filter.js|Filter posts by using their tags on archives page : `/tags`|
151-
152-
Each file correspond to a feature.
153-
149+
150+
Each file correspond to a feature.
151+
154152
## NPM scripts
155153

156-
Use `npm run <script_name>` to run one of these scripts. E.g : `npm run start`
157-
154+
Use `npm run <script_name>` to run one of these scripts. E.g : `npm run start`
155+
158156
|`npm run ...`|Description|
159157
|---|---|
160158
|`start`|Build the theme once and rebuild after each change|
@@ -163,14 +161,14 @@ Use `npm run <script_name>` to run one of these scripts. E.g : `npm run start`
163161

164162
## Grunt tasks ##
165163

166-
### Tasks structure
167-
164+
### Tasks structure
165+
168166
```
169167
├── tasks
170168
├── config
171169
├── register
172170
└── pipeline.js
173-
```
171+
```
174172

175173
|File/folder|Description|
176174
|---|---|
@@ -203,7 +201,7 @@ var tranquilpeakCssFilesToInject = [
203201

204202
On production environment, these javascript and stylesheets files are concatenate and minify in 1 javascript file and 1 stylesheet file and linked to their respective views
205203

206-
### Config tasks
204+
### Config tasks
207205

208206
|Task|Description|
209207
|---|---|
@@ -233,14 +231,14 @@ When you run `grunt build` or `grunt buildProd` tasks, a `source/assets` folder
233231

234232
## Build ##
235233

236-
### Development environment
234+
### Development environment
237235

238-
1. Run `npm run start` or `grunt default` and start coding :)
236+
1. Run `npm run start` and start coding :)
239237

240238
### Production environment (before deploying your blog)
241239

242-
1. Run `npm run prod` or `grunt buildProd` to build the project with some optimization (concat and minify) to reduce number of HTTP requests and improve performance.
240+
1. Run `npm run prod` to build the project with some optimization (concat and minify) to reduce number of HTTP requests and improve performance.
243241

244242
## Running ##
245243

246-
Run `hugo server` and start coding! :)
244+
Run `hugo server` and start coding! :)

0 commit comments

Comments
 (0)