Merge branch 'scss-lint-fix' into 'master'

Fixed scss_lint failure

Closes #10541

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

app/assets/stylesheets/framework/common.scss

@@ -403,8 +403,6 @@ img.emoji {
 .append-bottom-default { margin-bottom: $gl-padding; }
 .prepend-bottom-32 { margin-bottom: 32px; }
 .inline { display: inline-block; }
-.block { display: block; }
-.flex { display: flex; }
 .center { text-align: center; }
 .block { display: block; }
 .flex { display: flex; }

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

-
 /**
  * Deploy boards
- */
- .deploy-board {
+*/
+.deploy-board {
   padding: 10px;
   background-color: $gray-light;
   min-height: 20px;