Skip to content

Commit 295d0fb

Browse files
kakawaitkakawait
authored
Merge pull request #527 from kakawait/buggy-overflow
Remove overflow on blog class
2 parents 9e4df46 + 0d62294 commit 295d0fb

15 files changed

+72
-19
lines changed

‎CHANGELOG.md

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

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

5+
## [0.5.3-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/27) - 06 oct 2021
6+
7+
- Fix top/bottom bar behavior when scrolling ([#520](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/520))
8+
59
## [0.5.2-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/25) - 08 sep 2021
610

711
- Fix gitalk (really does not work on previous version) ([#504](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/504) and [#507](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/507)) (thank you @duval1024)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ How can I migrate my current version? Please read [CHANGELOG.md](https://github.
2828
## General
2929

3030
- **Authors**: [Thibaud Leprêtre (kakawait)](https://github.com/kakawait) and [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro)
31-
- **Version**: 0.5.2-BETA (based on Hexo version 3.1.0)
31+
- **Version**: 0.5.3-BETA (based on Hexo version 3.1.0)
3232
- **Compatibility**: Hugo v0.53
3333

3434
## Features

‎docs/developer.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ If you want to report a bug or ask a question, [create an issue](https://github.
2929

3030
## General ##
3131

32-
- **Author** : Thibaud Leprêtre
33-
- **Version** : 0.5.2-BETA (based on Hexo version 3.1.0)
34-
- **Compatibility** : Hugo v0.53
32+
- **Author**: Thibaud Leprêtre
33+
- **Version**: 0.5.3-BETA (based on Hexo version 3.1.0)
34+
- **Compatibility**: Hugo v0.53
3535

3636
## Requirements ##
3737

‎docs/user.md

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

6363
- **Authors**: [Thibaud Leprêtre (kakawait)](https://github.com/kakawait) and [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro)
64-
- **Version**: 0.5.2-BETA (based on Hexo version 3.1.0)
64+
- **Version**: 0.5.3-BETA (based on Hexo version 3.1.0)
6565
- **Compatibility**: Hugo v0.53
6666

6767
## Features

‎exampleSite/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Tranquilpeak
2-
# Version : 0.5.2-BETA
2+
# Version : 0.5.3-BETA
33
# Author : Thibaud Leprêtre
44

55
# I STRONGLY recommend you to use a CDN to speed up loading of pages.

‎exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Welcome to Tranquilpeak 0.5.2-BETA"
2+
title: "Welcome to Tranquilpeak 0.5.3-BETA"
33
date: 2015-06-15
44
categories:
55
- tranquilpeak
@@ -57,7 +57,7 @@ How can I migrate my current version? Please read [CHANGELOG.md](https://github.
5757
## General
5858

5959
- **Authors**: [Thibaud Leprêtre (kakawait)](https://github.com/kakawait) and [Louis Barranqueiro (LouisBarranqueiro)](https://github.com/LouisBarranqueiro)
60-
- **Version**: 0.5.2-BETA (based on Hexo version 3.1.0)
60+
- **Version**: 0.5.3-BETA (based on Hexo version 3.1.0)
6161
- **Compatibility**: Hugo v0.53
6262

6363
## Features

‎layouts/partials/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
{{ end }}
4949
<!--EXTERNAL STYLES END-->
5050
<!--STYLES-->
51-
<link rel="stylesheet" href="{{ "css/style-c5yjx2losbmkttdif4mskx5f9pqjjquywurgngxfvceyyrtyatseix5hpd.min.css" | absURL }}" />
51+
<link rel="stylesheet" href="{{ "css/style-h6ccsoet3mzkbb0wngshlfbaweimexgqcxj0h5hu4h82olsdzz6wmqdkajm.min.css" | absURL }}" />
5252
<!--STYLES END-->
5353
{{ range .Site.Params.customCSS }}
5454
{{ if isset . "href" }}

‎layouts/partials/meta.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<meta charset="UTF-8">
22
<meta name="viewport" content="width=device-width, initial-scale=1">
33
<meta http-equiv="X-UA-Compatible" content="IE=edge">
4-
<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.5.2-BETA">
4+
<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.5.3-BETA">
55
<meta name="author" content="{{ .Site.Author.name }}">
66
<meta name="keywords" content="{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}">
77
<meta name="description" content="{{ if .Description }}{{ .Description }}{{ else if .IsPage }}{{ .Summary }}{{ else }}{{ .Site.Params.description }}{{ end }}">

‎package-lock.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hugo-tranquilpeak-theme",
3-
"version": "0.5.2-BETA",
3+
"version": "0.5.3-BETA",
44
"description": "A gorgeous responsive theme for Hugo blog framework",
55
"main": "Gruntfile.js",
66
"scripts": {
@@ -33,13 +33,13 @@
3333
"eslint-config-google": "^0.14.0",
3434
"grunt": "^1.4.1",
3535
"grunt-cli": "^1.4.3",
36-
"grunt-exec": "^3.0.0",
3736
"grunt-contrib-clean": "^2.0.0",
3837
"grunt-contrib-concat": "^1.0.1",
3938
"grunt-contrib-copy": "^1.0.0",
4039
"grunt-contrib-cssmin": "^4.0.0",
4140
"grunt-contrib-uglify": "^5.0.1",
4241
"grunt-contrib-watch": "^1.1.0",
42+
"grunt-exec": "^3.0.0",
4343
"grunt-sails-linker": "^1.0.4",
4444
"grunt-sass": "^3.1.0",
4545
"grunt-sync": "^0.8.2",

‎release.sh

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ "$OSTYPE" == "darwin"* ]]; then
4+
sed() {
5+
gsed "$@"
6+
}
7+
date() {
8+
gdate "$@"
9+
}
10+
fi
11+
12+
new_version="${1}"
13+
14+
if [[ -z "${new_version}" ]]; then
15+
echo "Missing argument: version"
16+
exit 1
17+
fi
18+
19+
current_version="$(node -p "require('./package.json').version")"
20+
21+
echo "$current_version"
22+
23+
echo "Current version is: ${current_version}"
24+
echo "New version will be: ${new_version}"
25+
echo
26+
read -p "Are you sure? [y/N] " -r
27+
28+
if [[ $REPLY =~ ^[Yy]$ ]]; then
29+
# package.json
30+
npm pkg set version=${new_version}
31+
# package-lock.json
32+
npm i
33+
# meta.html
34+
sed -i 's/\(generator" content="[^"]*\)'"${current_version}"'/\1'"${new_version}"'/' layouts/partials/meta.html
35+
# first blog post
36+
sed -i 's/\(title: "[^"]*'"\)${current_version}"'/\1'"${new_version}"'/' exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md
37+
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md
38+
# config.toml
39+
sed -i 's/\([#] Version : \)'"${current_version}"'/\1'"${new_version}"'/' exampleSite/config.toml
40+
# user.md
41+
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' docs/user.md
42+
# developer.md
43+
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' docs/developer.md
44+
# README.md
45+
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' README.md
46+
47+
npm run lint
48+
49+
echo "Do not forget to fill CHANGELOG.md"
50+
fi

‎src/scss/base/_base.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
html {
2+
width: 100%;
3+
height: 100%;
24
font-family: $font-family-base;
35
// equal to 10px, useful to use em and rem
46
font-size: 10px;

‎src/scss/layouts/_blog.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
#blog {
2-
position: absolute;
3-
top: 0;
4-
left: 0;
52
width: 100%;
63
height: 100%;
7-
overflow-x: hidden;
84
}

‎static/css/style-c5yjx2losbmkttdif4mskx5f9pqjjquywurgngxfvceyyrtyatseix5hpd.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎static/css/style-h6ccsoet3mzkbb0wngshlfbaweimexgqcxj0h5hu4h82olsdzz6wmqdkajm.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)