Skip to content

Commit

Permalink
Merge pull request #103 from teamsnap/package-bugfix
Browse files Browse the repository at this point in the history
Package bugfix
  • Loading branch information
William Dingwall committed Feb 20, 2019
2 parents 54a0276 + 36edad1 commit 171ff6d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `Fixed` for any bug fixes.
- `Security`

## [2.13.6] - 2019-02-19

https://github.com/teamsnap/teamsnap-ui/pull/103

### Changed

- got rid of duplicate CSS and bumping version with "npm version" instead of manually

## [2.13.5] - 2019-02-19

https://github.com/teamsnap/teamsnap-ui/pull/102
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Once your user is created and added to the org this guide details the steps to p

* rebase and get your branch ahead of master
* then from your working branch
* Update the package.json version number: https://docs.npmjs.com/about-semantic-versioning
* Update CHANGELOG.md with npm version and release notes
* Commit Version and CHANGELOG
* Update the package.json version number `npm version [major|minor|patch] -m “commit message”`
* Update CHANGELOG.md with new npm version and release notes
* Commit CHANGELOG
* `git push origin branch-name`
* merge branch into master from git
* `git checkout master`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@teamsnap/teamsnap-ui",
"version": "2.13.5",
"version": "2.13.6",
"description": "a CSS component library for TeamSnap",
"main": "dist/js/index.js",
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion src/css/components/Tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
border-top-left-radius: 0;
border: 1px solid $cu-divider--light;
background: $cu-middleground;
font-size: $tu-base-fontSize;
box-shadow: $box-shadow-small;
font-style: normal;
font-size: $tu-base-fontSize;
Expand Down

0 comments on commit 171ff6d

Please sign in to comment.