diff --git a/src/Web/Views/Shared/_Layout.cshtml b/src/Web/Views/Shared/_Layout.cshtml index 5e0ab38..00ea90a 100644 --- a/src/Web/Views/Shared/_Layout.cshtml +++ b/src/Web/Views/Shared/_Layout.cshtml @@ -15,10 +15,6 @@ - - - - InProcess + + + + + + + @@ -23,6 +30,7 @@ + diff --git a/src/Web/compilerconfig.json b/src/Web/compilerconfig.json new file mode 100644 index 0000000..877d1b4 --- /dev/null +++ b/src/Web/compilerconfig.json @@ -0,0 +1,30 @@ +[ + { + "outputFile": "wwwroot/css/shared/components/header/header.css", + "inputFile": "wwwroot/css/shared/components/header/header.scss" + }, + { + "outputFile": "wwwroot/css/orders/orders.component.css", + "inputFile": "wwwroot/css/orders/orders.component.scss" + }, + { + "outputFile": "wwwroot/css/catalog/catalog.component.css", + "inputFile": "wwwroot/css/catalog/catalog.component.scss" + }, + { + "outputFile": "wwwroot/css/basket/basket.component.css", + "inputFile": "wwwroot/css/basket/basket.component.scss" + }, + { + "outputFile": "wwwroot/css/basket/basket-status/basket-status.component.css", + "inputFile": "wwwroot/css/basket/basket-status/basket-status.component.scss" + }, + { + "outputFile": "wwwroot/css/app.component.css", + "inputFile": "wwwroot/css/app.component.scss" + }, + { + "outputFile": "wwwroot/css/_variables.css", + "inputFile": "wwwroot/css/_variables.scss" + } +] \ No newline at end of file diff --git a/src/Web/compilerconfig.json.defaults b/src/Web/compilerconfig.json.defaults new file mode 100644 index 0000000..b351931 --- /dev/null +++ b/src/Web/compilerconfig.json.defaults @@ -0,0 +1,63 @@ +{ + "compilers": { + "less": { + "autoPrefix": "", + "cssComb": "none", + "ieCompat": true, + "strictMath": false, + "strictUnits": false, + "relativeUrls": true, + "rootPath": "", + "sourceMapRoot": "", + "sourceMapBasePath": "", + "sourceMap": false + }, + "sass": { + "autoPrefix": "", + "includePath": "", + "indentType": "space", + "indentWidth": 2, + "outputStyle": "nested", + "Precision": 5, + "relativeUrls": true, + "sourceMapRoot": "", + "lineFeed": "", + "sourceMap": false + }, + "stylus": { + "sourceMap": false + }, + "babel": { + "sourceMap": false + }, + "coffeescript": { + "bare": false, + "runtimeMode": "node", + "sourceMap": false + }, + "handlebars": { + "root": "", + "noBOM": false, + "name": "", + "namespace": "", + "knownHelpersOnly": false, + "forcePartial": false, + "knownHelpers": [], + "commonjs": "", + "amd": false, + "sourceMap": false + } + }, + "minifiers": { + "css": { + "enabled": true, + "termSemicolons": true, + "gzip": false + }, + "javascript": { + "enabled": true, + "termSemicolons": true, + "gzip": false + } + } +} \ No newline at end of file diff --git a/src/Web/wwwroot/css/_variables.css b/src/Web/wwwroot/css/_variables.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/src/Web/wwwroot/css/_variables.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Web/wwwroot/css/_variables.min.css b/src/Web/wwwroot/css/_variables.min.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/src/Web/wwwroot/css/_variables.min.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Web/wwwroot/css/app.component.css b/src/Web/wwwroot/css/app.component.css index 740a83e..7b808bb 100644 --- a/src/Web/wwwroot/css/app.component.css +++ b/src/Web/wwwroot/css/app.component.css @@ -4,14 +4,10 @@ margin-top: 2.5rem; padding-bottom: 2.5rem; padding-top: 2.5rem; - width: 100%; - -} -.esh-app-footer-brand { + width: 100%; } + .esh-app-footer-brand { height: 50px; - width: 230px; -} + width: 230px; } .esh-app-header { - margin: 15px; -} \ No newline at end of file + margin: 15px; } diff --git a/src/Web/wwwroot/css/app.component.min.css b/src/Web/wwwroot/css/app.component.min.css index b4c9635..025695c 100644 --- a/src/Web/wwwroot/css/app.component.min.css +++ b/src/Web/wwwroot/css/app.component.min.css @@ -1 +1 @@ -.esh-app-footer{background-color:#000;border-top:1px solid #eee;margin-top:2.5rem;padding-bottom:2.5rem;padding-top:2.5rem;width:100%}.esh-app-footer-brand{height:50px;width:230px} \ No newline at end of file +.esh-app-footer{background-color:#000;border-top:1px solid #eee;margin-top:2.5rem;padding-bottom:2.5rem;padding-top:2.5rem;width:100%;}.esh-app-footer-brand{height:50px;width:230px;}.esh-app-header{margin:15px;} \ No newline at end of file diff --git a/src/Web/wwwroot/css/app.component.scss b/src/Web/wwwroot/css/app.component.scss index e823b6f..6e391df 100644 --- a/src/Web/wwwroot/css/app.component.scss +++ b/src/Web/wwwroot/css/app.component.scss @@ -1,4 +1,4 @@ -@import './variables'; +@import './_variables.scss'; .esh-app { &-footer { @@ -20,4 +20,8 @@ } } + + &-header { + margin: 15px; + } } \ No newline at end of file diff --git a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css index 0b3f1a9..19be16b 100644 --- a/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css +++ b/src/Web/wwwroot/css/basket/basket-status/basket-status.component.min.css @@ -1 +1 @@ -.esh-basketstatus{cursor:pointer;display:inline-block;float:right;position:relative;transition:all .35s}.esh-basketstatus.is-disabled{opacity:.5;pointer-events:none}.esh-basketstatus-image{height:36px;margin-top:.5rem}.esh-basketstatus-badge{background-color:#83d01b;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem}.esh-basketstatus-badge-inoperative{background-color:#f00;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem}.esh-basketstatus:hover .esh-basketstatus-badge{background-color:transparent;color:#75b918;transition:all .35s} \ No newline at end of file +.esh-basketstatus{cursor:pointer;display:inline-block;float:right;position:relative;transition:all .35s;}.esh-basketstatus.is-disabled{opacity:.5;pointer-events:none;}.esh-basketstatus-image{height:100px;margin-top:.5rem;}.esh-basketstatus-badge{background-color:#83d01b;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem;}.esh-basketstatus-badge-inoperative{background-color:#f00;border-radius:50%;color:#fff;display:block;height:1.5rem;left:50%;position:absolute;text-align:center;top:0;transform:translateX(-38%);transition:all .35s;width:1.5rem;}.esh-basketstatus:hover .esh-basketstatus-badge{background-color:transparent;color:#75b918;transition:all .35s;} \ No newline at end of file diff --git a/src/Web/wwwroot/css/basket/basket.component.css b/src/Web/wwwroot/css/basket/basket.component.css index 77d3f88..6007b93 100644 --- a/src/Web/wwwroot/css/basket/basket.component.css +++ b/src/Web/wwwroot/css/basket/basket.component.css @@ -46,4 +46,3 @@ .esh-basket-checkout:hover { background-color: #4a760f; transition: all 0.35s; } - diff --git a/src/Web/wwwroot/css/basket/basket.component.min.css b/src/Web/wwwroot/css/basket/basket.component.min.css index 5ed080a..ddc57ea 100644 --- a/src/Web/wwwroot/css/basket/basket.component.min.css +++ b/src/Web/wwwroot/css/basket/basket.component.min.css @@ -1 +1 @@ -.esh-basket{min-height:80vh}.esh-basket-titles{padding-bottom:1rem;padding-top:2rem}.esh-basket-titles--clean{padding-bottom:0;padding-top:0}.esh-basket-title{text-transform:uppercase}.esh-basket-items--border{border-bottom:1px solid #eee;padding:.5rem 0}.esh-basket-items--border:last-of-type{border-color:transparent}.esh-basket-items-margin-left1{margin-left:1px}.esh-basket-item{font-size:1rem;font-weight:300}.esh-basket-item--middle{line-height:8rem}@media screen and (max-width:1024px){.esh-basket-item--middle{line-height:1rem}}.esh-basket-item--mark{color:#00a69c}.esh-basket-image{height:8rem}.esh-basket-input{line-height:1rem;width:100%}.esh-basket-checkout{background-color:#83d01b;border:0;border-radius:0;color:#fff;display:inline-block;font-size:1rem;font-weight:400;margin-top:1rem;padding:1rem 1.5rem;text-align:center;text-transform:uppercase;transition:all .35s}.esh-basket-checkout:hover{background-color:#4a760f;transition:all .35s} \ No newline at end of file +.esh-basket{min-height:80vh;}.esh-basket-titles{padding-bottom:1rem;padding-top:2rem;}.esh-basket-titles--clean{padding-bottom:0;padding-top:0;}.esh-basket-title{text-transform:uppercase;}.esh-basket-items--border{border-bottom:1px solid #eee;padding:.5rem 0;}.esh-basket-items--border:last-of-type{border-color:transparent;}.esh-basket-items-margin-left1{margin-left:1px;}.esh-basket-item{font-size:1rem;font-weight:300;}.esh-basket-item--middle{line-height:8rem;}@media screen and (max-width:1024px){.esh-basket-item--middle{line-height:1rem;}}.esh-basket-item--mark{color:#00a69c;}.esh-basket-image{height:8rem;}.esh-basket-input{line-height:1rem;width:100%;}.esh-basket-checkout{background-color:#83d01b;border:0;border-radius:0;color:#fff;display:inline-block;font-size:1rem;font-weight:400;margin-top:1rem;padding:1rem 1.5rem;text-align:center;text-transform:uppercase;transition:all .35s;}.esh-basket-checkout:hover{background-color:#4a760f;transition:all .35s;} \ No newline at end of file diff --git a/src/Web/wwwroot/css/basket/basket.component.scss b/src/Web/wwwroot/css/basket/basket.component.scss index c0e6c61..f726620 100644 --- a/src/Web/wwwroot/css/basket/basket.component.scss +++ b/src/Web/wwwroot/css/basket/basket.component.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../variables.scss'; @mixin margin-left($distance) { margin-left: $distance; diff --git a/src/Web/wwwroot/css/catalog/catalog.component.css b/src/Web/wwwroot/css/catalog/catalog.component.css index 3517e06..2f08a12 100644 --- a/src/Web/wwwroot/css/catalog/catalog.component.css +++ b/src/Web/wwwroot/css/catalog/catalog.component.css @@ -114,4 +114,3 @@ text-align: center; } .esh-catalog-price::before { content: '$'; } - diff --git a/src/Web/wwwroot/css/catalog/catalog.component.min.css b/src/Web/wwwroot/css/catalog/catalog.component.min.css index 76a8798..f376f59 100644 --- a/src/Web/wwwroot/css/catalog/catalog.component.min.css +++ b/src/Web/wwwroot/css/catalog/catalog.component.min.css @@ -1 +1 @@ -.esh-catalog-hero{background-image:url("../../images/main_banner.png");background-size:cover;height:260px;width:100%}.esh-catalog-title{position:relative;top:74.28571px}.esh-catalog-filters{background-color:#00a69c;height:65px}.esh-catalog-filter{-webkit-appearance:none;background-color:transparent;border-color:#00d9cc;color:#fff;cursor:pointer;margin-right:1rem;margin-top:.5rem;min-width:140px;outline-color:#83d01b;padding-bottom:0;padding-left:.5rem;padding-right:.5rem;padding-top:1.5rem}.esh-catalog-filter option{background-color:#00a69c}.esh-catalog-label{display:inline-block;position:relative;z-index:0}.esh-catalog-label::before{color:rgba(255,255,255,.5);content:attr(data-title);font-size:.65rem;margin-left:.5rem;margin-top:.65rem;position:absolute;text-transform:uppercase;z-index:1}.esh-catalog-label::after{background-image:url("../../images/arrow-down.png");content:'';height:7px;position:absolute;right:1.5rem;top:2.5rem;width:10px;z-index:1}.esh-catalog-send{background-color:#83d01b;color:#fff;cursor:pointer;font-size:1rem;margin-top:-1.5rem;padding:.5rem;transition:all .35s}.esh-catalog-send:hover{background-color:#4a760f;transition:all .35s}.esh-catalog-items{margin-top:1rem}.esh-catalog-item{margin-bottom:1.5rem;text-align:center;width:33%;display:inline-block;float:none !important}@media screen and (max-width:1024px){.esh-catalog-item{width:50%}}@media screen and (max-width:768px){.esh-catalog-item{width:100%}}.esh-catalog-thumbnail{max-width:370px;width:100%}.esh-catalog-button{background-color:#83d01b;border:0;color:#fff;cursor:pointer;font-size:1rem;height:3rem;margin-top:1rem;transition:all .35s;width:80%}.esh-catalog-button.is-disabled{opacity:.5;pointer-events:none}.esh-catalog-button:hover{background-color:#4a760f;transition:all .35s}.esh-catalog-name{font-size:1rem;font-weight:300;margin-top:.5rem;text-align:center;text-transform:uppercase}.esh-catalog-price{font-size:28px;font-weight:900;text-align:center}.esh-catalog-price::before{content:'$'} \ No newline at end of file +.esh-catalog-hero{background-image:url("../../images/main_banner.png");background-size:cover;height:260px;width:100%;}.esh-catalog-title{position:relative;top:74.28571px;}.esh-catalog-filters{background-color:#00a69c;height:65px;}.esh-catalog-filter{-webkit-appearance:none;background-color:transparent;border-color:#00d9cc;color:#fff;cursor:pointer;margin-right:1rem;margin-top:.5rem;min-width:140px;outline-color:#83d01b;padding-bottom:0;padding-left:.5rem;padding-right:.5rem;padding-top:1.5rem;}.esh-catalog-filter option{background-color:#00a69c;}.esh-catalog-label{display:inline-block;position:relative;z-index:0;}.esh-catalog-label::before{color:rgba(255,255,255,.5);content:attr(data-title);font-size:.65rem;margin-left:.5rem;margin-top:.65rem;position:absolute;text-transform:uppercase;z-index:1;}.esh-catalog-label::after{background-image:url("../../images/arrow-down.png");content:'';height:7px;position:absolute;right:1.5rem;top:2.5rem;width:10px;z-index:1;}.esh-catalog-send{background-color:#83d01b;color:#fff;cursor:pointer;font-size:1rem;margin-top:-1.5rem;padding:.5rem;transition:all .35s;}.esh-catalog-send:hover{background-color:#4a760f;transition:all .35s;}.esh-catalog-items{margin-top:1rem;}.esh-catalog-item{margin-bottom:1.5rem;text-align:center;width:33%;display:inline-block;float:none !important;}@media screen and (max-width:1024px){.esh-catalog-item{width:50%;}}@media screen and (max-width:768px){.esh-catalog-item{width:100%;}}.esh-catalog-thumbnail{max-width:370px;width:100%;}.esh-catalog-button{background-color:#83d01b;border:0;color:#fff;cursor:pointer;font-size:1rem;height:3rem;margin-top:1rem;transition:all .35s;width:80%;}.esh-catalog-button.is-disabled{opacity:.5;pointer-events:none;}.esh-catalog-button:hover{background-color:#4a760f;transition:all .35s;}.esh-catalog-name{font-size:1rem;font-weight:300;margin-top:.5rem;text-align:center;text-transform:uppercase;}.esh-catalog-price{font-size:28px;font-weight:900;text-align:center;}.esh-catalog-price::before{content:'$';} \ No newline at end of file diff --git a/src/Web/wwwroot/css/catalog/catalog.component.scss b/src/Web/wwwroot/css/catalog/catalog.component.scss index 56291fd..554cd93 100644 --- a/src/Web/wwwroot/css/catalog/catalog.component.scss +++ b/src/Web/wwwroot/css/catalog/catalog.component.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../_variables.scss'; .esh-catalog { $banner-height: 260px; diff --git a/src/Web/wwwroot/css/orders/orders.component.css b/src/Web/wwwroot/css/orders/orders.component.css index 49aaff0..3fc4e27 100644 --- a/src/Web/wwwroot/css/orders/orders.component.css +++ b/src/Web/wwwroot/css/orders/orders.component.css @@ -47,4 +47,3 @@ .esh-orders-link:hover { color: #75b918; transition: color 0.35s; } - diff --git a/src/Web/wwwroot/css/orders/orders.component.min.css b/src/Web/wwwroot/css/orders/orders.component.min.css index 03762a0..3bea662 100644 --- a/src/Web/wwwroot/css/orders/orders.component.min.css +++ b/src/Web/wwwroot/css/orders/orders.component.min.css @@ -1 +1 @@ -.esh-orders{min-height:80vh;overflow-x:hidden}.esh-orders-header{background-color:#00a69c;height:4rem}.esh-orders-back{color:rgba(255,255,255,.4);line-height:4rem;text-decoration:none;text-transform:uppercase;transition:color .35s}.esh-orders-back:hover{color:#fff;transition:color .35s}.esh-orders-titles{padding-bottom:1rem;padding-top:2rem}.esh-orders-title{text-transform:uppercase}.esh-orders-items{height:2rem;line-height:2rem;position:relative}.esh-orders-items:nth-of-type(2n+1):before{background-color:#eef;content:'';height:100%;left:0;margin-left:-100vw;position:absolute;top:0;width:200vw;z-index:-1}.esh-orders-item{font-weight:300}.esh-orders-item--hover{opacity:0;pointer-events:none}.esh-orders-items:hover .esh-orders-item--hover{opacity:1;pointer-events:all}.esh-orders-link{color:#83d01b;text-decoration:none;transition:color .35s}.esh-orders-link:hover{color:#75b918;transition:color .35s} \ No newline at end of file +.esh-orders{min-height:80vh;overflow-x:hidden;}.esh-orders-header{background-color:#00a69c;height:4rem;}.esh-orders-back{color:rgba(255,255,255,.4);line-height:4rem;text-decoration:none;text-transform:uppercase;transition:color .35s;}.esh-orders-back:hover{color:#fff;transition:color .35s;}.esh-orders-titles{padding-bottom:1rem;padding-top:2rem;}.esh-orders-title{text-transform:uppercase;}.esh-orders-items{height:2rem;line-height:2rem;position:relative;}.esh-orders-items:nth-of-type(2n+1):before{background-color:#eef;content:'';height:100%;left:0;margin-left:-100vw;position:absolute;top:0;width:200vw;z-index:-1;}.esh-orders-item{font-weight:300;}.esh-orders-item--hover{opacity:0;pointer-events:none;}.esh-orders-items:hover .esh-orders-item--hover{opacity:1;pointer-events:all;}.esh-orders-link{color:#83d01b;text-decoration:none;transition:color .35s;}.esh-orders-link:hover{color:#75b918;transition:color .35s;} \ No newline at end of file diff --git a/src/Web/wwwroot/css/orders/orders.component.scss b/src/Web/wwwroot/css/orders/orders.component.scss index 1371a77..23a5d4f 100644 --- a/src/Web/wwwroot/css/orders/orders.component.scss +++ b/src/Web/wwwroot/css/orders/orders.component.scss @@ -1,4 +1,4 @@ -@import '../variables'; +@import '../variables.scss'; .esh-orders { min-height: 80vh; diff --git a/src/Web/wwwroot/css/shared/components/header/header.css b/src/Web/wwwroot/css/shared/components/header/header.css index 1d2add9..c690d0d 100644 --- a/src/Web/wwwroot/css/shared/components/header/header.css +++ b/src/Web/wwwroot/css/shared/components/header/header.css @@ -1,18 +1,12 @@ .esh-header { background-color: #00A69C; - height: 4rem; -} - -.esh-header-back { - color: rgba(255, 255, 255, 0.5); - line-height: 4rem; - text-decoration: none; - text-transform: uppercase; - transition: color 0.35s; -} - -.esh-header-back:hover { - color: #FFFFFF; - transition: color 0.35s; -} - + height: 4rem; } + .esh-header-back { + color: rgba(255, 255, 255, 0.5); + line-height: 4rem; + text-decoration: none; + text-transform: uppercase; + transition: color 0.35s; } + .esh-header-back:hover { + color: #FFFFFF; + transition: color 0.35s; } diff --git a/src/Web/wwwroot/css/shared/components/header/header.scss b/src/Web/wwwroot/css/shared/components/header/header.scss index 98d455c..4f05833 100644 --- a/src/Web/wwwroot/css/shared/components/header/header.scss +++ b/src/Web/wwwroot/css/shared/components/header/header.scss @@ -1,4 +1,4 @@ -@import '../../../variables'; +@import '../../../variables.scss'; .esh-header { $header-height: 4rem; diff --git a/src/Web/wwwroot/css/shared/components/identity/identity.scss b/src/Web/wwwroot/css/shared/components/identity/identity.scss index b9fd5c6..891eb8a 100644 --- a/src/Web/wwwroot/css/shared/components/identity/identity.scss +++ b/src/Web/wwwroot/css/shared/components/identity/identity.scss @@ -1,4 +1,4 @@ -@import '../../../variables'; +@import '../../../variables.scss'; .esh-identity { line-height: 3rem; diff --git a/src/Web/wwwroot/css/shared/components/pager/pager.scss b/src/Web/wwwroot/css/shared/components/pager/pager.scss index 078256c..b94f119 100644 --- a/src/Web/wwwroot/css/shared/components/pager/pager.scss +++ b/src/Web/wwwroot/css/shared/components/pager/pager.scss @@ -1,4 +1,4 @@ -@import '../../../variables'; +@import '../../../variables.scss'; .esh-pager {