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
4d098451
Commit
4d098451
authored
Jun 14, 2018
by
Annabel Gray
Committed by
Clement Ho
Jun 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Performance bar Gitaly modal is hard to read"
parent
b3969ed2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
12 deletions
+20
-12
app/assets/javascripts/performance_bar/components/detailed_metric.vue
...avascripts/performance_bar/components/detailed_metric.vue
+2
-2
app/assets/javascripts/vue_shared/components/gl_modal.vue
app/assets/javascripts/vue_shared/components/gl_modal.vue
+1
-1
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+0
-4
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+4
-0
app/assets/stylesheets/performance_bar.scss
app/assets/stylesheets/performance_bar.scss
+4
-4
lib/peek/rblineprof/custom_controller_helpers.rb
lib/peek/rblineprof/custom_controller_helpers.rb
+1
-1
spec/javascripts/vue_shared/components/gl_modal_spec.js
spec/javascripts/vue_shared/components/gl_modal_spec.js
+8
-0
No files found.
app/assets/javascripts/performance_bar/components/detailed_metric.vue
View file @
4d098451
...
@@ -56,7 +56,7 @@ export default {
...
@@ -56,7 +56,7 @@ export default {
<gl-modal
<gl-modal
:id=
"`modal-peek-$
{metric}-details`"
:id=
"`modal-peek-$
{metric}-details`"
:header-title-text="header"
:header-title-text="header"
modal-size="
lg
"
modal-size="
xl
"
class="performance-bar-modal"
class="performance-bar-modal"
>
>
<table
<table
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
<td
<td
v-for=
"key in keys"
v-for=
"key in keys"
:key=
"key"
:key=
"key"
class=
"break-word
all-words
"
class=
"break-word"
>
>
{{
item
[
key
]
}}
{{
item
[
key
]
}}
</td>
</td>
...
...
app/assets/javascripts/vue_shared/components/gl_modal.vue
View file @
4d098451
<
script
>
<
script
>
const
buttonVariants
=
[
'
danger
'
,
'
primary
'
,
'
success
'
,
'
warning
'
];
const
buttonVariants
=
[
'
danger
'
,
'
primary
'
,
'
success
'
,
'
warning
'
];
const
sizeVariants
=
[
'
sm
'
,
'
md
'
,
'
lg
'
];
const
sizeVariants
=
[
'
sm
'
,
'
md
'
,
'
lg
'
,
'
xl
'
];
export
default
{
export
default
{
name
:
'
GlModal
'
,
name
:
'
GlModal
'
,
...
...
app/assets/stylesheets/framework/common.scss
View file @
4d098451
...
@@ -440,10 +440,6 @@ img.emoji {
...
@@ -440,10 +440,6 @@ img.emoji {
.break-word
{
.break-word
{
word-wrap
:
break-word
;
word-wrap
:
break-word
;
&
.all-words
{
word-break
:
break-word
;
}
}
}
/** COMMON CLASSES **/
/** COMMON CLASSES **/
...
...
app/assets/stylesheets/framework/modal.scss
View file @
4d098451
.modal-xl
{
max-width
:
98%
;
}
.modal-header
{
.modal-header
{
background-color
:
$modal-body-bg
;
background-color
:
$modal-body-bg
;
...
...
app/assets/stylesheets/performance_bar.scss
View file @
4d098451
...
@@ -107,12 +107,12 @@
...
@@ -107,12 +107,12 @@
}
}
.performance-bar-modal
{
.performance-bar-modal
{
.modal-
footer
{
.modal-
body
{
display
:
none
;
padding
:
0
;
}
}
.modal-
dialog
{
.modal-
footer
{
width
:
860px
;
display
:
none
;
}
}
}
}
}
}
...
...
lib/peek/rblineprof/custom_controller_helpers.rb
View file @
4d098451
...
@@ -41,7 +41,7 @@ module Peek
...
@@ -41,7 +41,7 @@ module Peek
]
]
end
.
sort_by
{
|
a
,
b
,
c
,
d
,
e
,
f
|
-
f
}
end
.
sort_by
{
|
a
,
b
,
c
,
d
,
e
,
f
|
-
f
}
output
=
"<div class='modal-dialog modal-
lg
'><div class='modal-content'>"
output
=
"<div class='modal-dialog modal-
xl
'><div class='modal-content'>"
output
<<
"<div class='modal-header'>"
output
<<
"<div class='modal-header'>"
output
<<
"<h4>Line profiling:
#{
human_description
(
params
[
:lineprofiler
])
}
</h4>"
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
<<
"<button class='close' type='button' data-dismiss='modal' aria-label='close'><span aria-hidden='true'>×</span></button>"
...
...
spec/javascripts/vue_shared/components/gl_modal_spec.js
View file @
4d098451
...
@@ -208,6 +208,14 @@ describe('GlModal', () => {
...
@@ -208,6 +208,14 @@ describe('GlModal', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.modal-dialog
'
).
classList
.
contains
(
'
modal-lg
'
)).
toEqual
(
true
);
expect
(
vm
.
$el
.
querySelector
(
'
.modal-dialog
'
).
classList
.
contains
(
'
modal-lg
'
)).
toEqual
(
true
);
});
});
it
(
'
should render modal-xl
'
,
()
=>
{
vm
=
mountComponent
(
modalComponent
,
{
modalSize
:
'
xl
'
,
});
expect
(
vm
.
$el
.
querySelector
(
'
.modal-dialog
'
).
classList
.
contains
(
'
modal-xl
'
)).
toEqual
(
true
);
});
it
(
'
should not add modal size classes when md size is passed
'
,
()
=>
{
it
(
'
should not add modal size classes when md size is passed
'
,
()
=>
{
vm
=
mountComponent
(
modalComponent
,
{
vm
=
mountComponent
(
modalComponent
,
{
modalSize
:
'
md
'
,
modalSize
:
'
md
'
,
...
...
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