From efb5a62f4bf6dd43b20d104e4a216f8983ca2ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 2 Dec 2014 12:20:50 +0100 Subject: [PATCH] Fix a lot of import/extend lint errors on sass --- app/styles/components/filter.scss | 2 +- app/styles/components/kanban-task.scss | 6 +++--- app/styles/components/taskboard-task.scss | 2 +- app/styles/components/watchers.scss | 2 +- app/styles/layout/invitation.scss | 4 ++-- app/styles/layout/login.scss | 2 +- app/styles/layout/not-found.scss | 2 +- app/styles/layout/typography.scss | 2 +- app/styles/layout/us-detail.scss | 4 ++-- app/styles/modules/admin/admin-functionalities.scss | 2 +- app/styles/modules/admin/admin-roles.scss | 2 +- app/styles/modules/auth/change-password-from-recovery.scss | 2 +- app/styles/modules/auth/login-form.scss | 2 +- app/styles/modules/backlog/backlog-table.scss | 4 ++-- app/styles/modules/backlog/sprints.scss | 6 +++--- app/styles/modules/backlog/taskboard-table.scss | 2 +- app/styles/modules/common/assigned-to.scss | 4 ++-- app/styles/modules/common/attachments.scss | 4 ++-- app/styles/modules/common/category-config.scss | 2 +- app/styles/modules/common/lightbox.scss | 2 +- app/styles/modules/common/related-tasks.scss | 2 +- app/styles/modules/common/wizard.scss | 2 +- app/styles/modules/create-project.scss | 2 +- app/styles/modules/filters/filters.scss | 2 +- app/styles/modules/home-projects-list.scss | 2 +- app/styles/modules/issues/issues-table.scss | 4 ++-- app/styles/modules/kanban/kanban-table.scss | 4 ++-- app/styles/modules/search/search-result-table.scss | 6 +++--- app/styles/modules/team/team-table.scss | 2 +- scsslint.yml | 7 ++++++- 30 files changed, 48 insertions(+), 43 deletions(-) diff --git a/app/styles/components/filter.scss b/app/styles/components/filter.scss index a4d5b48d..dac49854 100644 --- a/app/styles/components/filter.scss +++ b/app/styles/components/filter.scss @@ -1,7 +1,7 @@ .single-filter { @extend %large; - @include clearfix; @extend %title; + @include clearfix; cursor: pointer; display: block; height: 32px; diff --git a/app/styles/components/kanban-task.scss b/app/styles/components/kanban-task.scss index e6a47862..5a09967c 100644 --- a/app/styles/components/kanban-task.scss +++ b/app/styles/components/kanban-task.scss @@ -14,8 +14,8 @@ } } &.ui-sortable-helper { - box-shadow: 1px 1px 15px rgba($black, .4); @include transition(box-shadow .3s linear); + box-shadow: 1px 1px 15px rgba($black, .4); } &.blocked { background: $red; @@ -68,8 +68,8 @@ display: block; } .task-text { - @include table-flex-child($flex-grow: 10, $flex-basis: 50px); @extend %small; + @include table-flex-child($flex-grow: 10, $flex-basis: 50px); padding: 0 .5rem 0 .8rem; word-wrap: break-word; } @@ -83,8 +83,8 @@ } .icon-edit, .icon-drag-h { - @include transition(opacity .2s linear); @extend %large; + @include transition(opacity .2s linear); color: $postit-hover; opacity: 0; position: absolute; diff --git a/app/styles/components/taskboard-task.scss b/app/styles/components/taskboard-task.scss index 6e4d57fb..7b9fe6e0 100644 --- a/app/styles/components/taskboard-task.scss +++ b/app/styles/components/taskboard-task.scss @@ -17,8 +17,8 @@ } } &.ui-sortable-helper { - box-shadow: 1px 1px 15px rgba($black, .4); @include transition(box-shadow .3s linear); + box-shadow: 1px 1px 15px rgba($black, .4); } &.ui-sortable-placeholder { background: $grayer; diff --git a/app/styles/components/watchers.scss b/app/styles/components/watchers.scss index 5c08a5d2..a078792c 100644 --- a/app/styles/components/watchers.scss +++ b/app/styles/components/watchers.scss @@ -35,8 +35,8 @@ } } .watcher-name { - @include table-flex-child(8, 0); @extend %small; + @include table-flex-child(8, 0); color: $grayer; margin-left: 1rem; position: relative; diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss index 8d8f781d..59b7d0c2 100644 --- a/app/styles/layout/invitation.scss +++ b/app/styles/layout/invitation.scss @@ -1,6 +1,6 @@ .invitation-main { - @include table-flex(center, center, flex, row, wrap, center); @extend %background-taiga; + @include table-flex(center, center, flex, row, wrap, center); bottom: 0; left: 0; position: fixed; @@ -62,8 +62,8 @@ } } .forgot-pass { - @include transition(all .3s linear); @extend %small; + @include transition(all .3s linear); color: $gray-light; opacity: 1; position: absolute; diff --git a/app/styles/layout/login.scss b/app/styles/layout/login.scss index 3f53e123..781190aa 100644 --- a/app/styles/layout/login.scss +++ b/app/styles/layout/login.scss @@ -1,10 +1,10 @@ .login-main { + @extend %triangled-bg; //@include table-flex(center, center, flex, row, wrap, center); @include display(flex); @include align-items(center); @include flex-direction(row); @include justify-content(center); - @extend %triangled-bg; bottom: 0; left: 0; position: fixed; diff --git a/app/styles/layout/not-found.scss b/app/styles/layout/not-found.scss index 40ea6346..7c00b74f 100644 --- a/app/styles/layout/not-found.scss +++ b/app/styles/layout/not-found.scss @@ -1,9 +1,9 @@ .error-main { + @extend %background-taiga; @include display(flex); @include align-items(center); @include flex-direction(row); @include justify-content(center); - @extend %background-taiga; bottom: 0; left: 0; position: fixed; diff --git a/app/styles/layout/typography.scss b/app/styles/layout/typography.scss index 8808712b..3127c82c 100755 --- a/app/styles/layout/typography.scss +++ b/app/styles/layout/typography.scss @@ -56,8 +56,8 @@ h1 { color: $green-taiga; } .date { - color: $gray-light; @include ellipsis(500px); + color: $gray-light; } } diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index f93c8199..e2a39843 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -9,9 +9,9 @@ padding: 1rem; position: relative; &.blocked { + @include transition(all .2s linear); background: $red; vertical-align: middle; - @include transition(all .2s linear); .us-title-text, input { margin-bottom: .5rem; @@ -50,8 +50,8 @@ @include table-flex(); } input { - background: $white; @include table-flex-child(1, 90%, 0); + background: $white; } .us-title-text { display: flex; diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss index 909bd3e0..19be0b10 100644 --- a/app/styles/modules/admin/admin-functionalities.scss +++ b/app/styles/modules/admin/admin-functionalities.scss @@ -25,8 +25,8 @@ opacity: 1; } .icon { - @include table-flex-child(1, 120px, 0, 100%); @extend %xxlarge; + @include table-flex-child(1, 120px, 0, 100%); margin: 0 auto; min-height: 60px; text-align: center; diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss index 5992dc79..07805b18 100644 --- a/app/styles/modules/admin/admin-roles.scss +++ b/app/styles/modules/admin/admin-roles.scss @@ -5,8 +5,8 @@ color: $grayer; } .edit-value { - @include transition(opacity .3s linear); @extend %medium; + @include transition(opacity .3s linear); color: $gray-light; cursor: pointer; margin-left: .5rem; diff --git a/app/styles/modules/auth/change-password-from-recovery.scss b/app/styles/modules/auth/change-password-from-recovery.scss index 6d5a3292..6558c750 100644 --- a/app/styles/modules/auth/change-password-from-recovery.scss +++ b/app/styles/modules/auth/change-password-from-recovery.scss @@ -14,8 +14,8 @@ } } .get-token { - @include transition(all .3s linear); @extend %small; + @include transition(all .3s linear); color: $gray-light; opacity: 1; position: absolute; diff --git a/app/styles/modules/auth/login-form.scss b/app/styles/modules/auth/login-form.scss index 40d4a36c..80b88cc1 100644 --- a/app/styles/modules/auth/login-form.scss +++ b/app/styles/modules/auth/login-form.scss @@ -9,8 +9,8 @@ } } .forgot-pass { - @include transition(all .3s linear); @extend %small; + @include transition(all .3s linear); color: $gray-light; opacity: 1; position: absolute; diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss index 3c8e7212..81d885aa 100644 --- a/app/styles/modules/backlog/backlog-table.scss +++ b/app/styles/modules/backlog/backlog-table.scss @@ -184,8 +184,8 @@ border-bottom: 1px solid $white; color: $white; &:hover { - background: $red; @include transition (background .2s ease-in); + background: $red; } a { color: $white !important; @@ -217,8 +217,8 @@ } .us-settings a, .icon-drag-v { - @include transition (all .2s ease-in); @extend %large; + @include transition (all .2s ease-in); color: $gray-light; width: 30px; &:hover { diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index 52000ff5..aca0c5f9 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -1,7 +1,7 @@ .sprints { .summary { - background: $gray-light; @include clearfix; + background: $gray-light; ul { width: 40%; } @@ -127,8 +127,8 @@ text-align: left; width: 100%; &:hover { - background: lighten($gray-light, 12%); @include transition (background .2s ease-in); + background: lighten($gray-light, 12%); cursor: move; } &:last-child { @@ -146,8 +146,8 @@ } .column-us { - @include table-flex-child(3, 0, 0); @extend %small; + @include table-flex-child(3, 0, 0); padding: 0 4px; } .us-name { diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss index 84eafb69..1d028e95 100644 --- a/app/styles/modules/backlog/taskboard-table.scss +++ b/app/styles/modules/backlog/taskboard-table.scss @@ -21,8 +21,8 @@ $column-margin: 0 10px 0 0; position: absolute; } .task-colum-name { - @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width); @extend %large; + @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width); background: $whitish; border-top: 3px solid $gray-light; margin: $column-margin; diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss index 9fc78665..4f8171c8 100644 --- a/app/styles/modules/common/assigned-to.scss +++ b/app/styles/modules/common/assigned-to.scss @@ -13,12 +13,12 @@ &.loading { width: 100%; span { + @include animation (loading .5s linear); + @include animation (spin 1s linear infinite); font-size: 30px; padding: 20px 0; text-align: center; width: 100%; - @include animation (loading .5s linear); - @include animation (spin 1s linear infinite); } } .user-avatar { diff --git a/app/styles/modules/common/attachments.scss b/app/styles/modules/common/attachments.scss index 92050f74..a19ef7d4 100644 --- a/app/styles/modules/common/attachments.scss +++ b/app/styles/modules/common/attachments.scss @@ -27,8 +27,8 @@ } .single-attachment { - @include table-flex(); @extend %small; + @include table-flex(); align-items: center; border-bottom: 1px solid $whitish; padding: .5rem 0 .5rem 1rem; @@ -57,9 +57,9 @@ height: 40px; } .attachment-name { + @extend %bold; @include ellipsis(200px); @include table-flex-child(1, 35%, 0); - @extend %bold; padding-right: 1rem; .icon { margin-right: .5rem; diff --git a/app/styles/modules/common/category-config.scss b/app/styles/modules/common/category-config.scss index 0eac6075..9d55a70c 100644 --- a/app/styles/modules/common/category-config.scss +++ b/app/styles/modules/common/category-config.scss @@ -36,8 +36,8 @@ } } .icon { - @include flex(1); @extend %xlarge; + @include flex(1); text-align: right; } .category-items { diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index 247a34b2..5f71b8c9 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -14,8 +14,8 @@ border-right: 1px solid $gray-light; } &:hover { - color: $grayer; @include transition(color .2s linear); + color: $grayer; } } .active { diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss index bf4dfb8b..7ea10e14 100644 --- a/app/styles/modules/common/related-tasks.scss +++ b/app/styles/modules/common/related-tasks.scss @@ -158,8 +158,8 @@ top: .1rem; width: 10%; a { - @include transition (all .2s ease-in); @extend %large; + @include transition (all .2s ease-in); color: $gray-light; &:hover { @include transition (all .2s ease-in); diff --git a/app/styles/modules/common/wizard.scss b/app/styles/modules/common/wizard.scss index 1ea1a730..7708d638 100644 --- a/app/styles/modules/common/wizard.scss +++ b/app/styles/modules/common/wizard.scss @@ -36,9 +36,9 @@ } } .wizard-step { - display: none; @include animation(formSlide .4s ease-in-out); @include animation-direction(alternate-reverse); + display: none; &.active { @include animation(formSlide .4s ease-in-out); &.create-step2, diff --git a/app/styles/modules/create-project.scss b/app/styles/modules/create-project.scss index cf4e8c36..3493b97a 100644 --- a/app/styles/modules/create-project.scss +++ b/app/styles/modules/create-project.scss @@ -1,6 +1,6 @@ .create-project { - @include table-flex(center, center, flex, row, wrap, center); @extend %triangled-bg; + @include table-flex(center, center, flex, row, wrap, center); bottom: 0; left: 0; position: fixed; diff --git a/app/styles/modules/filters/filters.scss b/app/styles/modules/filters/filters.scss index a98e3218..15c5d023 100644 --- a/app/styles/modules/filters/filters.scss +++ b/app/styles/modules/filters/filters.scss @@ -32,8 +32,8 @@ } .filters-inner { - opacity: 0; @include transition (all .1s ease-in); + opacity: 0; .loading { background: $grayer; border: 1px solid #b8b8b8; diff --git a/app/styles/modules/home-projects-list.scss b/app/styles/modules/home-projects-list.scss index ad2ee7c3..66fd5d6f 100644 --- a/app/styles/modules/home-projects-list.scss +++ b/app/styles/modules/home-projects-list.scss @@ -1,8 +1,8 @@ .home-projects-list, .home-project { @extend %background-taiga; - background-color: $black; @include table-flex(center, center, flex, row, wrap, center); + background-color: $black; background-position: center center; background-size: cover; height: 100%; diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss index 3c773832..34d642f4 100644 --- a/app/styles/modules/issues/issues-table.scss +++ b/app/styles/modules/issues/issues-table.scss @@ -6,16 +6,16 @@ } .row { &:hover { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); } .icon { display: inline; } } .row-selected { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); } .title { @extend %medium; diff --git a/app/styles/modules/kanban/kanban-table.scss b/app/styles/modules/kanban/kanban-table.scss index fe12d441..5c3146c2 100644 --- a/app/styles/modules/kanban/kanban-table.scss +++ b/app/styles/modules/kanban/kanban-table.scss @@ -53,10 +53,10 @@ $column-margin: 0 10px 0 0; position: absolute; } .task-colum-name { + @extend %large; @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width); @include table-flex(); @include justify-content(space-between); - @extend %large; background: $whitish; border-top: 3px solid $gray-light; margin: $column-margin; @@ -84,8 +84,8 @@ $column-margin: 0 10px 0 0; } .kanban-table-body { - @include table-flex(); @extend %medium; + @include table-flex(); overflow: hidden; overflow-x: auto; width: 100%; diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss index 3a8b4542..3abe6471 100644 --- a/app/styles/modules/search/search-result-table.scss +++ b/app/styles/modules/search/search-result-table.scss @@ -10,8 +10,8 @@ @include table-flex($align-content: center, $align-items: center); padding: .5rem; &:hover { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); } .user-stories { @include table-flex-child(5, 0, 1); @@ -27,8 +27,8 @@ } } .row-selected { - background: lighten($green-taiga, 60%); @include transition (background .2s ease-in); + background: lighten($green-taiga, 60%); } // TODO: refactor xaviju @@ -47,8 +47,8 @@ @extend %medium; color: $gray-light; &:hover { - color: $grayer; @include transition (color .3s linear); + color: $grayer; } } } diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss index 31e59f1b..d05e4435 100644 --- a/app/styles/modules/team/team-table.scss +++ b/app/styles/modules/team/team-table.scss @@ -95,7 +95,7 @@ } } .popover { - @include popover(100%, '', 0, 30px, '', 15px, '', 50%, -5px); @extend %small; + @include popover(100%, '', 0, 30px, '', 15px, '', 50%, -5px); } } diff --git a/scsslint.yml b/scsslint.yml index ea46bae9..77f808be 100644 --- a/scsslint.yml +++ b/scsslint.yml @@ -124,5 +124,10 @@ linters: ZeroUnit: enabled: true + NestingDepth: + enabled: true + max_depth: 4 + Compass::*: - enabled: false \ No newline at end of file + enabled: false +