Skip to content

Commit

Permalink
Merge pull request #32 from ElizabethBil/your-order
Browse files Browse the repository at this point in the history
order section add 1440 and edits
  • Loading branch information
ElizabethBil authored Oct 3, 2023
2 parents 6dfc4e3 + 1d3d053 commit 12e4d78
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 17 deletions.
52 changes: 40 additions & 12 deletions src/css/order.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@media screen and (min-resolution: 192dpi) and (min-width:375px) {
.your-order-section {
background-image: url('../img/order/[email protected]')
background-image: url('../img/order/[email protected]');
}
}

Expand Down Expand Up @@ -135,7 +135,8 @@

@media screen and (min-resolution: 192dpi) and (min-width:768px) {
.your-order-section {
background-image: url('../img/order/[email protected]')
background-image: url('../img/order/[email protected]'),
url('../img/order/[email protected]');
}
}

Expand Down Expand Up @@ -202,7 +203,8 @@

@media screen and (min-resolution: 192dpi) and (min-width:1280px) {
.your-order-section {
background-image: url('../img/order/[email protected]')
background-image: url('../img/order/[email protected]'),
url('../img/order/[email protected]');
}
}

Expand All @@ -224,7 +226,6 @@
margin-bottom: 150px;
}


.order-form-wrapper {
margin-bottom: 0;
}
Expand All @@ -238,25 +239,52 @@
margin-left: 50px;
}


.order-title {
max-width: 545px;
margin-bottom: 40px;
}

.order-content-img-wrapper {
margin-left: auto;
}

.order-content-img {
display: block;
margin-left: -36px;
height: 521px;
}

.bkg-ornament-placeholder {
display: none;
}
}

/* ======DESKTOP===== */
/* ======DESKTOP 1440===== */

@media screen and (min-resolution: 192dpi) and (min-width:1440px) {
.your-order-section {
background-image: url('../img/order/[email protected]'),
url('../img/order/[email protected]');
}
}


@media screen and (min-width: 1440px) {

.your-order-section {
background-image: url('../img/order/order-bkg-desktop-1440.jpg'),
url('../img/order/bkg-element-desktop-1440.png');
background-size: 100% 776px, 323px 484px;
}


.order-title {
max-width: 666px;
}

.order-content-img {
margin-left: 0;
}

}





@media screen and (min-width: 1440px) {}
/* ======/DESKTOP===== */
Binary file added src/img/order/bkg-element-desktop-1440.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/order/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/order/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/order/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/order/order-bkg-desktop-1440.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/img/order/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions src/partials/order.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@ <h2 class="section-title order-title">
</button>
</form>
</div>
<div class="order-content-img-wrapper">
<img class="order-content-img" srcset="../img/order/order-img-tablet.jpg 638w,
<img class="order-content-img" srcset="../img/order/order-img-tablet.jpg 638w,
../img/order/[email protected] 1276w,
../img/order/order-img-desktop.jpg 524w,
../img/order/[email protected] 1048w"
sizes="(min-width: 1280px) 524px, (min-width: 768px) 638x" src="../img/order/order-img-tablet.jpg"
alt="girl-wearing-embroidered-shirt">
</div>
sizes="(min-width: 1440px) 524px, (min-width: 1280px) 524px, (min-width: 768px) 638x"
src="../img/order/order-img-tablet.jpg" alt="girl-wearing-embroidered-shirt">

</div>
<div class="bkg-ornament-placeholder "></div>
</div>
Expand Down

0 comments on commit 12e4d78

Please sign in to comment.