Merge branch '340627-rename-trace-css-jobs' into 'master'

Change trace to log in CSS to align with external language [RUN-AS-IF-FOSS]

See merge request gitlab-org/gitlab!71587

app/assets/javascripts/ide/components/jobs/detail.vue

@@ -97,7 +97,7 @@ export default {
         <scroll-button :disabled="isScrolledToBottom" direction="down" @click="scrollDown" />
       </div>
     </div>
-    <pre ref="buildJobLog" class="build-trace mb-0 h-100 mr-3" @scroll="scrollBuildLog">
+    <pre ref="buildJobLog" class="build-log mb-0 h-100 mr-3" @scroll="scrollBuildLog">
       <code
         v-show="!detailJob.isLoading"
         class="bash"

app/assets/javascripts/jobs/components/job_app.vue

@@ -279,7 +279,7 @@ export default {
         <!-- job log -->
         <div
           v-if="hasJobLog"
-          class="build-trace-container gl-relative"
+          class="build-log-container gl-relative"
           :class="{ 'gl-mt-3': !job.archived }"
         >
           <log-top-bar

app/assets/javascripts/logs/components/environment_logs.vue

@@ -214,7 +214,7 @@ export default {
       <template #items>
         <pre
           ref="logTrace"
-          class="build-trace"
+          class="build-log"
         ><code class="bash js-build-output"><div v-if="showLoader" class="build-loader-animation js-build-loader-animation">
           <div class="dot"></div>
           <div class="dot"></div>

app/assets/stylesheets/bootstrap_migration.scss

@@ -112,7 +112,7 @@ code {
   border-radius: $border-radius-default;
 
   .code > &,
-  .build-trace & {
+  .build-log & {
     background-color: inherit;
     padding: unset;
   }

app/assets/stylesheets/framework/job_log.scss

@@ -5,10 +5,10 @@
   font-size: 13px;
   word-break: break-all;
   word-wrap: break-word;
-  color: color-yiq($builds-trace-bg);
+  color: color-yiq($builds-log-bg);
   border-radius: $border-radius-small;
   min-height: 42px;
-  background-color: $builds-trace-bg;
+  background-color: $builds-log-bg;
 }
 
 .log-line {

app/assets/stylesheets/framework/mixins.scss

@@ -239,7 +239,7 @@
 /*
 * Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs)
 */
-@mixin build-trace($background: $black) {
+@mixin build-log($background: $black) {
   background: $background;
   color: $gray-darkest;
   white-space: pre;
@@ -253,13 +253,13 @@
     display: block;
   }
 
-  &.build-trace-rounded {
+  &.build-log-rounded {
     border-radius: $gl-border-radius-base;
   }
 }
 
 // Used in EE for Web Terminal
-@mixin build-trace-bar($height) {
+@mixin build-log-bar($height) {
   height: $height;
   min-height: $height;
   background: var(--gray-50, $gray-50);
@@ -268,8 +268,8 @@
   padding: $grid-size;
 }
 
-@mixin build-trace-top-bar($height) {
-  @include build-trace-bar($height);
+@mixin build-log-top-bar($height) {
+  @include build-log-bar($height);
 
   position: -webkit-sticky;
   position: sticky;

app/assets/stylesheets/framework/variables.scss

@@ -697,7 +697,7 @@ $blame-blue: #254e77;
 /*
 * Builds
 */
-$builds-trace-bg: #111;
+$builds-log-bg: #111;
 $job-log-highlight-height: 18px;
 $job-log-line-padding: 55px;
 $job-line-number-width: 50px;

app/assets/stylesheets/page_bundles/_ide_mixins.scss

@@ -4,7 +4,7 @@
   height: 100%;
 
   .top-bar {
-    @include build-trace-bar(35px);
+    @include build-log-bar(35px);
 
     top: 0;
     font-size: 12px;

app/assets/stylesheets/page_bundles/build.scss

 @import 'mixins_and_variables_and_functions';
 
 .build-page {
-  .build-trace {
-    @include build-trace();
+  .build-log {
+    @include build-log();
   }
 
   .archived-job {
@@ -18,7 +18,7 @@
   }
 
   .top-bar {
-    @include build-trace-top-bar(50px);
+    @include build-log-top-bar(50px);
 
     &.has-archived-block {
       top: $header-height + 28px;

app/assets/stylesheets/page_bundles/pipeline.scss

@@ -44,14 +44,14 @@
     line-height: initial;
   }
 
-  .build-trace-row td {
+  .build-log-row td {
     border-top: 0;
     border-bottom-width: 1px;
     border-bottom-style: solid;
     padding-top: 0;
   }
 
-  .build-trace {
+  .build-log {
     width: 100%;
     text-align: left;
     margin-top: $gl-padding;
@@ -93,7 +93,7 @@
   }
 
   .build-state,
-  .build-trace-row {
+  .build-log-row {
     > td:last-child {
       padding-right: 0;
     }
@@ -108,12 +108,12 @@
       margin-top: 2 * $gl-padding;
     }
 
-    .build-trace-container {
+    .build-log-container {
       padding-top: $gl-padding;
       padding-bottom: $gl-padding;
     }
 
-    .build-trace {
+    .build-log {
       margin-bottom: 0;
       margin-top: 0;
     }
@@ -221,8 +221,8 @@
 }
 
 .test-reports-table {
-  .build-trace {
-    @include build-trace();
+  .build-log {
+    @include build-log();
   }
 }
 

app/assets/stylesheets/pages/environment_logs.scss

@@ -40,8 +40,8 @@
     height: 100%;
   }
 
-  .build-trace {
-    @include build-trace($black);
+  .build-log {
+    @include build-log($black);
   }
 
   .gl-infinite-scroll-legend {

app/views/projects/pipelines/_with_tabs.html.haml

@@ -70,10 +70,10 @@
                   = link_to retry_project_job_path(build.project, build, return_to: request.original_url), method: :post, title: _('Retry'), class: 'gl-button btn btn-default btn-icon' do
                     = sprite_icon('repeat', css_class: 'gl-icon')
             - if can?(current_user, :read_build, job)
-              %tr.build-trace-row.responsive-table-border-end
+              %tr.build-log-row.responsive-table-border-end
                 %td
-                %td.responsive-table-cell.build-trace-container{ colspan: 4 }
-                  %pre.build-trace.build-trace-rounded
+                %td.responsive-table-cell.build-log-container{ colspan: 4 }
+                  %pre.build-log.build-log-rounded
                     %code.bash.js-build-output
                       = build_summary(build)
 

app/views/shared/builds/_build_output.html.haml

-%pre.build-trace#build-trace
+%pre.build-log
   %code.bash.js-build-output
   .build-loader-animation.js-build-refresh
     .dot