diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-10-04 20:45:42 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-10-04 20:45:42 +0300 |
| commit | 3bee5ad7fee063044b1d2f7df2b2950f594e6466 (patch) | |
| tree | d86b29d537355ee314112e4ec0d1d66402b2bb3c | |
| parent | bab02bf8fa477418eb1e861896d4a1600f027011 (diff) | |
| parent | 296520f9ace6e423e94d2c137cd0387ea589b998 (diff) | |
| download | wekan-3bee5ad7fee063044b1d2f7df2b2950f594e6466.tar.gz wekan-3bee5ad7fee063044b1d2f7df2b2950f594e6466.tar.bz2 wekan-3bee5ad7fee063044b1d2f7df2b2950f594e6466.zip | |
Merge branch 'nztqa-improve-slider-color' into devel
Use theme color for Slider for Comments only. Thanks to nztqa! Closes #1274
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | client/components/boards/boardColors.styl | 11 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.jade | 15 |
3 files changed, 27 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e5f2c3..90d67400 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release adds the following new features: + +* [Use theme color for Slider for Comments only](https://github.com/wekan/wekan/pull/1275). + +Thanks to Github user nztqa for contributions. + # v0.46 2017-10-03 Wekan release This release adds the following new features: diff --git a/client/components/boards/boardColors.styl b/client/components/boards/boardColors.styl index 8e28fcfa..57a121a2 100644 --- a/client/components/boards/boardColors.styl +++ b/client/components/boards/boardColors.styl @@ -51,6 +51,17 @@ setBoardColor(color) &:not(.is-checked) + .minicard:hover:not(.minicard-composer) background: lighten(color, 97%) + .toggle-label + + &:after + background-color: darken(color, 20%) + + .toggle-switch:checked ~ .toggle-label + background-color: lighten(color, 20%) + + &:after + background-color: darken(color, 20%) + @media screen and (max-width: 800px) &.pop-over .header background: color diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index caea222f..ce93d6fd 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -87,13 +87,14 @@ template(name="cardDetails") hr .activity-title h2 {{ _ 'activity'}} - .material-toggle-switch - span.toggle-switch-title {{_ 'hide-system-messages'}} - if hiddenSystemMessages - input.toggle-switch(type="checkbox" id="toggleButton" checked="checked") - else - input.toggle-switch(type="checkbox" id="toggleButton") - label.toggle-label(for="toggleButton") + if currentUser.isBoardMember + .material-toggle-switch + span.toggle-switch-title {{_ 'hide-system-messages'}} + if hiddenSystemMessages + input.toggle-switch(type="checkbox" id="toggleButton" checked="checked") + else + input.toggle-switch(type="checkbox" id="toggleButton") + label.toggle-label(for="toggleButton") if currentUser.isBoardMember +commentForm if isLoaded.get |