Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
GaelGirodon committed Dec 2, 2018
2 parents 60b581d + be35789 commit 415ec6a
Show file tree
Hide file tree
Showing 9 changed files with 379 additions and 391 deletions.
36 changes: 28 additions & 8 deletions Gopkg.lock

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

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

[[constraint]]
name = "github.com/gobuffalo/packr"
version = "1.15.1"
version = "1.21.5"

[[constraint]]
name = "github.com/phayes/freeport"
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ where your disk space has gone to help you to clean it up.
### CLI usage

```shell
dirstat --port 8000
dirstat [--port 8000]
```

## Development
Expand All @@ -33,7 +33,7 @@ Install global dependencies:
- NPM >= 5
- Go >= 1.11
- [Dep](https://github.com/golang/dep) >= 0.5.0
- [Packr](https://github.com/gobuffalo/packr) >= 1.15
- [Packr](https://github.com/gobuffalo/packr) >= 1.21.5 (< 2.0.0)
- PowerShell

Then, install project dependencies:
Expand All @@ -57,7 +57,9 @@ npm run package
### Release

1. Start the release: `git flow release start X.Y.Z`
2. Update the version number in [`package.json`](package.json)
2. Update the version number in:
- [`package.json`](package.json) (+ `npm run ensure`)
- [`index.html`](web/index.html)
3. Commit changes: `git commit -m "Bump the version number"`
4. Finish the release: `git flow release finish X.Y.Z`
5. Push to the repository: `git push --all origin && git push --tags`
Expand Down
76 changes: 76 additions & 0 deletions assets/img/github-mark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions assets/sass/dirstat.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,15 @@ body {

div.container {
border-top: solid 1px #e5e5e5;
padding: 12px 4px;
}
.icon {
font-size: x-large;
padding: 16px 4px;

a img {
margin-top: -6px;
transition: opacity 0.15s ease;
}
a:hover img {
opacity: 0.75;
}
}
}

Expand Down
Loading

0 comments on commit 415ec6a

Please sign in to comment.