Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master'

Enable UnnecessaryParentReference in scss-lint See merge request !12738

Merge branch 'enable-scss-lint-unnecessary-parent-reference' into 'master'
Enable UnnecessaryParentReference in scss-lint See merge request !12738
3bce3014 · Clement Ho · 7fb7acd7 · 325191dd · 3bce3014 · 3bce3014
Commit 3bce3014 authored Jul 12, 2017 by Clement Ho
10 changed files
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -244,7 +244,7 @@ linters:
  # Do not use parent selector references (&) when they would otherwise
  # be unnecessary.
  UnnecessaryParentReference:
-    enabled: false
+    enabled: true

  # URLs should be valid and not contain protocols or domain names.
  UrlFormat:

--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -368,7 +368,7 @@
    margin-right: 0.3em;
  }

-  & > .value {
+  > .value {
    font-weight: 600;
  }
 }
@@ -467,7 +467,7 @@
    -webkit-flex-direction: column;
    flex-direction: column;

-    &> span {
+    > span {
      white-space: normal;
      word-break: break-all;
    }

--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -61,7 +61,7 @@
      &:focus {
        outline: none;

-        & i {
+        i {
          visibility: visible;
        }
      }

--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -96,7 +96,7 @@
      overflow: visible;
    }

-    & > span {
+    > span {
      padding-right: 4px;
    }


--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -250,7 +250,7 @@ ul.notes {
      }

      .note-text {
-        & p:first-child {
+        p:first-child {
          display: none;
        }


--- a/app/assets/stylesheets/pages/pipeline_schedules.scss
+++ b/app/assets/stylesheets/pages/pipeline_schedules.scss
@@ -96,12 +96,12 @@
  }

  &:last-child {
-    & .pipeline-variable-row-remove-button {
+    .pipeline-variable-row-remove-button {
      display: none;
    }

    @media (max-width: $screen-sm-max) {
-      & .pipeline-variable-value-input {
+      .pipeline-variable-value-input {
        margin-right: $pipeline-variable-remove-button-width;
      }
    }

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -26,7 +26,7 @@
      margin-bottom: 5px;
    }

-    & > .form-group {
+    > .form-group {
      padding-left: 0;
    }

@@ -83,7 +83,7 @@
      border: 1px solid $border-color;
    }

-    & + .select2 a {
+    + .select2 a {
      border-top-left-radius: 0;
      border-bottom-left-radius: 0;
    }

--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -81,7 +81,7 @@
  .todo-title {
    display: flex;

-    & > .title-item {
+    > .title-item {
      -webkit-flex: 0 0 auto;
      flex: 0 0 auto;
      margin: 0 2px;

--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -147,13 +147,13 @@
 }

 ul.wiki-pages-list.content-list {
-  & ul {
+  ul {
    list-style: none;
    margin-left: 0;
    padding-left: 15px;
  }

-  & ul li {
+  ul li {
    padding: 5px 0;
  }
 }

--- a/changelogs/unreleased/enable-scss-lint-unnecessary-parent-reference.yml
+++ b/changelogs/unreleased/enable-scss-lint-unnecessary-parent-reference.yml
+---
+title: Enable UnnecessaryParentReference in scss-lint
+merge_request: 12738
+author: Takuya Noguchi