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
dd442176
Commit
dd442176
authored
Nov 02, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplifies HTML & CSS after code review
parent
65e7054f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
40 deletions
+13
-40
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+7
-16
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality.vue
...erge_request_widget/components/mr_widget_code_quality.vue
+1
-4
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality_issues.vue
...quest_widget/components/mr_widget_code_quality_issues.vue
+5
-20
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
dd442176
...
...
@@ -803,25 +803,16 @@
}
}
li
.success
{
.mr-widget-code-quality-title
{
color
:
$green-500
;
}
.mr-widget-code-quality-icon
svg
{
fill
:
$green-500
;
}
.mr-widget-code-quality-icon
{
fill
:
currentColor
;
}
li
.failed
{
.mr-widget-code-quality-title
{
color
:
$red-500
;
}
.success
{
color
:
$green-500
;
}
.mr-widget-code-quality-icon
svg
{
fill
:
$red-500
;
}
.failed
{
color
:
$red-500
;
}
}
}
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality.vue
View file @
dd442176
...
...
@@ -132,10 +132,7 @@ export default {
v-if=
"isLoading"
class=
"media"
>
<div
class=
"mr-widget-icon"
>
<i
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
>
</i>
<loading-icon
/>
</div>
<div
class=
"media-body"
>
Loading codeclimate report
...
...
ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality_issues.vue
View file @
dd442176
...
...
@@ -14,11 +14,8 @@
},
},
computed
:
{
plusIcon
()
{
return
spriteIcon
(
'
plus
'
);
},
minusIcon
()
{
return
spriteIcon
(
'
cut
'
);
icon
()
{
return
this
.
isTypeFailed
?
spriteIcon
(
'
cut
'
)
:
spriteIcon
(
'
plus
'
);
},
isTypeFailed
()
{
return
this
.
type
===
'
failed
'
;
...
...
@@ -39,22 +36,10 @@
"v-for="issue in issues">
<span
class=
"mr-widget-code-quality-icon"
v-if=
"isTypeFailed"
v-html=
"minusIcon"
>
</span>
<span
class=
"mr-widget-code-quality-icon"
v-else-if=
"isTypeSuccess"
v-html=
"plusIcon"
>
</span>
<span
class=
"mr-widget-code-quality-title"
v-if=
"isTypeSuccess"
>
Fixed:
</span>
<span
class=
"mr-widget-code-quality-title"
>
{{
issue
.
check_name
}}
v-html=
"icon"
>
</span>
<template
v-if=
"isTypeSuccess"
>
Fixed:
</
template
>
{{issue.check_name}}
<
template
v-if=
"issue.location.path"
>
in
</
template
>
<a
:href=
"issue.location.urlPath"
...
...
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