From 48ba761d178fecca207b56c4bc604e8901631a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ca=C3=B1izares=20Est=C3=A9vez?= Date: Thu, 29 Dec 2016 12:16:02 +0100 Subject: [PATCH] SPA: correct linting outputs --- .../eShopOnContainers.WebSPA/.sass-lint.yml | 2 +- .../Client/globals.scss | 10 ++-- .../Client/modules/app.component.scss | 3 +- .../basket-status.component.scss | 2 +- .../modules/basket/basket.component.scss | 7 +-- .../modules/catalog/catalog.component.scss | 16 +++---- .../orders-detail.component.scss | 3 +- .../orders-new/orders-new.component.scss | 47 ++++++++++--------- .../modules/orders/orders.component.scss | 5 +- .../shared/components/header/header.scss | 4 +- .../shared/components/identity/identity.scss | 4 +- .../shared/components/pager/pager.scss | 4 +- 12 files changed, 57 insertions(+), 50 deletions(-) diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/.sass-lint.yml b/src/Web/WebSPA/eShopOnContainers.WebSPA/.sass-lint.yml index d97588d3d..8150b298e 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/.sass-lint.yml +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/.sass-lint.yml @@ -40,7 +40,7 @@ no-universal-selectors: 0 no-url-domains: 0 no-url-protocols: 0 - no-vendor-prefixes: 2 + no-vendor-prefixes: 0 no-warn: 2 property-units: 0 diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/globals.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/globals.scss index ece83bbfc..f79c73014 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/globals.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/globals.scss @@ -1,25 +1,27 @@ -@import './modules/_variables.scss'; +@import './modules/variables'; $dist: './fonts/Montserrat-Regular'; + @font-face { font-family: Montserrat; font-weight: 400; - src: url("./fonts/Montserrat-Regular.eot?") format("eot"),url("./fonts/Montserrat-Regular.woff") format("woff"),url("./fonts/Montserrat-Regular.ttf") format("truetype"),url("./fonts/Montserrat-Regular.svg#Montserrat") format("svg") + src: url('./fonts/Montserrat-Regular.eot?') format('eot'), url('./fonts/Montserrat-Regular.woff') format('woff'), url('./fonts/Montserrat-Regular.ttf') format('truetype'), url('./fonts/Montserrat-Regular.svg#Montserrat') format('svg'); } @font-face { font-family: Montserrat; font-weight: 700; - src: url("./fonts/Montserrat-Bold.eot?") format("eot"),url("./fonts/Montserrat-Bold.woff") format("woff"),url("./fonts/Montserrat-Bold.ttf") format("truetype"),url("./fonts/Montserrat-Bold.svg#Montserrat") format("svg") + src: url('./fonts/Montserrat-Bold.eot?') format('eot'), url('./fonts/Montserrat-Bold.woff') format('woff'), url('./fonts/Montserrat-Bold.ttf') format('truetype'), url('./fonts/Montserrat-Bold.svg#Montserrat') format('svg'); } html, body { - font-family: Montserrat,sans-serif; + font-family: Montserrat, sans-serif; font-size: 16px; font-weight: $font-weight-normal; z-index: 10; } + *, *::after, *::before { diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss index 06ca0b6fe..e7ed08bd4 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/app.component.scss @@ -1,4 +1,4 @@ -@import './_variables.scss'; +@import './variables'; .esh-app { &-footer { @@ -13,6 +13,7 @@ width: 100%; $height: 50px; + &-brand { height: $height; width: 230px; diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.scss index 8e1b1f3f0..d50b8c9d2 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket-status/basket-status.component.scss @@ -1,4 +1,4 @@ -@import '../../_variables.scss'; +@import '../../variables'; .esh-basketstatus { cursor: pointer; diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss index 4780804d1..c338183dd 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss @@ -1,4 +1,4 @@ -@import '../_variables.scss'; +@import '../variables'; .esh-basket { min-height: 80vh; @@ -29,6 +29,7 @@ } $item-height: 8rem; + &-item { font-size: $font-size-m; font-weight: $font-weight-semilight; @@ -56,9 +57,9 @@ } &-checkout { - border: none; - border-radius: 0; background-color: $color-secondary; + border: 0; + border-radius: 0; color: $color-foreground-brighter; display: inline-block; font-size: 1rem; diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.scss index a6449b879..bd5b292cf 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.scss @@ -25,19 +25,19 @@ $filter-padding: .5rem; &-filter { + -webkit-appearance: none; background-color: transparent; border-color: $color-brand-bright; color: $color-foreground-brighter; cursor: pointer; margin-right: 1rem; margin-top: .5rem; + min-width: 140px; outline-color: $color-secondary; padding-bottom: 0; padding-left: $filter-padding; padding-right: $filter-padding; padding-top: $filter-padding * 3; - min-width: 140px; - -webkit-appearance: none; option { background-color: $color-brand; @@ -53,8 +53,8 @@ color: rgba($color-foreground-brighter, .5); content: attr(data-title); font-size: $font-size-xs; - margin-top: $font-size-xs; margin-left: $filter-padding; + margin-top: $font-size-xs; position: absolute; text-transform: uppercase; z-index: 1; @@ -62,8 +62,8 @@ &::after { background-image: url('../../images/arrow-down.png'); - height: 7px; //png height content: ''; + height: 7px; //png height position: absolute; right: $filter-padding * 3; top: $filter-padding * 5; @@ -92,8 +92,8 @@ } &-item { - text-align: center; margin-bottom: 1.5rem; + text-align: center; width: 33%; @media screen and (max-width: $media-screen-m) { @@ -112,7 +112,7 @@ &-button { background-color: $color-secondary; - border: none; + border: 0; color: $color-foreground-brighter; cursor: pointer; font-size: $font-size-m; @@ -136,9 +136,9 @@ } &-price { - text-align: center; - font-weight: 900; font-size: 28px; + font-weight: 900; + text-align: center; &::before { content: '$'; diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss index c34f44bdd..d5245a88a 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss @@ -1,4 +1,4 @@ -@import '../../_variables.scss'; +@import '../../variables'; .esh-orders_detail { min-height: 80vh; @@ -32,6 +32,7 @@ } $item-height: 8rem; + &-item { font-size: $font-size-m; font-weight: $font-weight-semilight; diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.scss index 74a95821d..16e09b5eb 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-new/orders-new.component.scss @@ -1,4 +1,4 @@ -@import '../../_variables.scss'; +@import '../../variables'; .esh-orders_new { min-height: 80vh; @@ -13,8 +13,8 @@ &-back { color: rgba($color-foreground-brighter, .4); line-height: $header-height; - text-transform: uppercase; text-decoration: none; + text-transform: uppercase; transition: color $animation-speed-default; &:hover { @@ -32,24 +32,24 @@ } &-placeOrder { - float: right; - margin-top: 40px; - margin-bottom: 40px; - background-color: #83d01b; - color: #fff; - padding: 10px 20px 10px 20px; + background-color: #83D01B; + border: 0; border-radius: 0; - border: none; - width: 255px; + color: #FFFFFF; display: inline-block; - text-align: center; - text-transform: uppercase; - height: 45px; + float: right; font-size: 16px; font-weight: normal; + height: 45px; + margin-bottom: 40px; + margin-top: 40px; + padding: 10px 20px 10px 20px; + text-align: center; + text-transform: uppercase; + width: 255px; } - &-titles { + &-titles { padding-bottom: 1rem; padding-top: 2rem; } @@ -70,6 +70,7 @@ } $item-height: 8rem; + &-item { font-size: $font-size-m; font-weight: $font-weight-semilight; @@ -95,32 +96,32 @@ @media screen and (min-width: 992px) { .form-input { - width: 360px; max-width: 360px; + width: 360px; } } .form-input { border-radius: 0; - padding: 10px; height: 45px; + padding: 10px; } .form-input-small { - max-width: 100px!important; + max-width: 100px !important; } .form-input-medium { - width: 150px!important; + width: 150px !important; } -.alert{ - padding-left: 0px; +.alert { + padding-left: 0; } .alert-danger { - background-color:transparent; - border:none; - color: #fb0d0d; + background-color: transparent; + border: 0; + color: #FB0D0D; font-size: 12px; } diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss index 94cfdcea3..013780e18 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss @@ -1,10 +1,11 @@ -@import '../_variables.scss'; +@import '../variables'; .esh-orders { min-height: 80vh; overflow-x: hidden; $header-height: 4rem; + &-header { background-color: #00A69C; height: $header-height; @@ -13,8 +14,8 @@ &-back { color: rgba($color-foreground-brighter, .4); line-height: $header-height; - text-transform: uppercase; text-decoration: none; + text-transform: uppercase; transition: color $animation-speed-default; &:hover { diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss index df0c32964..98d455ccf 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss @@ -1,4 +1,4 @@ -@import "../../../variables"; +@import '../../../variables'; .esh-header { $header-height: 4rem; @@ -9,8 +9,8 @@ &-back { color: rgba($color-foreground-brighter, .5); line-height: $header-height; - text-transform: uppercase; text-decoration: none; + text-transform: uppercase; transition: color $animation-speed-default; &:hover { diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss index 737381607..45a8cf3e8 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss @@ -1,4 +1,4 @@ -@import "../../../variables"; +@import '../../../variables'; .esh-identity { line-height: 3rem; @@ -30,10 +30,10 @@ background: $color-background-brighter; height: 0; min-width: 14rem; - right: 0; overflow: hidden; padding: .5rem; position: absolute; + right: 0; top: 2.5rem; transition: height $animation-speed-default; } diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss index 162de8c9d..aae411bdf 100644 --- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss +++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/pager/pager.scss @@ -1,4 +1,4 @@ -@import "../../../variables"; +@import '../../../variables'; .esh-pager { @@ -27,4 +27,4 @@ margin: 0 $margin / 2; } } -} \ No newline at end of file +}