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
08de7ffc
Commit
08de7ffc
authored
Jul 02, 2018
by
Simon Knox
Committed by
Fatih Acet
Jul 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Cancel automatic merge button gets a bigger height than it should when content overflows"
parent
d9c35bd4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
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/mr_widget_merge_when_pipeline_succeeds.vue
...ponents/states/mr_widget_merge_when_pipeline_succeeds.vue
+2
-2
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+0
-5
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
View file @
08de7ffc
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"space-children
flex-container-block
append-right-10"
>
<div
class=
"space-children
d-flex
append-right-10"
>
<div
<div
v-if=
"isLoading"
v-if=
"isLoading"
class=
"mr-widget-icon"
class=
"mr-widget-icon"
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
View file @
08de7ffc
...
@@ -82,7 +82,7 @@
...
@@ -82,7 +82,7 @@
<div
class=
"mr-widget-body media"
>
<div
class=
"mr-widget-body media"
>
<status-icon
status=
"success"
/>
<status-icon
status=
"success"
/>
<div
class=
"media-body"
>
<div
class=
"media-body"
>
<h4
class=
"
flex-container-block
"
>
<h4
class=
"
d-flex align-items-start
"
>
<span
class=
"append-right-10"
>
<span
class=
"append-right-10"
>
{{
s__
(
"
mrWidget|Set by
"
)
}}
{{
s__
(
"
mrWidget|Set by
"
)
}}
<mr-widget-author
:author=
"mr.setToMWPSBy"
/>
<mr-widget-author
:author=
"mr.setToMWPSBy"
/>
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
</p>
</p>
<p
<p
v-else
v-else
class=
"
flex-container-block
"
class=
"
d-flex align-items-start
"
>
>
<span
class=
"append-right-10"
>
<span
class=
"append-right-10"
>
{{
s__
(
"
mrWidget|The source branch will not be removed
"
)
}}
{{
s__
(
"
mrWidget|The source branch will not be removed
"
)
}}
...
...
app/assets/stylesheets/framework/blocks.scss
View file @
08de7ffc
...
@@ -350,11 +350,6 @@
...
@@ -350,11 +350,6 @@
}
}
}
}
.flex-container-block
{
display
:
-
webkit-flex
;
display
:
flex
;
}
.flex-right
{
.flex-right
{
margin-left
:
auto
;
margin-left
:
auto
;
}
}
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