Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/AngeloStavrow/indigo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelo Stavrow <contact@angelostavrow.com>2018-10-25 18:49:11 +0300
committerGitHub <noreply@github.com>2018-10-25 18:49:11 +0300
commit760891ceb7957a905ac3af3efa76a5ca46de69c8 (patch)
tree949ffd45dae2ad3674ae91d47960e9769276d06d
parent26e4a96cfa635ee15ed86b65a516daf8379424ff (diff)
parentce2f570fc5f84680fec65178a5f595a5272e5b85 (diff)
Merge branch 'master' into 21-broken-div-in-404-html
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md35
-rw-r--r--.github/ISSUE_TEMPLATE/feature_request.md17
-rw-r--r--CHANGELOG.md7
-rw-r--r--CODE_OF_CONDUCT.md46
-rw-r--r--CONTRIBUTING.md81
-rw-r--r--PULL_REQUEST_TEMPLATE.md13
-rw-r--r--config.toml.example4
-rw-r--r--exampleSite/config.toml4
-rw-r--r--layouts/404.html2
-rw-r--r--layouts/partials/header.html2
-rw-r--r--layouts/partials/social.html10
-rw-r--r--static/icons/linkedin.svg1
-rw-r--r--static/icons/medium.svg1
13 files changed, 141 insertions, 82 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..b735373
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..066b2d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 517601a..39a72da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
+### Added
+- Users can now add their Medium and LinkedIn accounts as social networks, thanks to [@RicardoBelchior](https://github.com/RicardoBelchior)
+
+### Changed
+- Clearer process for contributing to the project ([#28](https://github.com/AngeloStavrow/indigo/issues/28))
+
### Fixed
- Better instructions for users that prefer a little more YAML in their lives, thanks to [@zwbetz-gh](https://github.com/zwbetz-gh)!
- Fix for broken content div in 404.html ([#21](https://github.com/AngeloStavrow/indigo/issues/21))
+- The `src` URL for the site logo had an extra `/`, and now it doesn't, thanks to [@michimani](https://github.com/michimani)!
## [1.0.3]
### Added
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..a7cfb16
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant 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.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@angelostavrow.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8059e5c..bb0eded 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,86 +5,11 @@ 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.
+with the project. You can find it [here](https://github.com/AngeloStavrow/indigo/blob/master/CODE_OF_CONDUCT.md)
## Pull Request Process
1. Please start by [opening an issue](https://github.com/AngeloStavrow/indigo/issues/new) describing what you'd like to change. Remember to search first, to avoid having it closed as a duplicate.
-2. Make the changes discussed. Ensure that the theme builds and continues to function as expected. Place high value on page-load speed and responsive design.
+2. Make the changes discussed. Ensure that the theme builds and continues to function as expected; you can also try building the [theme gallery to test further](https://github.com/gohugoio/hugoThemes/blob/master/README.md). Place high value on page-load speed and responsive design.
3. Update the README with any new site/page parameters as necessary. If you've added new dependencies, make sure to list them too.
-4. Open a pull request and reference it in the issue you opened in step 1. Changes will be tested and, when everything's good to go, will be merged in by the project principals.
-
-## 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.
-
-### Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-### Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file
+4. Open a pull request and include the issue you opened in step 1 as part of the PR. Changes will be tested and, when everything's good to go, will be merged in by the project principals. \ No newline at end of file
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..761b8d4
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+**Related Issue**
+This PR's content was first discussed in issue #
+
+**Dependency Changes**
+If relevant, list any dependencies added, removed, or changed.
+
+**Testing**
+- [ ] Built and tested to work on a standalone Hugo site
+- [ ] Built and tested to work in the Hugo Theme Gallery demo site ([link](https://github.com/gohugoio/hugoThemes/blob/master/README.md))
+- [ ] Tested with browser's responsive-design tools
+
+**Additional context**
+Add any other context about the pull request here.
diff --git a/config.toml.example b/config.toml.example
index cc66b3b..5e9e402 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -21,6 +21,8 @@ theme = "indigo"
GitLabUser = "GitLabUserName"
GlitchUser = "GlitchUserName"
KeybaseUser = "KeybaseUserName"
+ LinkedInUser = "LinkedInUserName"
+ MediumUser = "MediumUserName"
MicroBlogUser = "MicroBlogUserName"
RedditUser = "RedditUserName"
StackOverflowUser = "StackOverflowUserName"
@@ -36,4 +38,4 @@ theme = "indigo"
TwitterUser = "TwitterUserName"
MicroBlogUser = "MicroBlogUserName"
Country = "CountryName"
- City = "CityName" \ No newline at end of file
+ City = "CityName"
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 4b41519..af98cdb 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -22,6 +22,8 @@ paginate = 3
GitLabUser = "GitLabUserName"
GlitchUser = "GlitchUserName"
KeybaseUser = "KeybaseUserName"
+ LinkedInUser = "LinkedInUserName"
+ MediumUser = "MediumUserName"
MicroBlogUser = "MicroBlogUserName"
RedditUser = "RedditUserName"
StackOverflowUser = "StackOverflowUserName"
@@ -37,4 +39,4 @@ paginate = 3
TwitterUser = "TwitterUserName"
MicroBlogUser = "MicroBlogUserName"
Country = "CountryName"
- City = "CityName" \ No newline at end of file
+ City = "CityName"
diff --git a/layouts/404.html b/layouts/404.html
index f160774..0a58c13 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -3,7 +3,7 @@
{{ partial "head.html" . }}
<body>
<div id="sitelogo">
- <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}/images/site-logo.svg" alt="Site Logo" height="64px" width="64px"></a>
+ <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}images/site-logo.svg" alt="Site Logo" height="64px" width="64px"></a>
</div>
<header>
{{ partial "pagenav.html" . }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f6c390c..fa0018f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,7 +3,7 @@
{{ partial "head.html" . }}
<body>
<div id="sitelogo">
- <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}/images/site-logo.svg" alt="Site Logo" height="64px" width="64px"></a>
+ <a class="glyph" alt="Home" href="{{ .Site.BaseURL }}"><img src="{{ .Site.BaseURL }}images/site-logo.svg" alt="Site Logo" height="64px" width="64px"></a>
</div>
<header>
{{ partial "pagenav.html" . }}
diff --git a/layouts/partials/social.html b/layouts/partials/social.html
index 53d98ff..cf9a08a 100644
--- a/layouts/partials/social.html
+++ b/layouts/partials/social.html
@@ -35,6 +35,16 @@
<a class="glyph" alt="Keybase profile" href="https://keybase.io/{{ .Site.Params.KeybaseUser }}"><img src="{{ .Site.BaseURL }}icons/keybase.svg" height="24px" width="24px"></a>
</div>
{{ end }}
+ {{ if isset .Site.Params "linkedinuser" }}
+ <div class="icon-24x24">
+ <a class="glyph" alt="LinkedIn profile" href="https://www.linkedin.com/in/{{ .Site.Params.LinkedInUser }}"><img src="{{ .Site.BaseURL }}icons/linkedin.svg" height="24px" width="24px"></a>
+ </div>
+ {{ end }}
+ {{ if isset .Site.Params "mediumuser" }}
+ <div class="icon-24x24">
+ <a class="glyph" alt="Medium profile" href="https://medium.com/{{ .Site.Params.MediumUser }}"><img src="{{ .Site.BaseURL }}icons/medium.svg" height="24px" width="24px"></a>
+ </div>
+ {{ end }}
{{ if isset .Site.Params "microbloguser" }}
<div class="icon-24x24">
<a class="glyph" alt="Micro.Blog profile" href="https://micro.blog/{{ .Site.Params.MicroBlogUser }}"><img src="{{ .Site.BaseURL }}icons/microblog.svg" height="24px" width="24px"></a>
diff --git a/static/icons/linkedin.svg b/static/icons/linkedin.svg
new file mode 100644
index 0000000..cd55f45
--- /dev/null
+++ b/static/icons/linkedin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path style="fill:#3f3f3f" d="M19 0h-14c-2.761 0-5 2.239-5 5v14c0 2.761 2.239 5 5 5h14c2.762 0 5-2.239 5-5v-14c0-2.761-2.238-5-5-5zm-11 19h-3v-11h3v11zm-1.5-12.268c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zm13.5 12.268h-3v-5.604c0-3.368-4-3.113-4 0v5.604h-3v-11h3v1.765c1.396-2.586 7-2.777 7 2.476v6.759z"/></svg>
diff --git a/static/icons/medium.svg b/static/icons/medium.svg
new file mode 100644
index 0000000..2ad9fb4
--- /dev/null
+++ b/static/icons/medium.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><path style="fill:#3f3f3f" d="M2.846 6.887c.03-.295-.083-.586-.303-.784l-2.24-2.7v-.403h6.958l5.378 11.795 4.728-11.795h6.633v.403l-1.916 1.837c-.165.126-.247.333-.213.538v13.498c-.034.204.048.411.213.537l1.871 1.837v.403h-9.412v-.403l1.939-1.882c.19-.19.19-.246.19-.537v-10.91l-5.389 13.688h-.728l-6.275-13.688v9.174c-.052.385.076.774.347 1.052l2.521 3.058v.404h-7.148v-.404l2.521-3.058c.27-.279.39-.67.325-1.052v-10.608z"/></svg>