summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-07-01 17:23:41 -0400
committerLauri Ojansivu <x@xet7.org>2019-07-01 17:23:41 -0400
commit34b2168d0dda253dedabbee47031873efa4ae446 (patch)
tree274092388923e0e26cd483d5eedfc011bdd32d68 /client
parent2c90e7c585c6bcde9bf29c7d5ed54276b1ce082e (diff)
downloadwekan-34b2168d0dda253dedabbee47031873efa4ae446.tar.gz
wekan-34b2168d0dda253dedabbee47031873efa4ae446.tar.bz2
wekan-34b2168d0dda253dedabbee47031873efa4ae446.zip
Add Wekan v2.95-v2.97 master branch features and fixes to meteor-1.8 branch.
Thanks to xet7 !
Diffstat (limited to 'client')
-rw-r--r--client/components/boards/boardColors.styl142
-rw-r--r--client/components/boards/boardsList.styl1
-rw-r--r--client/components/cards/cardDetails.styl7
-rw-r--r--client/components/cards/minicard.jade5
-rw-r--r--client/components/cards/minicard.styl9
-rw-r--r--client/components/lists/list.styl4
-rw-r--r--client/components/sidebar/sidebar.jade1
7 files changed, 166 insertions, 3 deletions
diff --git a/client/components/boards/boardColors.styl b/client/components/boards/boardColors.styl
index 233659ca..8c7af037 100644
--- a/client/components/boards/boardColors.styl
+++ b/client/components/boards/boardColors.styl
@@ -87,3 +87,145 @@ setBoardColor(color)
.board-color-pumpkin
setBoardColor(#E67E22)
+
+.board-color-moderatepink
+ setBoardColor(#CD5A91)
+
+.board-color-strongcyan
+ setBoardColor(#00AECC)
+
+.board-color-limegreen
+ setBoardColor(#4BBF6B)
+
+.board-color-dark
+ setBoardColor(#2C3E51)
+
+ /* Not hidden in dark mode.
+ card fields: received, start, due, end, members, requested, assigned
+ .card-details-item.card-details-item-received,
+ .card-details-item.card-details-item-start,
+ .card-details-item.card-details-item-due,
+ .card-details-item.card-details-item-end,
+ .card-details-item.card-details-item-members,
+ .card-details-item.card-details-item-name { display:none; }
+ .card-details-items:empty { display:none; }
+ */
+
+ // DARK MODE, when dark background mode selected.
+ // Modified version from https://github.com/wekan/wekan/wiki/Custom-CSS-themes#dark-theme
+ // In progress, please send pull requests to fix remaining visibility issues.
+ .ui-sortable,
+ .swimlane,
+ .swimlane >.swimlane-header-wrap,
+ .swimlane >.list.js-list,
+ .swimlane >.list-composer.js-list-composer,
+ .list-body,
+ .list,
+ .list-composer,
+ .sidebar-content,
+ .card-details
+ background-color:#2C3E50
+
+ .card-details h3,
+ .card-details-items,
+ .card-checklist-items .ui-sortable,
+ .card-subtasks-items,
+ .activities,
+ .material-toggle-switch
+ color:#bbbbbb
+
+ .list-header
+ background-color: #888888
+
+ .board-widget,
+ .board-widget-labels,
+ .board-widget-members
+ color: #aaaaaa
+
+ /* popup menu titles (boards, swimlanes, lists, cards, labels) */
+ .pop-over >.header
+ display:none;
+
+ /* HIDE UNTIL HOVER -------------------------------------------------- */
+
+ /* header "+" button */
+ #header-quick-access .fa-plus
+ display:none
+ #header-quick-access:hover .fa-plus
+ display:inherit
+
+ /* "add card" links (use visibility rather than display so items don't jump) */
+ .open-minicard-composer
+ visibility:hidden
+
+ .list.js-list:hover .open-minicard-composer
+ visibility:visible
+
+ .list-header-menu
+ visibility:hidden
+
+ .list.js-list:hover .list-header-menu
+ visibility:visible
+
+ /* "add list/swimlane" links (use visibility rather than display so items don't jump) */
+ .list.js-list-composer >.list-header
+ visibility:hidden
+
+ .list.js-list-composer:hover >.list-header
+ visibility:visible
+
+ /* headers */
+ #header-quick-access, #header
+ background-color:rgba(0,0,0,.75) !important
+
+ #header .board-header-btn:hover
+ background-color:rgba(255,255,255,0.3) !important
+
+ /* foregrounds: swimlanes, lists */
+ .list >.list-header, .swimlane-header
+ color:rgba(255,255,255,.7)
+
+ /* minicards */
+ .minicard
+ background-color:rgba(255,255,255,.4)
+
+ .minicard-wrapper.is-selected .minicard,
+ .minicard:hover,
+ .minicard-composer.js-composer,
+ .open-minicard-composer:hover
+ background-color:rgba(255,255,255,.8) !important
+ color:#000
+
+ .minicard, .minicard .badge
+ color:#fff
+
+ .minicard:hover .badge, .minicard-wrapper.is-selected .badge
+ color:#000
+
+ /* cards */
+ .card-details .card-details-header
+ background-color:#ccc
+
+ /* sidebar */
+ .sidebar-tongue, .sidebar-shadow
+ background-color:#666 !important
+
+ .sidebar-content h3, .sidebar-content h2, .sidebar-content
+ color:rgba(255,255,255,.7) !important
+
+.board-color-relax
+ setBoardColor(#27AE61)
+
+ // RELAX MODE: light green backgroud, when green background color selected.
+ .ui-sortable
+ background-color:#a7e366
+
+ .list-header
+ background-color:#a7e366
+ border-bottom: 6px solid #a7e366
+
+ .list-body
+ background-color:#a7e366
+
+ .list
+ border-left: 1px dotted #000000
diff --git a/client/components/boards/boardsList.styl b/client/components/boards/boardsList.styl
index 42cb354d..93da4bc2 100644
--- a/client/components/boards/boardsList.styl
+++ b/client/components/boards/boardsList.styl
@@ -161,6 +161,7 @@ $spaceBetweenTiles = 16px
padding-right: 6px
.background-box
+ color: white
border-radius: 3px
background-size: cover
display: block
diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl
index c1d6b7e1..bafaa94b 100644
--- a/client/components/cards/cardDetails.styl
+++ b/client/components/cards/cardDetails.styl
@@ -86,6 +86,11 @@
display: flex
flex-wrap: wrap
margin: 15px 0
+ & ~ .js-open-inlined-form
+ .viewer
+ background-color #ffffff !important
+ padding 15px !important
+ border 1px solid #000000 !important
.card-details-item
margin-right: 0.5em
@@ -134,7 +139,7 @@ input[type="submit"].attachment-add-link-submit
.card-details-canvas
width: 100%
padding-left: 0px;
-
+
.card-details-header
.close-card-details
margin-right: 0px
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade
index 442d3c6c..bc362982 100644
--- a/client/components/cards/minicard.jade
+++ b/client/components/cards/minicard.jade
@@ -74,7 +74,10 @@ template(name="minicard")
if comments.count
.badge(title="{{_ 'card-comments-title' comments.count }}")
span.badge-icon.fa.fa-comment-o.badge-comment
- span.badge-text= comments.count
+ = ' '
+ = comments.count
+ //span.badge-comment.badge-text
+ //| {{_ 'comment'}}
if getDescription
.badge.badge-state-image-only(title=getDescription)
span.badge-icon.fa.fa-align-left
diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl
index e3d1ff20..1a1516e5 100644
--- a/client/components/cards/minicard.styl
+++ b/client/components/cards/minicard.styl
@@ -144,7 +144,14 @@
.badge-text
vertical-align: middle
&.badge-comment
- margin-bottom: 0.1rem
+ display: block
+ border-radius: 4px
+ padding: 1px 3px
+ margin-bottom: 0.3rem
+ color: #ff0000
+ background-color: #ffffff
+ font-weight: bold
+ font-size: 11pt
.badge-text
font-size: 0.9em
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl
index 05da07e1..81938c1a 100644
--- a/client/components/lists/list.styl
+++ b/client/components/lists/list.styl
@@ -103,6 +103,10 @@
color: #8c8c8c
font-size: 0.8em
+.list-header .list-header-plus-icon, .js-open-list-menu, .list-header-menu a
+ color #4d4d4d
+ padding-left 4px
+
.list-body
flex: 1 1 auto
flex-direction: column
diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 10081a81..f44a334c 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -61,6 +61,7 @@ template(name="boardChangeColorPopup")
each backgroundColors
.board-background-select.js-select-background
span.background-box(class="board-color-{{this}}")
+ span {{this}}
if isSelected
i.fa.fa-check