Merge branch '10943-css-clean-up' into 'master'

Fixes style-lint errors and warnings for EE builds.scss file

Closes #10943

See merge request gitlab-org/gitlab-ee!15368

app/assets/stylesheets/framework/common.scss

@@ -438,6 +438,7 @@ img.emoji {
 .w-3rem { width: 3rem; }
 
 .h-12em { height: 12em; }
+.h-32-px { height: 32px;}
 
 .mw-460 { max-width: 460px; }
 .mw-6em { max-width: 6em; }

ee/app/assets/javascripts/kubernetes_logs.js

@@ -79,7 +79,7 @@ export default class KubernetesPodLogs extends LogOutputBehaviours {
     this.$podDropdown
       .find('.dropdown-menu-toggle')
       .html(
-        `<span class="dropdown-toggle-text">${this.podName}</span><i class="fa fa-chevron-down"></i>`,
+        `<span class="dropdown-toggle-text text-truncate">${this.podName}</span><i class="fa fa-chevron-down"></i>`,
       );
     $podDropdownMenu.off('click');
     $podDropdownMenu.empty();

ee/app/assets/stylesheets/pages/builds.scss

@@ -17,29 +17,16 @@
       align-items: center;
     }
 
-    .dropdown {
-      display: flex;
-
-      > .dropdown-menu-toggle {
-        display: flex;
-        align-content: center;
-        align-self: center;
-        width: 200px;
-
-        @include media-breakpoint-up(sm) {
-          width: 300px;
-        }
-      }
+    .dropdown-menu-toggle {
+      width: 200px;
 
-      > .dropdown-menu {
+      @include media-breakpoint-up(sm) {
         width: 300px;
       }
+    }
 
-      .dropdown-toggle-text {
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-      }
+    .dropdown-menu {
+      width: 300px;
     }
 
     .controllers {
@@ -49,19 +36,13 @@
     .refresh-control {
       @include build-controllers(16px, flex-end, true, 0);
       margin-left: 2px;
-
-      .controllers-buttons {
-        .btn-refresh {
-          height: 32px;
-
-          svg {
-            top: 0;
-          }
-        }
-      }
     }
   }
 
+  .btn-refresh svg {
+    top: 0;
+  }
+
   .build-loader-animation {
     @include build-loader-animation;
   }

ee/app/views/projects/environments/logs.html.haml

@@ -4,8 +4,8 @@
       .top-bar.js-top-bar
         .truncated-info.d-none.d-md-flex.append-right-8
           = s_('Environments|Pod logs from')
-        .dropdown.js-pod-dropdown
-          %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' }, 'aria-expanded': false }
+        .dropdown.js-pod-dropdown.d-flex
+          %button.dropdown-menu-toggle.d-flex.align-content-center.align-self-center{ type: 'button', data: { toggle: 'dropdown' }, 'aria-expanded': false }
             = icon('chevron-down')
           .dropdown-menu.dropdown-menu-selectable.dropdown-menu-drop-up
         .controllers
@@ -17,7 +17,7 @@
               = custom_icon('scroll_down')
           .refresh-control
             .has-tooltip.controllers-buttons{ title: _('Refresh'), data: { placement: 'top', container: 'body'} }
-              %button.js-refresh-log.btn.btn-default.btn-refresh{ type: 'button', disabled: true }
+              %button.js-refresh-log.btn.btn-default.btn-refresh.h-32-px{ type: 'button', disabled: true }
                 = sprite_icon('retry')
 
       = render 'shared/builds/build_output'

ee/changelogs/unreleased/10943-css-clean-up.yml

+---
+title: Fixes style-lint errors and warnings for EE builds.scss file
+merge_request:
+author:
+type: other