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
5e26ce7d
Commit
5e26ce7d
authored
Apr 08, 2021
by
Yogi
Committed by
Kushal Pandya
Apr 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update performance bar background color to use the color variables
parent
f474a677
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
app/assets/javascripts/performance_bar/components/detailed_metric.vue
...avascripts/performance_bar/components/detailed_metric.vue
+2
-2
app/assets/javascripts/performance_bar/components/performance_bar_app.vue
...cripts/performance_bar/components/performance_bar_app.vue
+4
-4
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+4
-4
app/assets/stylesheets/performance_bar.scss
app/assets/stylesheets/performance_bar.scss
+1
-1
changelogs/unreleased/pb-bg-color.yml
changelogs/unreleased/pb-bg-color.yml
+4
-0
No files found.
app/assets/javascripts/performance_bar/components/detailed_metric.vue
View file @
5e26ce7d
...
@@ -133,7 +133,7 @@ export default {
...
@@ -133,7 +133,7 @@ export default {
>
>
<gl-button
v-gl-modal=
"modalId"
class=
"gl-mr-2"
type=
"button"
variant=
"link"
>
<gl-button
v-gl-modal=
"modalId"
class=
"gl-mr-2"
type=
"button"
variant=
"link"
>
<span
<span
class=
"gl-text-blue-
3
00 gl-font-weight-bold"
class=
"gl-text-blue-
2
00 gl-font-weight-bold"
data-testid=
"performance-bar-details-label"
data-testid=
"performance-bar-details-label"
>
>
{{
metricDetailsLabel
}}
{{
metricDetailsLabel
}}
...
@@ -208,7 +208,7 @@ export default {
...
@@ -208,7 +208,7 @@ export default {
<
div
><
/div
>
<
div
><
/div
>
<
/template
>
<
/template
>
<
/gl-modal
>
<
/gl-modal
>
{{
title
}}
<
span
class
=
"
gl-text-white
"
>
{{
title
}}
<
/span
>
<
request
-
warning
:
html
-
id
=
"
htmlId
"
:
warnings
=
"
warnings
"
/>
<
request
-
warning
:
html
-
id
=
"
htmlId
"
:
warnings
=
"
warnings
"
/>
<
/div
>
<
/div
>
<
/template
>
<
/template
>
app/assets/javascripts/performance_bar/components/performance_bar_app.vue
View file @
5e26ce7d
...
@@ -136,7 +136,7 @@ export default {
...
@@ -136,7 +136,7 @@ export default {
<div
id=
"peek-view-host"
class=
"view"
>
<div
id=
"peek-view-host"
class=
"view"
>
<span
<span
v-if=
"hasHost"
v-if=
"hasHost"
class=
"current-host"
class=
"current-host
gl-text-white
"
:class=
"
{ canary: currentRequest.details.host.canary }"
:class=
"
{ canary: currentRequest.details.host.canary }"
>
>
<span
v-html=
"birdEmoji"
></span>
<span
v-html=
"birdEmoji"
></span>
...
@@ -157,16 +157,16 @@ export default {
...
@@ -157,16 +157,16 @@ export default {
id=
"peek-view-trace"
id=
"peek-view-trace"
class=
"view"
class=
"view"
>
>
<a
class=
"gl-text-blue-
3
00"
:href=
"currentRequest.details.tracing.tracing_url"
>
{{
<a
class=
"gl-text-blue-
2
00"
:href=
"currentRequest.details.tracing.tracing_url"
>
{{
s__
(
'
PerformanceBar|Trace
'
)
s__
(
'
PerformanceBar|Trace
'
)
}}
</a>
}}
</a>
</div>
</div>
<div
v-if=
"currentRequest.details"
id=
"peek-download"
class=
"view"
>
<div
v-if=
"currentRequest.details"
id=
"peek-download"
class=
"view"
>
<a
class=
"gl-text-blue-
3
00"
:download=
"downloadName"
:href=
"downloadPath"
>
{{
<a
class=
"gl-text-blue-
2
00"
:download=
"downloadName"
:href=
"downloadPath"
>
{{
s__
(
'
PerformanceBar|Download
'
)
s__
(
'
PerformanceBar|Download
'
)
}}
</a>
}}
</a>
</div>
</div>
<a
v-if=
"statsUrl"
class=
"gl-text-blue-
3
00 view"
:href=
"statsUrl"
>
{{
<a
v-if=
"statsUrl"
class=
"gl-text-blue-
2
00 view"
:href=
"statsUrl"
>
{{
s__
(
'
PerformanceBar|Stats
'
)
s__
(
'
PerformanceBar|Stats
'
)
}}
</a>
}}
</a>
<request-selector
<request-selector
...
...
app/assets/stylesheets/framework/variables.scss
View file @
5e26ce7d
...
@@ -842,10 +842,10 @@ $linked-project-column-margin: 60px;
...
@@ -842,10 +842,10 @@ $linked-project-column-margin: 60px;
/*
/*
Performance Bar
Performance Bar
*/
*/
$perf-bar-production
:
#222
;
$perf-bar-production
:
$gray-950
;
$perf-bar-staging
:
#29143
0
;
$perf-bar-staging
:
$indigo-95
0
;
$perf-bar-development
:
#4c121
0
;
$perf-bar-development
:
$red-95
0
;
$perf-bar-bucket-bg
:
#111
;
$perf-bar-bucket-bg
:
$black
;
$perf-bar-bucket-box-shadow-from
:
rgba
(
$white
,
0
.2
);
$perf-bar-bucket-box-shadow-from
:
rgba
(
$white
,
0
.2
);
$perf-bar-bucket-box-shadow-to
:
rgba
(
$black
,
0
.25
);
$perf-bar-bucket-box-shadow-to
:
rgba
(
$black
,
0
.25
);
$perf-bar-canary-text
:
$orange-400
;
$perf-bar-canary-text
:
$orange-400
;
...
...
app/assets/stylesheets/performance_bar.scss
View file @
5e26ce7d
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
color
:
$gray-300
;
color
:
$gray-300
;
select
{
select
{
color
:
$
gray-300
;
color
:
$
white
;
width
:
200px
;
width
:
200px
;
}
}
...
...
changelogs/unreleased/pb-bg-color.yml
0 → 100644
View file @
5e26ce7d
title
:
Update performance bar background color to use Pajamas compliant colour palette
merge_request
:
52775
author
:
Yogi (@yo)
type
:
changed
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