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
d59af51d
Commit
d59af51d
authored
Oct 05, 2017
by
Simon Knox
Committed by
Oswaldo Ferreira
Oct 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix up padding and UI tweaks. Add Any Label option to dropdown
parent
05059efb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
71 additions
and
24 deletions
+71
-24
app/assets/javascripts/boards/components/labels_select.vue
app/assets/javascripts/boards/components/labels_select.vue
+17
-15
app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+6
-5
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+5
-4
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+4
-0
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+33
-0
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+6
-0
No files found.
app/assets/javascripts/boards/components/labels_select.vue
View file @
d59af51d
...
...
@@ -18,14 +18,6 @@ export default {
type
:
Array
,
required
:
false
,
},
defaultText
:
{
type
:
String
,
required
:
true
,
},
title
:
{
type
:
String
,
required
:
true
,
},
canEdit
:
{
type
:
Boolean
,
required
:
false
,
...
...
@@ -47,6 +39,18 @@ export default {
mounted
()
{
new
LabelsSelect
();
},
methods
:
{
labelStyle
(
label
)
{
let
style
;
if
(
label
.
textColor
)
{
style
+=
`color:
${
label
.
textColor
}
;`
}
if
(
label
.
color
)
{
style
+=
`background-color:
${
label
.
color
}
;`
}
return
style
;
},
},
};
</
script
>
...
...
@@ -70,17 +74,14 @@ export default {
Any label
</span>
<a
v-else
href=
"#"
v-for=
"label in board.labels"
:key=
"label.id"
>
<span
class=
"label color-label has-tooltip"
:style=
"`
background-color: $
{label.color};
color: ${label.textColor};
`"
title=""
class=
"label color-label"
:style=
"labelStyle(label)"
>
{{
label
.
title
}}
</span>
...
...
@@ -100,8 +101,9 @@ export default {
<div
class=
"dropdown"
>
<button
v-bind:data-labels=
"labelsPath"
class=
"dropdown-menu-toggle wide js-label-select js-multiselect js-board-config-modal"
class=
"dropdown-menu-toggle wide js-label-select js-multiselect js-
extra-options js-
board-config-modal"
data-field-name=
"label_id[]"
:data-show-any=
"true"
data-toggle=
"dropdown"
type=
"button"
>
...
...
app/assets/javascripts/boards/components/milestone_select.vue
View file @
d59af51d
...
...
@@ -41,7 +41,7 @@ export default {
return
this
.
board
.
milestone
?
this
.
board
.
milestone
.
id
:
''
;
},
milestoneTitleClass
()
{
return
this
.
milestoneTitle
===
'
ANY_MILESTONE
'
?
'
text-secondary
'
:
'
bold
'
;
return
this
.
milestoneTitle
===
ANY_MILESTONE
?
'
text-secondary
'
:
'
bold
'
;
},
selected
()
{
return
this
.
board
.
milestone
?
this
.
board
.
milestone
.
name
:
''
;
...
...
@@ -72,10 +72,11 @@ export default {
Edit
</a>
</div>
<div
class=
"value"
>
<span
:class=
"milestoneTitleClass"
>
{{
milestoneTitle
}}
</span>
<div
class=
"value"
:class=
"milestoneTitleClass"
>
{{
milestoneTitle
}}
</div>
<div
class=
"selectbox"
...
...
app/assets/javascripts/labels_select.js
View file @
d59af51d
...
...
@@ -391,15 +391,16 @@ import DropdownUtils from './filtered_search/dropdown_utils';
.
catch
(
fadeOutLoader
);
}
else
if
(
$dropdown
.
hasClass
(
'
js-board-config-modal
'
))
{
if
(
$el
.
hasClass
(
'
is-active
'
))
{
if
(
label
.
isAny
)
{
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
=
[];
}
else
if
(
$el
.
hasClass
(
'
is-active
'
))
{
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
.
push
(
new
ListLabel
({
id
:
label
.
id
,
title
:
label
.
title
,
color
:
label
.
color
[
0
],
textColor
:
'
#fff
'
textColor
:
label
.
text_color
||
'
#fff
'
,
}));
}
else
{
}
else
{
let
labels
=
gl
.
issueBoards
.
BoardsStore
.
boardConfig
.
labels
;
labels
=
labels
.
filter
(
function
(
selectedLabel
)
{
return
selectedLabel
.
id
!==
label
.
id
;
...
...
app/assets/stylesheets/framework/modal.scss
View file @
d59af51d
...
...
@@ -49,3 +49,7 @@ body.modal-open {
}
}
}
.modal-body
{
background-color
:
$modal-body-bg
;
}
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
View file @
d59af51d
...
...
@@ -164,3 +164,36 @@ $pre-border-color: $border-color;
$table-bg-accent
:
$gray-light
;
$zindex-popover
:
900
;
//== Modals
//
//##
//** Padding applied to the modal body
$modal-inner-padding
:
$gl-padding
;
//** Padding applied to the modal title
$modal-title-padding
:
$gl-padding
;
//** Modal title line-height
// $modal-title-line-height: $line-height-base
//** Background color of modal content area
$modal-content-bg
:
$gray-light
;
$modal-body-bg
:
$white-light
;
//** Modal content border color
// $modal-content-border-color: rgba(0,0,0,.2)
//** Modal content border color **for IE8**
// $modal-content-fallback-border-color: #999
//** Modal backdrop background color
// $modal-backdrop-bg: #000
//** Modal backdrop opacity
// $modal-backdrop-opacity: .5
//** Modal header border color
// $modal-header-border-color: #e5e5e5
//** Modal footer border color
// $modal-footer-border-color: $modal-header-border-color
// $modal-lg: 900px
// $modal-md: 600px
// $modal-sm: 300px
\ No newline at end of file
app/assets/stylesheets/framework/typography.scss
View file @
d59af51d
...
...
@@ -307,6 +307,12 @@ h6 {
.edit-link
{
color
:
$gl-text-color
;
&
:focus
,
&
:hover
{
color
:
$gl-text-color
;
text-decoration
:
none
;
}
}
.light-header
{
...
...
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