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
40b7eedc
Commit
40b7eedc
authored
Mar 18, 2018
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UI breakdown for Create merge request button
parent
ea5221ae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+3
-6
app/views/projects/_last_push.html.haml
app/views/projects/_last_push.html.haml
+1
-1
changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml
...nreleased/44382-ui-breakdown-for-create-merge-request.yml
+5
-0
No files found.
app/assets/stylesheets/pages/events.scss
View file @
40b7eedc
...
@@ -162,17 +162,14 @@
...
@@ -162,17 +162,14 @@
* Last push widget
* Last push widget
*/
*/
.event-last-push
{
.event-last-push
{
overflow
:
auto
;
width
:
100%
;
width
:
100%
;
display
:
flex
;
align-items
:
center
;
.event-last-push-text
{
.event-last-push-text
{
@include
str-truncated
(
100%
);
@include
str-truncated
(
100%
);
padding
:
4px
0
;
font-size
:
13px
;
font-size
:
13px
;
float
:
left
;
margin-right
:
$gl-padding
;
margin-right
:
-150px
;
padding-right
:
150px
;
line-height
:
20px
;
}
}
}
}
...
...
app/views/projects/_last_push.html.haml
View file @
40b7eedc
...
@@ -13,6 +13,6 @@
...
@@ -13,6 +13,6 @@
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
#{
time_ago_with_tooltip
(
event
.
created_at
)
}
.
pull
-right
.
flex
-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
_
(
"New merge request"
),
class:
"btn btn-info btn-sm qa-create-merge-request"
do
=
link_to
new_mr_path_from_push_event
(
event
),
title:
_
(
"New merge request"
),
class:
"btn btn-info btn-sm qa-create-merge-request"
do
#{
_
(
'Create merge request'
)
}
#{
_
(
'Create merge request'
)
}
changelogs/unreleased/44382-ui-breakdown-for-create-merge-request.yml
0 → 100644
View file @
40b7eedc
---
title
:
Fix UI breakdown for Create merge request button
merge_request
:
17821
author
:
Takuya Noguchi
type
:
fixed
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