BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e1b3a11f
Commit
e1b3a11f
authored
May 30, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '46999-line-profiling-modal-width' into 'master'
Line profiling modal width Closes #46999 See merge request gitlab-org/gitlab-ce!19253
parents
439adb96
045e4a97
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
modal.scss
app/assets/stylesheets/framework/modal.scss
+0
-6
46999-line-profiling-modal-width.yml
changelogs/unreleased/46999-line-profiling-modal-width.yml
+5
-0
custom_controller_helpers.rb
lib/peek/rblineprof/custom_controller_helpers.rb
+2
-2
No files found.
app/assets/stylesheets/framework/modal.scss
View file @
e1b3a11f
...
...
@@ -74,12 +74,6 @@ body.modal-open {
}
}
@include
media-breakpoint-up
(
lg
)
{
.modal-full
{
width
:
98%
;
}
}
.modal
{
background-color
:
$black-transparent
;
z-index
:
2100
;
...
...
changelogs/unreleased/46999-line-profiling-modal-width.yml
0 → 100644
View file @
e1b3a11f
---
title
:
Fix UI broken in line profiling modal due to Bootstrap 4
merge_request
:
19253
author
:
Takuya Noguchi
type
:
other
lib/peek/rblineprof/custom_controller_helpers.rb
View file @
e1b3a11f
...
...
@@ -41,10 +41,10 @@ module Peek
]
end
.
sort_by
{
|
a
,
b
,
c
,
d
,
e
,
f
|
-
f
}
output
=
"<div class='modal-dialog modal-
full
'><div class='modal-content'>"
output
=
"<div class='modal-dialog modal-
lg
'><div class='modal-content'>"
output
<<
"<div class='modal-header'>"
output
<<
"<button class='close btn btn-link btn-sm' type='button' data-dismiss='modal'>X</button>"
output
<<
"<h4>Line profiling:
#{
human_description
(
params
[
:lineprofiler
])
}
</h4>"
output
<<
"<button class='close' type='button' data-dismiss='modal' aria-label='close'><span aria-hidden='true'>×</span></button>"
output
<<
"</div>"
output
<<
"<div class='modal-body'>"
...
...
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