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
cc5e7b63
Commit
cc5e7b63
authored
Sep 27, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up styles
parent
4b730f2b
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
150 additions
and
130 deletions
+150
-130
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+8
-7
app/assets/javascripts/boards/components/dropdown.vue
app/assets/javascripts/boards/components/dropdown.vue
+0
-26
app/assets/javascripts/boards/components/form_block.vue
app/assets/javascripts/boards/components/form_block.vue
+16
-12
app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+58
-42
app/assets/javascripts/vue_shared/components/popup_dialog.vue
...assets/javascripts/vue_shared/components/popup_dialog.vue
+47
-40
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+4
-0
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+5
-0
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+4
-3
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+4
-0
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+4
-0
No files found.
app/assets/javascripts/boards/components/board_form.vue
View file @
cc5e7b63
...
...
@@ -18,7 +18,7 @@
v-if=
"!readonly"
class=
"append-bottom-20"
>
<label
class=
"label-light"
for=
"board-new-name"
>
<label
class=
"
form-section-title
label-light"
for=
"board-new-name"
>
Board name
</label>
<input
...
...
@@ -32,7 +32,7 @@
v-if=
"canAdminBoard"
class=
"media append-bottom-10"
>
<label
class=
"label-light media-body"
>
<label
class=
"
form-section-title
label-light media-body"
>
Board scope
</label>
<button
...
...
@@ -55,15 +55,16 @@
defaultText=
"Any milestone"
:canEdit=
"canAdminBoard"
>
<input
type=
"hidden"
id=
"board-milestone"
v-model.number=
"board.milestone_id"
<div
v-if=
"board.milestone"
slot=
"currentValue"
>
{{
board
.
milestone
.
title
}}
</div>
<board-milestone-select
:board=
"board"
:milestone-path=
"milestonePath"
:select-milestone=
"selectM
ilestone"
>
v-model=
"board.m
ilestone"
>
</board-milestone-select>
</form-block>
...
...
app/assets/javascripts/boards/components/dropdown.vue
deleted
100644 → 0
View file @
4b730f2b
<
template
>
<ul
ref=
"list"
class=
"dropdown-menu"
>
<slot
name=
"items"
></slot>
</ul>
</
template
>
<
script
>
import
DropLab
from
'
~/droplab/drop_lab
'
;
export
default
{
props
:
{
},
data
()
{
return
{
loading
:
false
,
};
},
mounted
()
{
this
.
droplab
=
new
DropLab
();
this
.
droplab
.
init
(
this
.
$refs
.
trigger
,
this
.
$refs
.
list
);
},
};
</
script
>
app/assets/javascripts/boards/components/form_block.vue
View file @
cc5e7b63
<
template
>
<div
class=
"
board-inner-container
"
>
<div
class=
"
list-item
"
>
<div
class=
"media"
>
<label
class=
"media-body"
>
{{
title
}}
</label>
<label
class=
"
label-light
media-body"
>
{{
title
}}
</label>
<a
v-if=
"canEdit"
class=
"edit-link"
href=
"#"
@
click.prevent=
"toggleEditing"
>
Edit
</a>
</div>
<div
class=
"droplab-dropdown"
>
<div
v-if=
"editing"
>
<input
v-if=
"fieldName"
:name=
"fieldName"
>
<slot></slot>
</div>
<div
v-else
>
<div
v-if=
"editing"
class=
"dropdown open"
>
<input
v-if=
"fieldName"
:name=
"fieldName"
>
<slot></slot>
</div>
<div
:class=
"
{ invisible: editing }">
<slot
name=
"currentValue"
>
{{
defaultText
}}
</
div
>
</
slot
>
</div>
</div>
</
template
>
...
...
app/assets/javascripts/boards/components/milestone_select.vue
View file @
cc5e7b63
<
template
>
<div>
<gl-dropdown>
<template
slot=
"items"
>
<li
v-for=
"milestone in extraMilestones"
:key=
"milestone.id"
>
<a
href=
"#"
@
click.prevent.stop=
"selectMilestone(milestone)"
>
<i
class=
"fa fa-check"
v-if=
"false"
></i>
{{
milestone
.
title
}}
</a>
</li>
<li
class=
"divider"
></li>
<li
v-for=
"milestone in milestones"
:key=
"milestone.id"
>
<a
href=
"#"
@
click.prevent.stop=
"selectMilestone(milestone)"
>
<i
class=
"fa fa-check"
v-if=
"false"
></i>
{{
milestone
.
title
}}
</a>
</li>
</
template
>
</gl-dropdown>
<div
class=
"dropdown-menu dropdown-menu-wide"
>
<div
class=
"dropdown-input"
>
<input
class=
"dropdown-input-field"
type=
"search"
placeholder=
"Search milestones"
>
<i
aria-hidden=
"true"
data-hidden=
"true"
class=
"fa fa-search dropdown-input-search"
></i>
</div>
<ul
ref=
"list"
>
<li
v-for=
"milestone in extraMilestones"
:key=
"milestone.id"
>
<a
href=
"#"
@
click.prevent.stop=
"selectMilestone(milestone)"
>
<i
class=
"fa fa-check"
v-if=
"false"
></i>
{{
milestone
.
title
}}
</a>
</li>
<li
class=
"divider"
></li>
<li
v-if=
"loading"
>
<loading-icon
/>
</li>
<li
v-else
v-for=
"milestone in milestones"
:key=
"milestone.id"
>
<a
href=
"#"
@
click.prevent.stop=
"selectMilestone(milestone)"
>
<i
class=
"fa fa-check"
v-if=
"false"
></i>
{{
milestone
.
title
}}
</a>
</li>
</ul>
</div>
</
template
>
<
script
>
/* global BoardService */
import
DropLab
from
'
~/droplab/drop_lab
'
;
import
GlDropdown
from
'
./dropdown.vue
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
extraMilestones
from
'
../mixins/extra_milestones
'
;
export
default
{
...
...
@@ -51,23 +61,29 @@ export default {
type
:
String
,
required
:
true
,
},
selectMileston
e
:
{
type
:
Function
,
required
:
tru
e
,
valu
e
:
{
type
:
String
,
required
:
fals
e
,
},
},
components
:
{
loadingIcon
,
},
data
()
{
return
{
loading
:
fals
e
,
loading
:
tru
e
,
milestones
:
[],
extraMilestones
,
};
},
components
:
{
GlDropdown
,
},
mounted
()
{
BoardService
.
loadMilestones
.
call
(
this
);
BoardService
.
loadMilestones
.
call
(
this
).
then
(()
=>
this
.
loading
=
false
);
},
methods
:
{
selectMilestone
(
milestone
)
{
this
.
board
.
milestone_id
=
milestone
.
id
;
this
.
$emit
(
'
input
'
,
milestone
);
},
},
};
</
script
>
app/assets/javascripts/vue_shared/components/popup_dialog.vue
View file @
cc5e7b63
...
...
@@ -42,51 +42,58 @@ export default {
</
script
>
<
template
>
<div
class=
"modal popup-dialog"
role=
"dialog"
tabindex=
"-1"
>
<div
class=
"modal-open"
>
<div
class=
"modal-dialog modal-lg"
role=
"document"
class=
"modal popup-dialog"
role=
"dialog"
tabindex=
"-1"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<slot
name=
"header"
>
<h4
class=
"modal-title pull-left"
>
{{
this
.
title
}}
</h4>
<button
type=
"button"
class=
"close pull-right"
@
click=
"close"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</slot>
</div>
<div
class=
"modal-body"
>
<slot>
<p>
{{
this
.
body
}}
</p>
<div
class=
"modal-dialog modal-md"
role=
"document"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<slot
name=
"header"
>
<h4
class=
"modal-title pull-left"
>
{{
this
.
title
}}
</h4>
<button
type=
"button"
class=
"close pull-right"
@
click=
"close"
aria-label=
"Close"
>
<span
aria-hidden=
"true"
>
×
</span>
</button>
</slot>
</div>
<div
class=
"modal-body"
>
<slot>
<p>
{{
this
.
body
}}
</p>
</slot>
</div>
<slot
name=
"footer"
>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn pull-left"
:class=
"btnKindClass"
@
click=
"emitSubmit(true)"
>
{{
primaryButtonLabel
}}
</button>
<button
type=
"button"
class=
"btn btn-default pull-right"
@
click=
"close"
>
Cancel
</button>
</div>
</slot>
</div>
<slot
name=
"footer"
>
<div
class=
"modal-footer"
>
<button
type=
"button"
class=
"btn pull-left"
:class=
"btnKindClass"
@
click=
"emitSubmit(true)"
>
{{
primaryButtonLabel
}}
</button>
<button
type=
"button"
class=
"btn btn-default pull-right"
@
click=
"close"
>
Cancel
</button>
</div>
</slot>
</div>
</div>
<div
class=
"modal-backdrop fade in"
@
click=
"close"
></div>
</div>
</
template
>
app/assets/stylesheets/framework/dropdowns.scss
View file @
cc5e7b63
...
...
@@ -291,6 +291,10 @@
}
}
.dropdown-menu-wide
{
width
:
100%
;
}
.droplab-dropdown
{
.dropdown-toggle
>
i
{
pointer-events
:
none
;
...
...
app/assets/stylesheets/framework/lists.scss
View file @
cc5e7b63
...
...
@@ -390,3 +390,8 @@ ul.indent-list {
text-align
:
center
;
}
}
.list-item
{
padding
:
$gl-padding
0
;
border-bottom
:
solid
1px
$border-color
;
}
app/assets/stylesheets/framework/modal.scss
View file @
cc5e7b63
...
...
@@ -36,6 +36,10 @@ body.modal-open {
}
}
.modal-md
{
max-width
:
440px
;
}
.modal-dialog
{
// TODO: this needs top and bottom padding (inside content area)
max-height
:
calc
(
100vh
-
#{
$new-navbar-height
}
);
...
...
@@ -53,12 +57,9 @@ body.modal-open {
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
background-color
:
$black-transparent
;
z-index
:
2100
;
@media
(
min-width
:
$screen-md-min
)
{
.modal-dialog
{
width
:
600px
;
margin-top
:
$new-navbar-height
;
}
}
...
...
app/assets/stylesheets/framework/typography.scss
View file @
cc5e7b63
...
...
@@ -305,6 +305,10 @@ h6 {
font-weight
:
$gl-font-weight-bold
;
}
.edit-link
{
color
:
$gl-text-color
;
}
.light-header
{
font-weight
:
$gl-font-weight-bold
;
}
...
...
app/assets/stylesheets/pages/boards.scss
View file @
cc5e7b63
...
...
@@ -462,6 +462,10 @@
white-space
:
normal
;
}
.form-section-title
{
font-size
:
16px
;
}
.board-delete-btns
{
padding-top
:
12px
;
border-top
:
1px
solid
$border-color
;
...
...
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