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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a9c98be0
Commit
a9c98be0
authored
Oct 04, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved form outside of list
This was causing issues with moving from the done list
parent
674844d0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
23 deletions
+32
-23
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+2
-2
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+9
-1
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+21
-20
No files found.
app/assets/javascripts/boards/components/board_list.js.es6
View file @
a9c98be0
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
disabled: this.disabled,
disabled: this.disabled,
filter: '.board-list-count, .board-new-issue-form',
filter: '.board-list-count, .board-new-issue-form',
onStart: (e) => {
onStart: (e) => {
const card = this.$refs.issue[e.oldIndex
- 1
];
const card = this.$refs.issue[e.oldIndex];
Store.moving.issue = card.issue;
Store.moving.issue = card.issue;
Store.moving.list = card.list;
Store.moving.list = card.list;
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
},
},
onRemove: (e) => {
onRemove: (e) => {
this.$refs.issue[e.oldIndex
- 1
].$destroy(true);
this.$refs.issue[e.oldIndex].$destroy(true);
}
}
});
});
...
...
app/assets/stylesheets/pages/boards.scss
View file @
a9c98be0
...
@@ -162,6 +162,10 @@ lex
...
@@ -162,6 +162,10 @@ lex
list-style
:
none
;
list-style
:
none
;
overflow-y
:
scroll
;
overflow-y
:
scroll
;
overflow-x
:
hidden
;
overflow-x
:
hidden
;
&
.is-smaller
{
height
:
calc
(
100%
-
185px
);
}
}
}
.board-list-loading
{
.board-list-loading
{
...
@@ -234,6 +238,10 @@ lex
...
@@ -234,6 +238,10 @@ lex
}
}
}
}
.board-new-issue-form
{
margin
:
5px
;
}
.board-issue-count-holder
{
.board-issue-count-holder
{
margin-top
:
-3px
;
margin-top
:
-3px
;
...
@@ -251,7 +259,7 @@ lex
...
@@ -251,7 +259,7 @@ lex
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
border-color
:
$border-color
;
border-color
:
$border-color
;
border-style
:
solid
;
border-style
:
solid
;
border-width
:
1px
1px
1px
1px
;
border-width
:
1px
;
&
.has-btn
{
&
.has-btn
{
border-top-right-radius
:
0
;
border-top-right-radius
:
0
;
...
...
app/views/projects/boards/components/_board.html.haml
View file @
a9c98be0
...
@@ -37,15 +37,12 @@
...
@@ -37,15 +37,12 @@
":issue-link-base"
=>
"issueLinkBase"
}
":issue-link-base"
=>
"issueLinkBase"
}
.board-list-loading.text-center
{
"v-if"
=>
"loading"
}
.board-list-loading.text-center
{
"v-if"
=>
"loading"
}
=
icon
(
"spinner spin"
)
=
icon
(
"spinner spin"
)
%ul
.board-list
{
"v-el:list"
=>
true
,
"v-show"
=>
"!loading"
,
":data-board"
=>
"list.id"
}
-
if
can?
current_user
,
:create_issue
,
@project
-
if
can?
current_user
,
:create_issue
,
@project
%board-new-issue
{
"inline-template"
=>
true
,
%board-new-issue
{
"inline-template"
=>
true
,
":list"
=>
"list"
,
":list"
=>
"list"
,
":show-issue-form.sync"
=>
"showIssueForm"
,
":show-issue-form.sync"
=>
"showIssueForm"
,
"v-show"
=>
"list.type !== 'done' && showIssueForm"
}
"v-show"
=>
"list.type !== 'done' && showIssueForm"
}
%li
.card.board-new-issue-form
.card.board-new-issue-form
%form
{
"@submit"
=>
"submit($event)"
}
%form
{
"@submit"
=>
"submit($event)"
}
%label
.label-light
%label
.label-light
Title
Title
...
@@ -59,6 +56,10 @@
...
@@ -59,6 +56,10 @@
%button
.btn.btn-default.pull-right
{
type:
"button"
,
%button
.btn.btn-default.pull-right
{
type:
"button"
,
"@click"
=>
"cancel"
}
"@click"
=>
"cancel"
}
Cancel
Cancel
%ul
.board-list
{
"v-el:list"
=>
true
,
"v-show"
=>
"!loading"
,
":data-board"
=>
"list.id"
,
":class"
=>
"{ 'is-smaller': showIssueForm }"
}
=
render
"projects/boards/components/card"
=
render
"projects/boards/components/card"
%li
.board-list-count.text-center
{
"v-if"
=>
"showCount"
}
%li
.board-list-count.text-center
{
"v-if"
=>
"showCount"
}
=
icon
(
"spinner spin"
,
"v-show"
=>
"list.loadingMore"
)
=
icon
(
"spinner spin"
,
"v-show"
=>
"list.loadingMore"
)
...
...
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