2
0
Эх сурвалжийг харах

Merge branch 'nztqa-improve-slider-color' into devel

Use theme color for Slider for Comments only. Thanks to nztqa! Closes #1274
Lauri Ojansivu 7 жил өмнө
parent
commit
3bee5ad7fe

+ 8 - 0
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:

+ 11 - 0
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

+ 8 - 7
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