Skip to content

Commit

Permalink
GitHub Flow migration
Browse files Browse the repository at this point in the history
Adapted to "GitHub Flow" [1] like documented in detail in the main task
issue svengreb/styleguide-git#9 [2].

[1]: https://guides.github.com/introduction/flow
[2]: https://guides.github.com/arcticicestudio/styleguide-git/issues/9

Co-authored-by: Sven Greb <development@svengreb.de>

Subtask of svengreb/styleguide-git#9
GH-180
  • Loading branch information
arcticicestudio committed Oct 4, 2021
1 parent ec1d0c4 commit 39db96d
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p align="center"><a href="https://www.nordtheme.com/ports/jetbrains" target="_blank"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/repository-hero.svg?sanitize=true"/></a></p>
<p align="center"><a href="https://www.nordtheme.com/ports/jetbrains" target="_blank"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/repository-hero.svg?sanitize=true"/></a></p>

<p align="center"><a href="https://www.nordtheme.com/docs/ports/jetbrains"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Docs&colorA=4c566a&colorB=88c0d0&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI%2BCiAgICA8cGF0aCBmaWxsPSIjZDhkZWU5IiBkPSJNMTMuNzQ2IDIuODEzYS42Ny42NyAwIDAgMC0uNTU5LS4xMzNMOCAzLjg0OGwtNS4xODgtMS4xOGEuNjY5LjY2OSAwIDAgMC0uNTcuMTMzLjY3Ny42NzcgMCAwIDAtLjI0Mi41MzF2OC4xMzNjLS4wMDguMzIuMjEuNTk4LjUyLjY2OGw1LjMzMiAxLjE5OWguMjk2bDUuMzMyLTEuMmEuNjY4LjY2OCAwIDAgMCAuNTItLjY2N1YzLjMzMmEuNjU5LjY1OSAwIDAgMC0uMjU0LS41MnpNMy4zMzIgNC4xNjhsNCAuODk4djYuNzY2bC00LS44OTh6bTkuMzM2IDYuNzY2bC00IC44OThWNS4wNjZsNC0uODk4em0wIDAiLz4KPC9zdmc%2BCg%3D%3D"/></a></p>

