diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-01-25 20:02:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 20:02:26 +0200 |
| commit | 8fbd47e1995626624a1007e300dda1d95a74260c (patch) | |
| tree | 3eb84007789d51549b6fb77fffb8aecf1a5f92f2 | |
| parent | 6aaf0c812a14a3a3cde7ad237a6451c5f10c61ea (diff) | |
| parent | 33977b2282d8891bf507c4d9a1502c644afd6352 (diff) | |
| download | wekan-8fbd47e1995626624a1007e300dda1d95a74260c.tar.gz wekan-8fbd47e1995626624a1007e300dda1d95a74260c.tar.bz2 wekan-8fbd47e1995626624a1007e300dda1d95a74260c.zip | |
Merge pull request #2130 from bentiss/color-lists
lists-color: only colorize the bottom border
| -rw-r--r-- | client/components/lists/list.styl | 12 | ||||
| -rw-r--r-- | client/components/lists/listHeader.jade | 3 | ||||
| -rw-r--r-- | client/components/swimlanes/swimlanes.jade | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index c12a2c73..51ade73c 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -46,11 +46,19 @@ .list-header-card-count height: 35px +.list-header-add + flex: 0 0 auto + padding: 20px 12px 4px + position: relative + min-height: 20px + .list-header flex: 0 0 auto padding: 20px 12px 4px position: relative min-height: 20px + background-color: #e4e4e4; + border-bottom: 6px solid #e4e4e4; &.ui-sortable-handle @@ -204,9 +212,7 @@ overflow: hidden list-header-color(background, color...) - background: background !important - if color - color: color !important //overwrite text for better visibility + border-bottom: 6px solid background .list-header-white list-header-color(#ffffff, #4d4d4d) //Black text for better visibility diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index eafcc510..aa6d3786 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -120,7 +120,8 @@ template(name="wipLimitErrorPopup") template(name="setListColorPopup") form.edit-label .palette-colors: each colors - span.card-label.palette-color.js-palette-color(class="list-header-{{color}}") + // note: we use the swimlane palette to have more than just the border + span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}") if(isSelected color) i.fa.fa-check button.primary.confirm.js-submit {{_ 'save'}} diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index cd864a7c..ad61466e 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -38,7 +38,7 @@ template(name="listsGroup") template(name="addListForm") .list.list-composer.js-list-composer - .list-header + .list-header-add +inlinedForm(autoclose=false) input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}" autocomplete="off" autofocus) |