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
Léo-Paul Géneau
gitlab-ce
Commits
a4014a4c
Commit
a4014a4c
authored
7 years ago
by
Kushal Pandya
Committed by
Filipa Lacerda
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine MR widget styling for buttons and info text
parent
c19d58de
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
3 deletions
+19
-3
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
...e_merge_request_widget/components/mr_widget_deployment.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
...uest_widget/components/states/mr_widget_ready_to_merge.js
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+16
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
View file @
a4014a4c
...
...
@@ -56,7 +56,7 @@ export default {
<div class="ci-widget">
<div class="ci-status-icon ci-status-icon-success">
<span class="js-icon-link icon-link">
<span
<span
class="ci-status-icon"
v-html="svg"
aria-hidden="true"></span>
</span>
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @
a4014a4c
...
...
@@ -33,7 +33,7 @@ export default {
return
this
.
useCommitMessageWithDescription
?
withoutDesc
:
withDesc
;
},
mergeButtonClass
()
{
const
defaultClass
=
'
btn btn-success accept-merge-request
'
;
const
defaultClass
=
'
btn btn-s
mall btn-s
uccess accept-merge-request
'
;
const
failedClass
=
`
${
defaultClass
}
btn-danger`
;
const
inActionClass
=
`
${
defaultClass
}
btn-info`
;
const
{
pipeline
,
isPipelineActive
,
isPipelineFailed
,
hasCI
,
ciStatus
}
=
this
.
mr
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/merge_requests.scss
View file @
a4014a4c
...
...
@@ -216,6 +216,16 @@
}
}
.mr-widget-body
{
.btn
{
font-size
:
15px
;
}
.btn-group
.btn
{
padding
:
5px
10px
;
}
}
.mr-widget-body
{
h4
{
font-weight
:
600
;
...
...
@@ -248,6 +258,7 @@
.bold
{
margin-left
:
5px
;
font-weight
:
bold
;
font-size
:
15px
;
color
:
$gl-gray-light
;
}
...
...
@@ -271,6 +282,11 @@
margin-bottom
:
24px
;
}
.spacing
,
.bold
{
vertical-align
:
middle
;
}
.dropdown-menu
{
li
a
{
padding
:
5px
;
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
a4014a4c
...
...
@@ -80,7 +80,7 @@ describe('MRWidgetReadyToMerge', () => {
});
describe
(
'
mergeButtonClass
'
,
()
=>
{
const
defaultClass
=
'
btn btn-success accept-merge-request
'
;
const
defaultClass
=
'
btn btn-s
mall btn-s
uccess accept-merge-request
'
;
const
failedClass
=
`
${
defaultClass
}
btn-danger`
;
const
inActionClass
=
`
${
defaultClass
}
btn-info`
;
...
...
This diff is collapsed.
Click to expand it.
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