Expand Down Expand Up @@ -693,9 +693,9 @@ JetBrains announced a new feature for the platform that allows to [export editor

This feature greatly improves the installation process for Nord regarding the UX and version update handling compared to the manual installation and is the recommended method.

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-jetbrains/develop/assets/scrot-installation-plugin-browse-repositories.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-jetbrains/master/assets/scrot-installation-plugin-browse-repositories.png" /></p>

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-jetbrains/develop/assets/scrot-installation-plugin-search.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-jetbrains/master/assets/scrot-installation-plugin-search.png" /></p>

### Syntax

Expand Down Expand Up @@ -803,21 +803,21 @@ This also includes preprocessor language keywords for Sass and LESSCSS like `!de

## Features

A complete list of all implemented features can be found in the [README](https://github.com/arcticicestudio/nord-jetbrains/blob/develop/README.md#features) section.
A complete list of all implemented features can be found in the [README](https://github.com/arcticicestudio/nord-jetbrains/blob/master/README.md#features) section.

Detailed information about [features](https://github.com/arcticicestudio/nord-jetbrains/blob/develop/README.md#features), [supported plugins](https://github.com/arcticicestudio/nord-jetbrains/develop/README.md#plugins) and install instructions can be found in the [README](https://github.com/arcticicestudio/nord-jetbrains/blob/develop/README.md#installation) and in the [project wiki](https://github.com/arcticicestudio/nord-jetbrains/wiki).
Detailed information about [features](https://github.com/arcticicestudio/nord-jetbrains/blob/master/README.md#features), [supported plugins](https://github.com/arcticicestudio/nord-jetbrains/master/README.md#plugins) and install instructions can be found in the [README](https://github.com/arcticicestudio/nord-jetbrains/blob/master/README.md#installation) and in the [project wiki](https://github.com/arcticicestudio/nord-jetbrains/wiki).

**Full support for the community- and ultimate edition!** (@arcticicestudio, #1, eb127486)

All styles have been optimized to achieve a consistent and uniform coloring across languages.

![](https://raw.githubusercontent.com/arcticicestudio/nord-jetbrains/develop/assets/scrot-lang-java.png)
![](https://raw.githubusercontent.com/arcticicestudio/nord-jetbrains/master/assets/scrot-lang-java.png)

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/nord/repository-footer-separator.svg?sanitize=true" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/nord/repository-footer-separator.svg?sanitize=true" /></p>

<p align="center">Copyright &copy; 2016-present <a href="https://www.arcticicestudio.com" target="_blank">Arctic Ice Studio</a> and <a href="https://www.svengreb.de" target="_blank">Sven Greb</a></p>

<p align="center"><a href="https://github.com/arcticicestudio/nord-jetbrains/blob/develop/LICENSE.md"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=License&message=MIT&logoColor=eceff4&logo=github&colorA=4c566a&colorB=88c0d0"/></a></p>
<p align="center"><a href="https://github.com/arcticicestudio/nord-jetbrains/blob/master/LICENSE.md"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=License&message=MIT&logoColor=eceff4&logo=github&colorA=4c566a&colorB=88c0d0"/></a></p>

<!--
+------------------+
Expand Down
46 changes: 23 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><a href="https://www.nordtheme.com/ports/jetbrains" target="_blank"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/repository-hero.svg?sanitize=true"/></a></p>
<p align="center"><a href="https://www.nordtheme.com/ports/jetbrains" target="_blank"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/repository-hero.svg?sanitize=true"/></a></p>

<p align="center"><a href="https://github.com/arcticicestudio/nord-jetbrains/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Release&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0"/></a> <a href="https://www.nordtheme.com/docs/ports/jetbrains"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Docs&colorA=4c566a&colorB=88c0d0&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI%2BCiAgICA8cGF0aCBmaWxsPSIjZDhkZWU5IiBkPSJNMTMuNzQ2IDIuODEzYS42Ny42NyAwIDAgMC0uNTU5LS4xMzNMOCAzLjg0OGwtNS4xODgtMS4xOGEuNjY5LjY2OSAwIDAgMC0uNTcuMTMzLjY3Ny42NzcgMCAwIDAtLjI0Mi41MzF2OC4xMzNjLS4wMDguMzIuMjEuNTk4LjUyLjY2OGw1LjMzMiAxLjE5OWguMjk2bDUuMzMyLTEuMmEuNjY4LjY2OCAwIDAgMCAuNTItLjY2N1YzLjMzMmEuNjU5LjY1OSAwIDAgMC0uMjU0LS41MnpNMy4zMzIgNC4xNjhsNCAuODk4djYuNzY2bC00LS44OTh6bTkuMzM2IDYuNzY2bC00IC44OThWNS4wNjZsNC0uODk4em0wIDAiLz4KPC9zdmc%2BCg%3D%3D"/></a> <a href="https://github.com/arcticicestudio/nord-jetbrains/blob/develop/CHANGELOG.md#050"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Changelog&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0"/></a></p>
<p align="center"><a href="https://github.com/arcticicestudio/nord-jetbrains/releases/latest"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Release&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0"/></a> <a href="https://www.nordtheme.com/docs/ports/jetbrains"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Docs&colorA=4c566a&colorB=88c0d0&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI%2BCiAgICA8cGF0aCBmaWxsPSIjZDhkZWU5IiBkPSJNMTMuNzQ2IDIuODEzYS42Ny42NyAwIDAgMC0uNTU5LS4xMzNMOCAzLjg0OGwtNS4xODgtMS4xOGEuNjY5LjY2OSAwIDAgMC0uNTcuMTMzLjY3Ny42NzcgMCAwIDAtLjI0Mi41MzF2OC4xMzNjLS4wMDguMzIuMjEuNTk4LjUyLjY2OGw1LjMzMiAxLjE5OWguMjk2bDUuMzMyLTEuMmEuNjY4LjY2OCAwIDAgMCAuNTItLjY2N1YzLjMzMmEuNjU5LjY1OSAwIDAgMC0uMjU0LS41MnpNMy4zMzIgNC4xNjhsNCAuODk4djYuNzY2bC00LS44OTh6bTkuMzM2IDYuNzY2bC00IC44OThWNS4wNjZsNC0uODk4em0wIDAiLz4KPC9zdmc%2BCg%3D%3D"/></a> <a href="https://github.com/arcticicestudio/nord-jetbrains/blob/master/CHANGELOG.md#050"><img src="https://img.shields.io/github/release/arcticicestudio/nord-jetbrains.svg?style=flat-square&label=Changelog&logo=github&logoColor=eceff4&colorA=4c566a&colorB=88c0d0"/></a></p>

<p align="center"><a href="https://github.com/arcticicestudio/styleguide-markdown/releases/latest" target="_blank"><img src="https://img.shields.io/github/release/arcticicestudio/styleguide-markdown.svg?style=flat-square&label=Markdown%20Style%20Guide&colorA=4c566a&colorB=88c0d0&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzOSIgaGVpZ2h0PSIzOSIgdmlld0JveD0iMCAwIDM5IDM5Ij48cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiNEOERFRTkiIHN0cm9rZS13aWR0aD0iMyIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBkPSJNMS41IDEuNWgzNnYzNmgtMzZ6Ii8%2BPHBhdGggZmlsbD0iI0Q4REVFOSIgZD0iTTIwLjY4MyAyNS42NTVsNS44NzItMTMuNDhoLjU2Nmw1Ljg3MyAxMy40OGgtMS45OTZsLTQuMTU5LTEwLjA1Ni00LjE2MSAxMC4wNTZoLTEuOTk1em0tMi42OTYgMGwtMTMuNDgtNS44NzJ2LS41NjZsMTMuNDgtNS44NzJ2MS45OTVMNy45MzEgMTkuNWwxMC4wNTYgNC4xNnoiLz48L3N2Zz4%3D"/></a> <a href="https://github.com/arcticicestudio/styleguide-git/releases/latest" target="_blank"><img src="https://img.shields.io/github/release/arcticicestudio/styleguide-git.svg?style=flat-square&label=Git%20Style%20Guide&logoColor=eceff4&colorA=4c566a&colorB=88c0d0&logo=git"/></a></p>

Expand All @@ -10,7 +10,7 @@

<p align="center">Designed for a fluent and clear workflow based on the <a href="https://www.nordtheme.com">Nord</a> color palette.</p>

<p align="center"><a href="https://www.nordtheme.com/ports/jetbrains" target="_blank"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-overview-go.png"/></a></p>
<p align="center"><a href="https://www.nordtheme.com/ports/jetbrains" target="_blank"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-overview-go.png"/></a></p>

## Getting Started

Expand All @@ -24,33 +24,33 @@ Both the UI and editor theme can be easily installed as IDE plugin from the offi

Open **Settings****Plugins**, switch to the **Marketplace** tab and search for `Nord`.

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-plugins-installed.png"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-plugins-installed.png"/></p>

Click on the <kbd>Install</kbd> button and restart the IDE to finish the installation.

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-plugins-marketplace.png"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-plugins-marketplace.png"/></p>

#### Activation

##### UI Theme

To activate the UI theme go to **Settings****Appearance & Behavior****Appearance**, select `Nord` from the _Theme_ drop-down menu and <kbd>Apply</kbd> the change.

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-settings-appearance.png"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-settings-appearance.png"/></p>

#### Editor Theme

To activate the editor theme go to **Settings****Editor****Color Theme**, select `Nord` from the _Scheme_ drop-down menu and <kbd>Apply</kbd> the change.

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-settings-color-scheme.png"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-settings-color-scheme.png"/></p>

## Features

<p align="center"><strong>A unified UI and editor syntax element design provides a clutter-free and fluidly merging appearance.</strong><br /><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-overview-java-spring-boot.png"/></p>
<p align="center"><strong>A unified UI and editor syntax element design provides a clutter-free and fluidly merging appearance.</strong><br /><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-overview-java-spring-boot.png"/></p>

<p align="center"><strong>Themed UI elements provide a fluid and unobtrusive transition from the code editor to the IDE.</strong><br /><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/ui-test-components.png"/></p>
<p align="center"><strong>Themed UI elements provide a fluid and unobtrusive transition from the code editor to the IDE.</strong><br /><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/ui-test-components.png"/></p>

<p align="center"><strong>The editor color scheme supports a wide range of programming languages — From bundled plugins of both community and ultimate editions up to most popular third-party plugins.</strong><br /><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/ports/jetbrains/editor-syntax-java-enum.png"/></p>
<p align="center"><strong>The editor color scheme supports a wide range of programming languages — From bundled plugins of both community and ultimate editions up to most popular third-party plugins.</strong><br /><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/ports/jetbrains/editor-syntax-java-enum.png"/></p>

## Contributing

Expand All @@ -62,25 +62,25 @@ Please take a moment to read Nord's full [contributing guide][nord-contrib-guide

The guide also includes information about [minimal, complete, and verifiable examples][nord-contrib-guide-mcve] and other ways to contribute to the project like [improving existing issues][nord-contrib-guide-impr-issues] and [giving feedback on issues and pull requests][nord-contrib-guide-feedback].

<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/develop/assets/images/nord/repository-footer-separator.svg?sanitize=true" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/arcticicestudio/nord-docs/master/assets/images/nord/repository-footer-separator.svg?sanitize=true" /></p>

<p align="center">Copyright &copy; 2016-present <a href="https://www.arcticicestudio.com" target="_blank">Arctic Ice Studio</a> and <a href="https://www.svengreb.de" target="_blank">Sven Greb</a></p>

<p align="center"><a href="https://github.com/arcticicestudio/nord-jetbrains/blob/develop/LICENSE.md"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=License&message=MIT&logoColor=eceff4&logo=github&colorA=4c566a&colorB=88c0d0"/></a></p>
<p align="center"><a href="https://github.com/arcticicestudio/nord-jetbrains/blob/master/LICENSE.md"><img src="https://img.shields.io/static/v1.svg?style=flat-square&label=License&message=MIT&logoColor=eceff4&logo=github&colorA=4c566a&colorB=88c0d0"/></a></p>

[jb-plugin-repo-nord]: https://plugins.jetbrains.com/plugin/10321-nord-color-scheme
[nord-comm]: https://www.nordtheme.com/community
[nord-contrib-guide-branching]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#branch-organization
[nord-contrib-guide-bugs]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#bug-reports
[nord-contrib-guide-docs]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#documentations
[nord-contrib-guide-enhance]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#enhancement-suggestions
[nord-contrib-guide-feedback]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#give-feedback-on-issues-and-pull-requests
[nord-contrib-guide-impr-issues]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#improve-issues
[nord-contrib-guide-mcve]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#mcve
[nord-contrib-guide-pr]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#pull-requests
[nord-contrib-guide-styles]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#styleguides
[nord-contrib-guide-versioning]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md#versioning
[nord-contrib-guide]: https://github.com/arcticicestudio/nord/blob/develop/CONTRIBUTING.md
[nord-contrib-guide-branching]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#branch-organization
[nord-contrib-guide-bugs]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#bug-reports
[nord-contrib-guide-docs]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#documentations
[nord-contrib-guide-enhance]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#enhancement-suggestions
[nord-contrib-guide-feedback]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#give-feedback-on-issues-and-pull-requests
[nord-contrib-guide-impr-issues]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#improve-issues
[nord-contrib-guide-mcve]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#mcve
[nord-contrib-guide-pr]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#pull-requests
[nord-contrib-guide-styles]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#styleguides
[nord-contrib-guide-versioning]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md#versioning
[nord-contrib-guide]: https://github.com/arcticicestudio/nord/blob/master/CONTRIBUTING.md
[nord-docs-home-develop]: https://www.nordtheme.com/docs/ports/jetbrains/development
[nord-docs-home-install]: https://www.nordtheme.com/docs/ports/jetbrains/installation
[nord-docs-home]: https://www.nordtheme.com/docs/ports/jetbrains
Expand Down

0 comments on commit 39db96d

Please sign in to comment.