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
6fe93a3a
Commit
6fe93a3a
authored
Jul 12, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove button margin; align status icons to top of widget sections
parent
8529f1f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
...merge_request_widget/components/mr_widget_status_icon.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+4
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
View file @
6fe93a3a
...
...
@@ -32,7 +32,7 @@
};
</
script
>
<
template
>
<div
class=
"space-children d-flex append-right-10"
>
<div
class=
"space-children d-flex append-right-10
widget-status-icon
"
>
<div
v-if=
"isLoading"
class=
"mr-widget-icon"
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
6fe93a3a
...
...
@@ -237,7 +237,7 @@ export default {
<status-icon
:status=
"iconClass"
/>
<div
class=
"media-body"
>
<div
class=
"mr-widget-body-controls media space-children"
>
<span
class=
"btn-group
append-bottom-5
"
>
<span
class=
"btn-group"
>
<button
:disabled=
"isMergeButtonDisabled"
:class=
"mergeButtonClass"
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
6fe93a3a
...
...
@@ -214,6 +214,10 @@
}
}
.widget-status-icon
{
align-self
:
flex-start
;
}
.mr-widget-body
{
line-height
:
28px
;
...
...
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