Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e029c224
Commit
e029c224
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fades out the other boards when marking as done
parent
91500adf
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
7 deletions
+16
-7
app/assets/javascripts/boards/components/board.js.coffee
app/assets/javascripts/boards/components/board.js.coffee
+1
-0
app/assets/javascripts/boards/components/board_list.js.coffee
...assets/javascripts/boards/components/board_list.js.coffee
+6
-2
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+4
-0
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+4
-4
app/views/projects/boards/components/_card.html.haml
app/views/projects/boards/components/_card.html.haml
+1
-1
No files found.
app/assets/javascripts/boards/components/board.js.coffee
View file @
e029c224
...
...
@@ -7,6 +7,7 @@ Board = Vue.extend
clearSearch
:
->
this
.
query
=
''
computed
:
newDone
:
->
BoardsStore
.
state
.
done
isPreset
:
->
typeof
this
.
board
.
id
!=
'number'
ready
:
->
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/boards/components/board_list.js.coffee
View file @
e029c224
...
...
@@ -5,11 +5,10 @@ BoardList = Vue.extend
filters
:
Object
issues
:
Array
query
:
String
done
:
Object
data
:
->
scrollOffset
:
20
loadMore
:
false
computed
:
newDone
:
->
BoardsStore
.
state
.
done
methods
:
listHeight
:
->
this
.
$els
.
list
.
getBoundingClientRect
().
height
scrollHeight
:
->
this
.
$els
.
list
.
scrollHeight
...
...
@@ -19,6 +18,11 @@ BoardList = Vue.extend
setTimeout
=>
this
.
loadMore
=
false
,
2000
doneFilter
:
(
issue
)
->
if
this
.
boardId
is
'done'
and
this
.
done
?
.
issue
?
issue
.
id
is
this
.
done
.
issue
.
id
else
issue
customFilter
:
(
issue
)
->
returnIssue
=
issue
if
this
.
filters
.
author
?
.
id
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/boards.scss
View file @
e029c224
...
...
@@ -37,6 +37,10 @@
height
:
100%
;
padding-right
:
(
$gl-padding
/
2
);
padding-left
:
(
$gl-padding
/
2
);
&
.is-faded
{
opacity
:
.4
;
}
}
.board-inner
{
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/boards/components/_board.html.haml
View file @
e029c224
%board
{
"inline-template"
=>
true
,
"v-cloak"
=>
true
,
"v-for"
=>
"board in state.boards | orderBy 'index'"
,
":board"
=>
"board"
}
.board
{
":class"
=>
"{ 'is-draggable': !isPreset }"
}
.board
{
":class"
=>
"{ 'is-draggable': !isPreset
, 'is-faded': board.id != 'done' && newDone.issue
}"
}
.board-inner
%header
.board-inner-container.board-header
{
":class"
=>
"{ 'has-border': board.label }"
,
":style"
=>
"{ borderTopColor: board.label.backgroundColor }"
}
%h3
.board-title
...
...
@@ -18,10 +18,10 @@
%span
.sr-only
Clear search
=
icon
(
"times"
,
class:
"board-search-clear"
)
%board-list
{
"inline-template"
=>
true
,
":board-id"
=>
"board.id"
,
":issues"
=>
"board.issues"
,
":disabled"
=>
"#{current_user.nil?}"
,
":query"
=>
"query"
,
":filters"
=>
"filters"
}
%ul
.board-list
{
"v-el:list"
=>
true
,
":data-board"
=>
"boardId"
,
":class"
=>
"{ 'is-marking-done': boardId == 'done' &&
newD
one.board }"
}
%board-list
{
"inline-template"
=>
true
,
":board-id"
=>
"board.id"
,
":issues"
=>
"board.issues"
,
":disabled"
=>
"#{current_user.nil?}"
,
":query"
=>
"query"
,
":filters"
=>
"filters"
,
":done"
=>
"newDone"
}
%ul
.board-list
{
"v-el:list"
=>
true
,
":data-board"
=>
"boardId"
,
":class"
=>
"{ 'is-marking-done': boardId == 'done' &&
d
one.board }"
}
=
render
"projects/boards/components/card"
%issue-done
{
"inline-template"
=>
true
,
":done"
=>
"
newDone"
,
"v-if"
=>
"boardId == 'done' && newD
one.board"
}
%issue-done
{
"inline-template"
=>
true
,
":done"
=>
"
done"
,
"v-if"
=>
"boardId == 'done' && d
one.board"
}
.board-done
%p
This issue is currently in the following lists:
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/boards/components/_card.html.haml
View file @
e029c224
%li
.card
{
":data-issue"
=>
"issue.id"
,
"v-for"
=>
"issue in issues | filterBy query in 'title' | filterBy customFilter"
}
%li
.card
{
":data-issue"
=>
"issue.id"
,
"v-for"
=>
"issue in issues | filterBy query in 'title' | filterBy customFilter
| filterBy doneFilter
"
}
%h4
.card-title
%a
{
href:
"#"
,
":title"
=>
"issue.title"
}
{{ issue.title }}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment