Commit 7d880b7d authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'pb-bg-color' into 'master'

Update performance bar background color to use the color variables

See merge request gitlab-org/gitlab!52775
parents 6d4a29e9 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-300 gl-font-weight-bold" class="gl-text-blue-200 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>
...@@ -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-300" :href="currentRequest.details.tracing.tracing_url">{{ <a class="gl-text-blue-200" :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-300" :download="downloadName" :href="downloadPath">{{ <a class="gl-text-blue-200" :download="downloadName" :href="downloadPath">{{
s__('PerformanceBar|Download') s__('PerformanceBar|Download')
}}</a> }}</a>
</div> </div>
<a v-if="statsUrl" class="gl-text-blue-300 view" :href="statsUrl">{{ <a v-if="statsUrl" class="gl-text-blue-200 view" :href="statsUrl">{{
s__('PerformanceBar|Stats') s__('PerformanceBar|Stats')
}}</a> }}</a>
<request-selector <request-selector
......
...@@ -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: #291430; $perf-bar-staging: $indigo-950;
$perf-bar-development: #4c1210; $perf-bar-development: $red-950;
$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;
......
...@@ -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;
} }
......
title: Update performance bar background color to use Pajamas compliant colour palette
merge_request: 52775
author: Yogi (@yo)
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment