diff options
author | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2018-03-22 11:04:03 +0000 |
commit | 2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953 (patch) | |
tree | 1ed85940487b28510f4038923febac6f5ee453c6 /app/views/shared/boards/components/_board.html.haml | |
parent | 4d0ec5b1284e45f9b927d354d6408cf174ad243b (diff) | |
parent | d68ddc8366dec3a9aed357c96446a43d36e5de43 (diff) | |
download | gitlab-ce-2eab1fd2c9a7db1f9cc71a706c5ac0cfdc61c953.tar.gz |
Merge branch 'master' into 'latest-security-to-master-21-03-18'
# Conflicts:
# Gemfile
# Gemfile.lock
Diffstat (limited to 'app/views/shared/boards/components/_board.html.haml')
-rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index 2e9ad380012..149bf8da4b9 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -4,7 +4,7 @@ %header.board-header{ ":class" => '{ "has-border": list.label && list.label.color }', ":style" => "{ borderTopColor: (list.label && list.label.color ? list.label.color : null) }", "@click" => "toggleExpanded($event)" } %h3.board-title.js-board-handle{ ":class" => '{ "user-can-drag": (!disabled && !list.preset) }' } %i.fa.fa-fw.board-title-expandable-toggle{ "v-if": "list.isExpandable", - ":class": "{ \"fa-caret-down\": list.isExpanded, \"fa-caret-right\": !list.isExpanded && list.position === -1, \"fa-caret-left\": !list.isExpanded && list.position !== -1 }", + ":class": "{ \"fa-caret-down\": list.isExpanded, \"fa-caret-right\": !list.isExpanded }", "aria-hidden": "true" } %span.board-title-text.has-tooltip{ "v-if": "list.type !== \"label\"", |