Skip to content

Commit

Permalink
Merge pull request #527 from kakawait/buggy-overflow
Browse files Browse the repository at this point in the history
Remove overflow on blog class
  • Loading branch information
kakawait committed Oct 6, 2021
2 parents 9e4df46 + 0d62294 commit 295d0fb
Show file tree
Hide file tree
Showing 15 changed files with 72 additions and 19 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## [0.5.3-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/27) - 06 oct 2021

- Fix top/bottom bar behavior when scrolling ([#520](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/520))

## [0.5.2-BETA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/25) - 08 sep 2021

- 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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ How can I migrate my current version? Please read [CHANGELOG.md](https://github.
## General

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

## Features
Expand Down
6 changes: 3 additions & 3 deletions docs/developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ If you want to report a bug or ask a question, [create an issue](https://github.

## General ##

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

## Requirements ##

Expand Down
2 changes: 1 addition & 1 deletion docs/user.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
## General

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

## Features
Expand Down
2 changes: 1 addition & 1 deletion exampleSite/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tranquilpeak
# Version : 0.5.2-BETA
# Version : 0.5.3-BETA
# Author : Thibaud Leprêtre

# I STRONGLY recommend you to use a CDN to speed up loading of pages.
Expand Down
4 changes: 2 additions & 2 deletions exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: "Welcome to Tranquilpeak 0.5.2-BETA"
title: "Welcome to Tranquilpeak 0.5.3-BETA"
date: 2015-06-15
categories:
- tranquilpeak
Expand Down Expand Up @@ -57,7 +57,7 @@ How can I migrate my current version? Please read [CHANGELOG.md](https://github.
## General

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

## Features
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
{{ end }}
<!--EXTERNAL STYLES END-->
<!--STYLES-->
<link rel="stylesheet" href="{{ "css/style-c5yjx2losbmkttdif4mskx5f9pqjjquywurgngxfvceyyrtyatseix5hpd.min.css" | absURL }}" />
<link rel="stylesheet" href="{{ "css/style-h6ccsoet3mzkbb0wngshlfbaweimexgqcxj0h5hu4h82olsdzz6wmqdkajm.min.css" | absURL }}" />
<!--STYLES END-->
{{ range .Site.Params.customCSS }}
{{ if isset . "href" }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/meta.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.5.2-BETA">
<meta name="generator" content="Hugo {{ hugo.Version }} with theme Tranquilpeak 0.5.3-BETA">
<meta name="author" content="{{ .Site.Author.name }}">
<meta name="keywords" content="{{ with .Keywords }}{{ delimit . ", " }}{{ end }}{{ if .Site.Params.keywords }}, {{ delimit .Site.Params.keywords ", " }}{{ end }}">
<meta name="description" content="{{ if .Description }}{{ .Description }}{{ else if .IsPage }}{{ .Summary }}{{ else }}{{ .Site.Params.description }}{{ end }}">
Expand Down
5 changes: 3 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hugo-tranquilpeak-theme",
"version": "0.5.2-BETA",
"version": "0.5.3-BETA",
"description": "A gorgeous responsive theme for Hugo blog framework",
"main": "Gruntfile.js",
"scripts": {
Expand Down Expand Up @@ -33,13 +33,13 @@
"eslint-config-google": "^0.14.0",
"grunt": "^1.4.1",
"grunt-cli": "^1.4.3",
"grunt-exec": "^3.0.0",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^4.0.0",
"grunt-contrib-uglify": "^5.0.1",
"grunt-contrib-watch": "^1.1.0",
"grunt-exec": "^3.0.0",
"grunt-sails-linker": "^1.0.4",
"grunt-sass": "^3.1.0",
"grunt-sync": "^0.8.2",
Expand Down
50 changes: 50 additions & 0 deletions release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#!/usr/bin/env bash

if [[ "$OSTYPE" == "darwin"* ]]; then
sed() {
gsed "$@"
}
date() {
gdate "$@"
}
fi

new_version="${1}"

if [[ -z "${new_version}" ]]; then
echo "Missing argument: version"
exit 1
fi

current_version="$(node -p "require('./package.json').version")"

echo "$current_version"

echo "Current version is: ${current_version}"
echo "New version will be: ${new_version}"
echo
read -p "Are you sure? [y/N] " -r

if [[ $REPLY =~ ^[Yy]$ ]]; then
# package.json
npm pkg set version=${new_version}
# package-lock.json
npm i
# meta.html
sed -i 's/\(generator" content="[^"]*\)'"${current_version}"'/\1'"${new_version}"'/' layouts/partials/meta.html
# first blog post
sed -i 's/\(title: "[^"]*'"\)${current_version}"'/\1'"${new_version}"'/' exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' exampleSite/content/posts/Welcome-to-the-new-Tranquilpeak.md
# config.toml
sed -i 's/\([#] Version : \)'"${current_version}"'/\1'"${new_version}"'/' exampleSite/config.toml
# user.md
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' docs/user.md
# developer.md
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' docs/developer.md
# README.md
sed -i 's/\(- \*\*Version\*\*: \)'"${current_version}"'/\1'"${new_version}"'/' README.md

npm run lint

echo "Do not forget to fill CHANGELOG.md"
fi
2 changes: 2 additions & 0 deletions src/scss/base/_base.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
html {
width: 100%;
height: 100%;
font-family: $font-family-base;
// equal to 10px, useful to use em and rem
font-size: 10px;
Expand Down
4 changes: 0 additions & 4 deletions src/scss/layouts/_blog.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#blog {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
overflow-x: hidden;
}

This file was deleted.

Large diffs are not rendered by default.

0 comments on commit 295d0fb

Please sign in to comment.