diff options
author | Pablo Martin Viva <pmviva@gmail.com> | 2018-04-01 21:41:06 +0300 |
---|---|---|
committer | Pablo Martin Viva <pmviva@gmail.com> | 2018-04-01 21:41:06 +0300 |
commit | 582fc94dac0f1f3632004fb788ed85928bda77d3 (patch) | |
tree | 8cd2ad5a21217d4fa4bb2986be5082ec4d35128c | |
parent | abf94846d1cda6902f857c9c4f54ac7fcee8432d (diff) | |
parent | 90ad2844011f715ecb089a229656865916c43fbb (diff) |
Merge remote-tracking branch 'origin/fix-title-in-head-tag' into use-absurl-and-relurl-functions
-rw-r--r-- | CONTRIBUTING.md | 71 | ||||
-rw-r--r-- | layouts/partials/htmlhead.html | 3 | ||||
-rw-r--r-- | package.json | 2 |
3 files changed, 73 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..6eb36fc --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,71 @@ +# Contributing + +When contributing to this repository, please first discuss the change you wish to make via issue, +email, or any other method with the owners of this repository before making a change. + +Please note we have a code of conduct, please follow it in all your interactions with the project. + +## Pull Request Process + +1. Ensure any install or build dependencies are removed before the end of the layer when doing a + build. +2. Update the README.md with details of changes to the interface, this includes new environment + variables, exposed ports, useful file locations and container parameters. +3. Increase the version numbers in any examples files and the README.md to the new version that this + Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/). +4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you + do not have permission to do that, you may request the second reviewer to merge it for you. + +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. diff --git a/layouts/partials/htmlhead.html b/layouts/partials/htmlhead.html index 9fee923..1cc6df2 100644 --- a/layouts/partials/htmlhead.html +++ b/layouts/partials/htmlhead.html @@ -6,8 +6,7 @@ --> <html> <head> - <title>{{ if not .IsHome }} {{ .Title }} · {{ end }} {{ .Site.Title }}</title> - <title>{{ .Title }}</title> + <title>{{ if eq (.Site.Title) (.Title) }}{{ .Site.Title }}{{ else }}{{ .Title }} · {{ .Site.Title }}{{ end }}</title> <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> <link rel="stylesheet" href='{{ "assets/css/main.css" | absURL }}' /> diff --git a/package.json b/package.json index 5c298be..5daa7de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-theme-massively", - "version": "0.6.0", + "version": "1.0.0", "description": "HTML5 UP theme Massively for Hugo", "main": "index.js", "scripts": { |