ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Dev' of https://github.com/dotnet/eShopOnContainers into Dev

Browse Source
This commit is contained in:
Unai Zorrilla Castro 2016-12-29 11:03:55 +01:00
commit 73e7fefde5
6 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html
View File

@ -25,7 +25,7 @@
[(ngModel)]="item.quantity"
(change)="itemQuantityChanged(item)" />
</section>
<section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice * item.quantity}}</section>
<section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ {{item.unitPrice * item.quantity}}</section>
</article>
</div>

21
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.scss
View File

@ -3,25 +3,6 @@
.esh-basket {
min-height: 80vh;
$header-height: 4rem;
&-header {
background-color: #00A69C;
height: $header-height;
}
&-back {
color: rgba($color-foreground-brighter, .4);
line-height: $header-height;
text-transform: uppercase;
text-decoration: none;
transition: color $animation-speed-default;
&:hover {
color: $color-foreground-brighter;
transition: color $animation-speed-default;
}
}
&-titles {
padding-bottom: 1rem;
padding-top: 2rem;
@ -61,7 +42,7 @@
}
&--mark {
color: $color-secondary;
color: $color-brand;
}
}

2
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html
View File

@ -16,7 +16,7 @@
<section class="esh-orders-item col-xs-4">{{order.date | date:'short'}}</section>
<section class="esh-orders-item col-xs-2">$ {{order.total}}</section>
<section class="esh-orders-item col-xs-2">{{order.status}}</section>
<section class="esh-orders-item col-xs-2">
<section class="esh-orders-item esh-orders-item--hover col-xs-2">
<a class="esh-orders-link" routerLink="/orders/{{order.ordernumber}}">Detail</a>
</section>
</article>

26
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.scss
View File

@ -2,6 +2,7 @@
.esh-orders {
min-height: 80vh;
overflow-x: hidden;
$header-height: 4rem;
&-header {
@ -35,10 +36,35 @@
$height: 2rem;
height: $height;
line-height: $height;
position: relative;
&:nth-of-type(2n + 1) {
&:before {
background-color: $color-background-bright;
content: '';
height: 100%;
left: 0;
margin-left: -100vw;
position: absolute;
top: 0;
width: 200vw;
z-index: -1;
}
}
}
&-item {
font-weight: $font-weight-semilight;
&--hover {
opacity: 0;
pointer-events: none;
}
}
&-items:hover &-item--hover {
opacity: 1;
pointer-events: all;
}
&-link {

2
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss
View File

@ -7,7 +7,7 @@
height: $header-height;
&-back {
color: red;
color: rgba($color-foreground-brighter, .5);
line-height: $header-height;
text-transform: uppercase;
text-decoration: none;

3
src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
View File

@ -34,11 +34,12 @@
overflow: hidden;
padding: .5rem;
position: absolute;
top: 2rem;
top: 2.5rem;
transition: height $animation-speed-default;
}
&:hover &-drop {
border: $border-light solid $color-foreground-bright;
height: 7rem;
transition: height $animation-speed-default;
}