diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-04-11 15:09:27 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-04-11 15:09:27 +0300 |
commit | 9b961edb36d3aee3408076cb2c3e952ec8a49680 (patch) | |
tree | 07e7c5015731f3152aafc6f8eac3aa2ddf20a1ce | |
parent | b7ee0173ece6216dbb001002fe21f743ed721996 (diff) | |
parent | 82fc4d011f3c34f389b73c8fe69be592ffe91f7f (diff) | |
download | wekan-9b961edb36d3aee3408076cb2c3e952ec8a49680.tar.gz wekan-9b961edb36d3aee3408076cb2c3e952ec8a49680.tar.bz2 wekan-9b961edb36d3aee3408076cb2c3e952ec8a49680.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | client/components/boards/boardsList.styl | 4 | ||||
-rw-r--r-- | client/components/cards/cardDetails.styl | 4 | ||||
-rw-r--r-- | client/components/cards/checklists.styl | 2 | ||||
-rw-r--r-- | client/components/main/fonts.styl | 16 | ||||
-rw-r--r-- | client/components/settings/peopleBody.styl | 1 | ||||
-rw-r--r-- | client/components/settings/settingHeader.styl | 2 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | public/fonts/roboto-bold.woff | bin | 0 -> 71808 bytes | |||
-rw-r--r-- | public/fonts/roboto-bold.woff2 | bin | 0 -> 52056 bytes | |||
-rw-r--r-- | public/fonts/roboto-condensed-bold.woff | bin | 72900 -> 0 bytes | |||
-rw-r--r-- | public/fonts/roboto-condensed-light.woff | bin | 71528 -> 0 bytes | |||
-rw-r--r-- | public/fonts/roboto-regular.woff | bin | 0 -> 70236 bytes | |||
-rw-r--r-- | public/fonts/roboto-regular.woff2 | bin | 0 -> 51140 bytes | |||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
15 files changed, 25 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d445c2d6..f59e0f7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v0.82 2018-04-11 Wekan release + +- [Restore original font and font sizes. Admin panel people and version texts + to darker](https://github.com/wekan/wekan/commit/db74c86e555f45a5aaaef84d2f3d4128cec77782). + +Thanks to GitHub users apn3a and xet7 for their contributions. + # v0.81 2018-04-10 Wekan release This release adds the following new features: diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl index 6318ea94..80e47685 100644 --- a/client/components/boards/boardsList.styl +++ b/client/components/boards/boardsList.styl @@ -44,9 +44,9 @@ $spaceBetweenTiles = 16px line-height: 22px .board-list-item-desc - color: rgba(255, 255, 255, .5) + color: #fff display: block - font-size: 10px + font-size: 14px font-weight: 400 line-height: 18px diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 07f391c0..e5739a93 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -42,7 +42,7 @@ .card-details-title font-weight: bold - font-size: 1.30 em + font-size: 1.33em margin: 7px 0 0 padding: 0 @@ -85,7 +85,7 @@ flex-shrink: 1 .card-details-item-title - font-size: 14px + font-size: 16px color: #000 .card-label diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl index d0d87434..7b35488f 100644 --- a/client/components/cards/checklists.styl +++ b/client/components/cards/checklists.styl @@ -25,7 +25,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item line-height: 30px .title - font-size: 16px + font-size: 18px line-height: 30px .checklist-stat diff --git a/client/components/main/fonts.styl b/client/components/main/fonts.styl index 3744ab27..fc8c8f00 100644 --- a/client/components/main/fonts.styl +++ b/client/components/main/fonts.styl @@ -2,16 +2,16 @@ font-family: 'Roboto' font-style: normal font-weight: 400 - src: local('Roboto Consended Light'), - local('Roboto-Consended-Light'), - url('/fonts/roboto-condensed-light.woff') format('woff'), - url('/fonts/roboto-condensed-light.woff') format('woff') + src: local('Roboto'), + local('Roboto-Regular'), + url('/fonts/roboto-regular.woff2') format('woff2'), + url('/fonts/roboto-regular.woff') format('woff') @font-face font-family: 'Roboto' font-style: normal font-weight: 700 - src: local('Roboto Consended Bold'), - local('Roboto-Consended-Bold'), - url('/fonts/roboto-condensed-bold.woff2') format('woff'), - url('/fonts/roboto-condensed-bold.woff') format('woff') + src: local('Roboto Bold'), + local('Roboto-Bold'), + url('/fonts/roboto-bold.woff2') format('woff2'), + url('/fonts/roboto-bold.woff') format('woff') diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl index 76eb1d0a..84db44a7 100644 --- a/client/components/settings/peopleBody.styl +++ b/client/components/settings/peopleBody.styl @@ -4,6 +4,7 @@ table border-collapse: collapse; width: 100%; + color: #000; td, th border: 1px solid #d2d0d0; diff --git a/client/components/settings/settingHeader.styl b/client/components/settings/settingHeader.styl index 995ed26d..3699f180 100644 --- a/client/components/settings/settingHeader.styl +++ b/client/components/settings/settingHeader.styl @@ -22,4 +22,4 @@ + span display: inline-block margin-top: 1px - margin-right: 10px
\ No newline at end of file + margin-right: 10px diff --git a/package.json b/package.json index 34b7abce..56a7ddcc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.81.0", + "version": "0.82.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/public/fonts/roboto-bold.woff b/public/fonts/roboto-bold.woff Binary files differnew file mode 100644 index 00000000..6ec255f5 --- /dev/null +++ b/public/fonts/roboto-bold.woff diff --git a/public/fonts/roboto-bold.woff2 b/public/fonts/roboto-bold.woff2 Binary files differnew file mode 100644 index 00000000..f779b2c5 --- /dev/null +++ b/public/fonts/roboto-bold.woff2 diff --git a/public/fonts/roboto-condensed-bold.woff b/public/fonts/roboto-condensed-bold.woff Binary files differdeleted file mode 100644 index bcbb5281..00000000 --- a/public/fonts/roboto-condensed-bold.woff +++ /dev/null diff --git a/public/fonts/roboto-condensed-light.woff b/public/fonts/roboto-condensed-light.woff Binary files differdeleted file mode 100644 index b1638fea..00000000 --- a/public/fonts/roboto-condensed-light.woff +++ /dev/null diff --git a/public/fonts/roboto-regular.woff b/public/fonts/roboto-regular.woff Binary files differnew file mode 100644 index 00000000..f9a02e26 --- /dev/null +++ b/public/fonts/roboto-regular.woff diff --git a/public/fonts/roboto-regular.woff2 b/public/fonts/roboto-regular.woff2 Binary files differnew file mode 100644 index 00000000..cebe610d --- /dev/null +++ b/public/fonts/roboto-regular.woff2 diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index ef1f7d17..4ca834b2 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 66, + appVersion = 67, # Increment this for every release. - appMarketingVersion = (defaultText = "0.81.0~2018-04-10"), + appMarketingVersion = (defaultText = "0.82.0~2018-04-11"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |