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
09a9fcc9
Commit
09a9fcc9
authored
Apr 24, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates CSS for non a tags inside dropdown
parent
2c3065c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
app/assets/javascripts/pipelines/components/graph/job_component.vue
.../javascripts/pipelines/components/graph/job_component.vue
+1
-1
app/assets/javascripts/pipelines/components/stage.vue
app/assets/javascripts/pipelines/components/stage.vue
+3
-3
app/assets/javascripts/pipelines/pipeline_details_bundle.js
app/assets/javascripts/pipelines/pipeline_details_bundle.js
+0
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+5
-0
No files found.
app/assets/javascripts/pipelines/components/graph/job_component.vue
View file @
09a9fcc9
...
@@ -108,7 +108,7 @@ export default {
...
@@ -108,7 +108,7 @@ export default {
<div
<div
v-else
v-else
v-tooltip
v-tooltip
class=
"js-job-component-tooltip"
class=
"js-job-component-tooltip
non-details-job-component
"
:title=
"tooltipText"
:title=
"tooltipText"
:class=
"cssClassJobName"
:class=
"cssClassJobName"
data-html=
"true"
data-html=
"true"
...
...
app/assets/javascripts/pipelines/components/stage.vue
View file @
09a9fcc9
...
@@ -96,7 +96,7 @@ export default {
...
@@ -96,7 +96,7 @@ export default {
axios
axios
.
get
(
this
.
stage
.
dropdown_path
)
.
get
(
this
.
stage
.
dropdown_path
)
.
then
(({
data
})
=>
{
.
then
(({
data
})
=>
{
this
.
dropdownContent
=
data
;
this
.
dropdownContent
=
data
.
latest_statuses
;
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
...
@@ -117,7 +117,7 @@ export default {
...
@@ -117,7 +117,7 @@ export default {
*/
*/
stopDropdownClickPropagation
()
{
stopDropdownClickPropagation
()
{
$
(
$
(
this
.
$el
.
querySelectorAll
(
'
.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item
'
)
this
.
$el
.
querySelectorAll
(
'
.js-builds-dropdown-list a.mini-pipeline-graph-dropdown-item
'
)
,
).
on
(
'
click
'
,
e
=>
{
).
on
(
'
click
'
,
e
=>
{
e
.
stopPropagation
();
e
.
stopPropagation
();
});
});
...
@@ -183,7 +183,7 @@ export default {
...
@@ -183,7 +183,7 @@ export default {
<li
<li
v-for=
"job in dropdownContent"
v-for=
"job in dropdownContent"
:key=
"job.id"
:key=
"job.id"
>
>
<job-component
<job-component
:job=
"job"
:job=
"job"
css-class-job-name=
"mini-pipeline-graph-dropdown-item"
css-class-job-name=
"mini-pipeline-graph-dropdown-item"
...
...
app/assets/javascripts/pipelines/pipeline_details_bundle.js
View file @
09a9fcc9
...
@@ -48,7 +48,6 @@ export default () => {
...
@@ -48,7 +48,6 @@ export default () => {
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
requestFinishedFor
=
action
;
this
.
requestFinishedFor
=
action
;
Flash
(
__
(
'
An error occurred while making the request.
'
));
Flash
(
__
(
'
An error occurred while making the request.
'
));
eventHub
.
$emit
(
'
graphActionFinished
'
,
action
);
});
});
},
},
},
},
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
09a9fcc9
...
@@ -805,6 +805,11 @@ button.mini-pipeline-graph-dropdown-toggle {
...
@@ -805,6 +805,11 @@ button.mini-pipeline-graph-dropdown-toggle {
line-height
:
$line-height-base
;
line-height
:
$line-height-base
;
white-space
:
nowrap
;
white-space
:
nowrap
;
// Match dropdown.scss for all `a` tags
&
.non-details-job-component
{
padding
:
8px
16px
;
}
.ci-job-name-component
{
.ci-job-name-component
{
align-items
:
center
;
align-items
:
center
;
display
:
flex
;
display
:
flex
;
...
...
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