From d1f81dee1f44ea934ff1604704a39f231b444c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 15 Jan 2015 15:48:26 +0100 Subject: [PATCH] Linter cleanup --- app/styles/components/basic-table.scss | 2 +- app/styles/components/paginator.scss | 4 ++-- app/styles/components/summary.scss | 8 +++---- app/styles/dependencies/mixins.scss | 22 ----------------- app/styles/layout/base.scss | 3 --- .../modules/admin/admin-functionalities.scss | 6 ++--- app/styles/modules/admin/third-parties.scss | 2 +- app/styles/modules/common/colors-table.scss | 6 ++--- app/styles/modules/common/wizard.scss | 24 ++++++++----------- app/styles/modules/filters/filters.scss | 16 ++++++------- app/styles/modules/filters/list-filters.scss | 5 ++-- app/styles/modules/home-projects-list.scss | 5 +++- app/styles/modules/team/team-filters.scss | 12 +++++----- 13 files changed, 44 insertions(+), 71 deletions(-) diff --git a/app/styles/components/basic-table.scss b/app/styles/components/basic-table.scss index 52b827b8..3e710ed1 100644 --- a/app/styles/components/basic-table.scss +++ b/app/styles/components/basic-table.scss @@ -13,8 +13,8 @@ width: 100%; @for $i from 1 through 8 { .width-#{$i} { - flex-grow: #{$i}; flex-basis: 50px; + flex-grow: #{$i}; } } &:last-child { diff --git a/app/styles/components/paginator.scss b/app/styles/components/paginator.scss index ac064071..6cfaaf04 100644 --- a/app/styles/components/paginator.scss +++ b/app/styles/components/paginator.scss @@ -37,8 +37,8 @@ overflow: hidden; } -a.v-pagination-next, -a.v-pagination-previous { +.v-pagination-next, +.v-pagination-previous { background-color: $button-gray; color: $whitish; display: block; diff --git a/app/styles/components/summary.scss b/app/styles/components/summary.scss index 318bdec2..7eb54e96 100644 --- a/app/styles/components/summary.scss +++ b/app/styles/components/summary.scss @@ -100,10 +100,10 @@ } &.active { color: $fresh-taiga; - &:hover { - color: $gray; - transition: color .3s linear; - } + } + &.active:hover { + color: $gray; + transition: color .3s linear; } } } diff --git a/app/styles/dependencies/mixins.scss b/app/styles/dependencies/mixins.scss index bcf19eba..81e547d2 100644 --- a/app/styles/dependencies/mixins.scss +++ b/app/styles/dependencies/mixins.scss @@ -5,28 +5,6 @@ text-overflow: ellipsis; } -// DEPRECATED MIXIN -// USE FLEXBOX WITHOUT PREFIXES. -// Table Flex - http://devbryce.com/site/flexbox/ -/* @mixin table-flex($align-content: stretch, $align-items: stretch, $display: flex, $flex-direction: row, $flex-wrap: wrap, $justify-content: flex-start) { - align-content: $align-content; //flex-start | flex-end | center | space-between | space-around | stretch - align-items: $align-items; //flex-start | flex-end | center | baseline | stretch - display: $display; - flex-direction: $flex-direction; //row | row-reverse | column | column-reverse - flex-wrap: $flex-wrap; //nowrap | wrap | wrap-reverse - justify-content: $justify-content; //flex-start | flex-end | center | space-between | space-around -} - -@mixin table-flex-child($flex-grow: 1, $flex-basis: 300px, $flex-shrink: 0, $width:'') { - flex: $flex-grow; - flex-basis: $flex-basis; - flex-shrink: $flex-shrink; - width: $flex-basis; - @if #{$width} != null { - width: #{$width}; - } -} - */ @mixin box-shadow($h-shadow: 1px, $v-shadow: 1px, $blur: 15px, $spread: 6px, $color: rgba(0, 0, 0, .1)) { box-shadow: $h-shadow $v-shadow $blur $spread $color; } diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 10bd471e..0d7743c5 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -7,10 +7,7 @@ body { @extend %text; background: #fff; // fallback color: #444; - -webkit-font-smoothing: antialiased; // Fix for webkit renderin min-height: 100%; - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; width: 100%; .master { transition: transform 1s ease; diff --git a/app/styles/modules/admin/admin-functionalities.scss b/app/styles/modules/admin/admin-functionalities.scss index 183de817..93e1e2e0 100644 --- a/app/styles/modules/admin/admin-functionalities.scss +++ b/app/styles/modules/admin/admin-functionalities.scss @@ -6,10 +6,10 @@ .functionality { align-content: center; align-items: center; + background-color: $whitish; display: flex; flex-direction: column; justify-content: center; - background-color: $whitish; margin-bottom: .3rem; margin-right: .3rem; opacity: .5; @@ -24,8 +24,8 @@ } .icon { @extend %xxlarge; - flex-grow: 1; flex-basis: 60px; + flex-grow: 1; margin: 0 auto; min-height: 60px; } @@ -43,7 +43,7 @@ } } span { - font-weight: bold; + @extend %bold; display: block; } select { diff --git a/app/styles/modules/admin/third-parties.scss b/app/styles/modules/admin/third-parties.scss index 5cb815cc..0c3608c7 100644 --- a/app/styles/modules/admin/third-parties.scss +++ b/app/styles/modules/admin/third-parties.scss @@ -4,7 +4,7 @@ max-width: 700px; width: 100%; } - input[type="text"], + input, textarea { @extend %title; } diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss index 7e4e8639..630c3c0d 100644 --- a/app/styles/modules/common/colors-table.scss +++ b/app/styles/modules/common/colors-table.scss @@ -43,12 +43,12 @@ .is-closed-column, .options-column, .status-wip-limit { - flex-grow: 1; flex-basis: 100px; + flex-grow: 1; } .status-name { - flex-grow: 6; flex-basis: 150px; + flex-grow: 6; padding: 0 10px; position: relative; span { @@ -57,8 +57,8 @@ } } .status-slug { - flex-grow: 6; flex-basis: 150px; + flex-grow: 6; padding: 0 10px; } .options-column { diff --git a/app/styles/modules/common/wizard.scss b/app/styles/modules/common/wizard.scss index d89c3123..b06d7a29 100644 --- a/app/styles/modules/common/wizard.scss +++ b/app/styles/modules/common/wizard.scss @@ -55,8 +55,8 @@ a { color: $white; display: inline-block; - flex-grow: 1; flex-basis: 40%; + flex-grow: 1; &:first-child { margin-right: .5rem; } @@ -121,12 +121,10 @@ width: 25%; } .progress-state { - span { - &:nth-child(1) { - color: rgba($white, 1); - transition: color .3s ease-in-out; - transition-delay: .6s; - } + span:nth-child(1) { + color: rgba($white, 1); + transition: color .3s ease-in-out; + transition-delay: .6s; } } } @@ -137,13 +135,11 @@ width: 75%; } .progress-state { - span { - &:nth-child(1), - &:nth-child(2) { - color: rgba($white, 1); - transition: color .3s ease-in-out; - transition-delay: .6s; - } + span:nth-child(1), + span:nth-child(2) { + color: rgba($white, 1); + transition: color .3s ease-in-out; + transition-delay: .6s; } } } diff --git a/app/styles/modules/filters/filters.scss b/app/styles/modules/filters/filters.scss index 37412981..8a619a83 100644 --- a/app/styles/modules/filters/filters.scss +++ b/app/styles/modules/filters/filters.scss @@ -16,7 +16,7 @@ vertical-align: middle; } } - input[type="text"] { + input { background: $grayer; color: $white; @include placeholder { @@ -33,7 +33,7 @@ .filters-inner { opacity: 0; - transition : all .1s ease-in; + transition: all .1s ease-in; .loading { background: $grayer; border: 1px solid #b8b8b8; @@ -47,8 +47,8 @@ float: none; } span { - animation : loading .5s linear; - animation : spin 1s linear infinite; + animation: loading .5s linear; + animation: spin 1s linear infinite; } } } @@ -91,13 +91,13 @@ color: $grayer; display: block; padding: .5rem 0 .5rem .5rem; - transition : color .2s ease-in; + transition: color .2s ease-in; &:hover { color: $green-taiga; - transition : color .2s ease-in; + transition: color .2s ease-in; .icon { opacity: 1; - transition : opacity .2s ease-in; + transition: opacity .2s ease-in; } } } @@ -105,6 +105,6 @@ color: $grayer; float: right; opacity: 0; - transition : opacity .2s ease-in; + transition: opacity .2s ease-in; } } diff --git a/app/styles/modules/filters/list-filters.scss b/app/styles/modules/filters/list-filters.scss index dc8ce2a2..609cb8bd 100644 --- a/app/styles/modules/filters/list-filters.scss +++ b/app/styles/modules/filters/list-filters.scss @@ -18,14 +18,13 @@ &:hover { color: $blackish; opacity: 1; - transition : opacity .3s linear; - + transition: opacity .3s linear; } } .active { color: $blackish; opacity: 1; - transition : opacity .3s linear; + transition: opacity .3s linear; } .icon { padding-right: .5rem; diff --git a/app/styles/modules/home-projects-list.scss b/app/styles/modules/home-projects-list.scss index ff921bb8..2ad96b3e 100644 --- a/app/styles/modules/home-projects-list.scss +++ b/app/styles/modules/home-projects-list.scss @@ -144,12 +144,15 @@ padding: 1rem; text-transform: uppercase; width: 100%; - &.active, &:hover { background-color: $gray; transition: background-color .3s linear; } } + .active { + background-color: $gray; + transition: background-color .3s linear; + } } .projects-pagination { width: 100%; diff --git a/app/styles/modules/team/team-filters.scss b/app/styles/modules/team/team-filters.scss index cf23aa0d..1d39765d 100644 --- a/app/styles/modules/team/team-filters.scss +++ b/app/styles/modules/team/team-filters.scss @@ -19,16 +19,16 @@ &:hover, &.active { color: $green-taiga; - transition : color .3s linear; - .icon { - opacity: 1; - transition : opacity .3s linear; - } + transition: color .3s linear; + } + &.active.icon { + opacity: 1; + transition: opacity .3s linear; } } .active { opacity: 1; - transition : opacity .3s linear; + transition: opacity .3s linear; } .icon { color: $blackish;