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
ea92682a
Commit
ea92682a
authored
Oct 06, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move list style to .block
parent
6b580738
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
62 deletions
+45
-62
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+32
-41
app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+0
-4
app/assets/javascripts/boards/components/weight_select.vue
app/assets/javascripts/boards/components/weight_select.vue
+1
-5
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+1
-3
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-9
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+11
-0
No files found.
app/assets/javascripts/boards/components/board_form.vue
View file @
ea92682a
...
@@ -190,7 +190,7 @@ export default Vue.extend({
...
@@ -190,7 +190,7 @@ export default Vue.extend({
</p>
</p>
<form
<form
v-else
v-else
class=
"js-board-config-modal"
class=
"js-board-config-modal
board-config-modal
"
>
>
<div
<div
v-if=
"!readonly"
v-if=
"!readonly"
...
@@ -232,49 +232,40 @@ export default Vue.extend({
...
@@ -232,49 +232,40 @@ export default Vue.extend({
Board scope affects which issues are displayed for anyone who visits this board
Board scope affects which issues are displayed for anyone who visits this board
</p>
</p>
<div
v-if=
"!collapseScope || expanded"
>
<div
v-if=
"!collapseScope || expanded"
>
<div
class=
"list-item"
>
<board-milestone-select
<board-milestone-select
:board=
"board"
:board=
"board"
:milestone-path=
"milestonePath"
:milestone-path=
"milestonePath"
title=
"Milestone"
title=
"Milestone"
:can-edit=
"canAdminBoard"
:can-edit=
"canAdminBoard"
/>
/>
</div>
<div
class=
"list-item"
>
<board-labels-select
<board-labels-select
:board=
"board"
:board=
"board"
:selected=
"board.labels"
:selected=
"board.labels"
title=
"Labels"
title=
"Labels"
:can-edit=
"canAdminBoard"
:can-edit=
"canAdminBoard"
:labels-path=
"labelsPath"
:labels-path=
"labelsPath"
/>
/>
</div>
<div
class=
"list-item"
>
<user-select
<user-select
any-user-text=
"Any assignee"
any-user-text=
"Any assignee"
:board=
"board"
:board=
"board"
field-name=
"assignee_id"
field-name=
"assignee_id"
label=
"Assignee"
label=
"Assignee"
:selected=
"board.assignee"
:selected=
"board.assignee"
:can-edit=
"canAdminBoard"
:can-edit=
"canAdminBoard"
placeholder-text=
"Select assignee"
placeholder-text=
"Select assignee"
:project-id=
"projectId"
:project-id=
"projectId"
:group-id=
"groupId"
:group-id=
"groupId"
wrapper-class=
"assignee"
wrapper-class=
"assignee"
/>
/>
</div>
<div
class=
"list-item"
>
<board-weight-select
<board-weight-select
:board=
"board"
:board=
"board"
:weights=
"weightsArray"
:weights=
"weightsArray"
v-model=
"board.weight"
v-model=
"board.weight"
:can-edit=
"canAdminBoard"
title=
"Weight"
/>
:can-edit=
"canAdminBoard"
/>
</div>
</div>
</div>
</div>
</div>
</form>
</form>
...
...
app/assets/javascripts/boards/components/milestone_select.vue
View file @
ea92682a
...
@@ -16,10 +16,6 @@ export default {
...
@@ -16,10 +16,6 @@ export default {
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
title
:
{
type
:
String
,
required
:
true
,
},
canEdit
:
{
canEdit
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
...
...
app/assets/javascripts/boards/components/weight_select.vue
View file @
ea92682a
...
@@ -18,10 +18,6 @@ export default {
...
@@ -18,10 +18,6 @@ export default {
type
:
[
Number
,
String
],
type
:
[
Number
,
String
],
required
:
false
,
required
:
false
,
},
},
title
:
{
type
:
String
,
required
:
true
,
},
canEdit
:
{
canEdit
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
...
@@ -77,7 +73,7 @@ export default {
...
@@ -77,7 +73,7 @@ export default {
<
template
>
<
template
>
<div
class=
"block weight"
>
<div
class=
"block weight"
>
<div
class=
"title append-bottom-10"
>
<div
class=
"title append-bottom-10"
>
{{
title
}}
Weight
<a
<a
v-if=
"canEdit"
v-if=
"canEdit"
class=
"edit-link pull-right"
class=
"edit-link pull-right"
...
...
app/assets/javascripts/labels_select.js
View file @
ea92682a
...
@@ -402,9 +402,7 @@ import DropdownUtils from './filtered_search/dropdown_utils';
...
@@ -402,9 +402,7 @@ import DropdownUtils from './filtered_search/dropdown_utils';
}));
}));
}
else
{
}
else
{
let
labels
=
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
;
let
labels
=
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
;
labels
=
labels
.
filter
(
function
(
selectedLabel
)
{
labels
=
labels
.
filter
(
selected
=>
selected
.
id
!==
label
.
id
);
return
selectedLabel
.
id
!==
label
.
id
;
});
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
=
labels
;
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
=
labels
;
}
}
}
}
...
...
app/assets/stylesheets/framework/lists.scss
View file @
ea92682a
...
@@ -390,12 +390,3 @@ ul.indent-list {
...
@@ -390,12 +390,3 @@ ul.indent-list {
text-align
:
center
;
text-align
:
center
;
}
}
}
}
.list-item
{
padding
:
$gl-padding
0
;
// add a border between all items, but not at the start or end
+
.list-item
{
border-top
:
solid
1px
$border-color
;
}
}
app/assets/stylesheets/pages/boards.scss
View file @
ea92682a
...
@@ -734,3 +734,14 @@
...
@@ -734,3 +734,14 @@
padding-right
:
12px
;
padding-right
:
12px
;
color
:
$gl-gray-dark
;
color
:
$gl-gray-dark
;
}
}
.board-config-modal
{
.block
{
padding
:
$gl-padding
0
;
// add a border between all items, but not at the start or end
+
.block
{
border-top
:
solid
1px
$border-color
;
}
}
}
\ No newline at end of file
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