Commit ea92682a authored by Simon Knox's avatar Simon Knox

move list style to .block

parent 6b580738
......@@ -190,7 +190,7 @@ export default Vue.extend({
</p>
<form
v-else
class="js-board-config-modal"
class="js-board-config-modal board-config-modal"
>
<div
v-if="!readonly"
......@@ -232,49 +232,40 @@ export default Vue.extend({
Board scope affects which issues are displayed for anyone who visits this board
</p>
<div v-if="!collapseScope || expanded">
<div class="list-item">
<board-milestone-select
:board="board"
:milestone-path="milestonePath"
title="Milestone"
:can-edit="canAdminBoard"
/>
</div>
<board-milestone-select
:board="board"
:milestone-path="milestonePath"
title="Milestone"
:can-edit="canAdminBoard"
/>
<div class="list-item">
<board-labels-select
:board="board"
:selected="board.labels"
title="Labels"
:can-edit="canAdminBoard"
:labels-path="labelsPath"
/>
</div>
<board-labels-select
:board="board"
:selected="board.labels"
title="Labels"
:can-edit="canAdminBoard"
:labels-path="labelsPath"
/>
<div class="list-item">
<user-select
any-user-text="Any assignee"
:board="board"
field-name="assignee_id"
label="Assignee"
:selected="board.assignee"
:can-edit="canAdminBoard"
placeholder-text="Select assignee"
:project-id="projectId"
:group-id="groupId"
wrapper-class="assignee"
/>
</div>
<user-select
any-user-text="Any assignee"
:board="board"
field-name="assignee_id"
label="Assignee"
:selected="board.assignee"
:can-edit="canAdminBoard"
placeholder-text="Select assignee"
:project-id="projectId"
:group-id="groupId"
wrapper-class="assignee"
/>
<div class="list-item">
<board-weight-select
:board="board"
:weights="weightsArray"
v-model="board.weight"
title="Weight"
:can-edit="canAdminBoard"
/>
</div>
<board-weight-select
:board="board"
:weights="weightsArray"
v-model="board.weight"
:can-edit="canAdminBoard"
/>
</div>
</div>
</form>
......
......@@ -16,10 +16,6 @@ export default {
type: String,
required: true,
},
title: {
type: String,
required: true,
},
canEdit: {
type: Boolean,
required: false,
......
......@@ -18,10 +18,6 @@ export default {
type: [Number, String],
required: false,
},
title: {
type: String,
required: true,
},
canEdit: {
type: Boolean,
required: false,
......@@ -77,7 +73,7 @@ export default {
<template>
<div class="block weight">
<div class="title append-bottom-10">
{{ title }}
Weight
<a
v-if="canEdit"
class="edit-link pull-right"
......
......@@ -402,9 +402,7 @@ import DropdownUtils from './filtered_search/dropdown_utils';
}));
} else {
let labels = gl.issueBoards.BoardsStore.boardConfig.labels;
labels = labels.filter(function (selectedLabel) {
return selectedLabel.id !== label.id;
});
labels = labels.filter(selected => selected.id !== label.id);
gl.issueBoards.BoardsStore.boardConfig.labels = labels;
}
}
......
......@@ -390,12 +390,3 @@ ul.indent-list {
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;
}
}
......@@ -734,3 +734,14 @@
padding-right: 12px;
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment