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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
26dc37de
Commit
26dc37de
authored
Apr 07, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Review changes
parent
cfbeeed8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
27 deletions
+36
-27
app/assets/javascripts/milestone.js
app/assets/javascripts/milestone.js
+1
-4
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+32
-16
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+0
-4
app/views/shared/milestones/_deprecation_message.html.haml
app/views/shared/milestones/_deprecation_message.html.haml
+3
-3
No files found.
app/assets/javascripts/milestone.js
View file @
26dc37de
...
...
@@ -62,11 +62,8 @@ export default class Milestone {
})
.
on
(
'
mouseenter
'
,
mouseenter
)
.
on
(
'
mouseleave
'
,
debouncedMouseleave
())
.
on
(
'
show.bs.popover
'
,
()
=>
{
.
on
e
(
'
show.bs.popover
'
,
()
=>
{
window
.
addEventListener
(
'
scroll
'
,
hideOnScroll
);
})
.
on
(
'
hide.bs.popover
'
,
()
=>
{
window
.
removeEventListener
(
'
scroll
'
,
hideOnScroll
);
});
}
}
app/assets/stylesheets/framework/buttons.scss
View file @
26dc37de
...
...
@@ -423,26 +423,42 @@
}
.btn-link
{
&
.btn-secondary-hover-link
{
color
:
$gl-text-color-secondary
;
padding
:
0
;
background-color
:
transparent
;
color
:
$blue-600
;
font-weight
:
normal
;
border-radius
:
0
;
border-color
:
transparent
;
&
:hover
,
&
:active
,
&
:focus
{
color
:
$gl-link-color
;
text-decoration
:
none
;
}
&
:hover
,
&
:active
,
&
:focus
{
color
:
$blue-800
;
text-decoration
:
underline
;
background-color
:
transparent
;
border-color
:
transparent
;
}
}
&
.btn-prim
ary-hover-link
{
color
:
inherit
;
.btn-link.btn-second
ary-hover-link
{
color
:
$gl-text-color-secondary
;
&
:hover
,
&
:active
,
&
:focus
{
color
:
$gl-link-color
;
text-decoration
:
none
;
}
&
:hover
,
&
:active
,
&
:focus
{
color
:
$gl-link-color
;
text-decoration
:
none
;
}
}
.btn-link.btn-primary-hover-link
{
color
:
inherit
;
&
:hover
,
&
:active
,
&
:focus
{
color
:
$gl-link-color
;
text-decoration
:
none
;
}
}
...
...
app/assets/stylesheets/pages/milestone.scss
View file @
26dc37de
...
...
@@ -203,10 +203,6 @@
.popover-content
{
padding
:
0
;
}
.btn-link
{
padding
:
0
;
}
}
.milestone-popover-body
{
...
...
app/views/shared/milestones/_deprecation_message.html.haml
View file @
26dc37de
...
...
@@ -2,8 +2,8 @@
.banner-graphic
=
image_tag
'illustrations/milestone_removing-page.svg'
.banner-body.prepend-left-10.append-right-10
%h5
.banner-title.prepend-top-0
=
_
(
'This page will be removed in a future release.'
)
%p
.banner-text
=
_
(
'Use group milestones to manage issues from multiple projects in the same milestone.'
)
=
button_tag
_
(
'Promote these project milestones into a group milestone.'
),
class:
'btn-link js-popover-link text-align-left milestone-banner-link'
%p
.
milestone-
banner-text
=
_
(
'Use group milestones to manage issues from multiple projects in the same milestone.'
)
=
button_tag
_
(
'Promote these project milestones into a group milestone.'
),
class:
'btn
btn
-link js-popover-link text-align-left milestone-banner-link'
.milestone-banner-buttons.prepend-top-20
=
link_to
_
(
'Learn more'
),
help_page_url
(
'user/project/milestones/index'
,
anchor:
'promoting-project-milestones-to-group-milestones'
),
class:
'btn btn-default'
,
target:
'_blank'
%template
.js-milestone-deprecation-message-template
...
...
@@ -11,4 +11,4 @@
%ol
.milestone-popover-instructions-list.append-bottom-0
%li
=
_
(
'Click any <strong>project name</strong> in the project list below to navigate to the project milestone.'
).
html_safe
%li
=
_
(
'Click the <strong>Promote</strong> button in the top right corner to promote it to a group milestone.'
).
html_safe
.milestone-popover-footer
=
link_to
_
(
'Learn more'
),
help_page_url
(
'user/project/milestones/index'
,
anchor:
'promoting-project-milestones-to-group-milestones'
),
class:
'btn-link prepend-left-0'
,
target:
'_blank'
.milestone-popover-footer
=
link_to
_
(
'Learn more'
),
help_page_url
(
'user/project/milestones/index'
,
anchor:
'promoting-project-milestones-to-group-milestones'
),
class:
'btn
btn
-link prepend-left-0'
,
target:
'_blank'
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