diff --git a/practice/practice-02/src/assets/images/welcome/orange-desktop.png b/practice/practice-02/src/assets/images/welcome/orange-desktop.png new file mode 100644 index 0000000..33ceed0 Binary files /dev/null and b/practice/practice-02/src/assets/images/welcome/orange-desktop.png differ diff --git a/practice/practice-02/src/layouts/welcome.pug b/practice/practice-02/src/layouts/welcome.pug index c5f3478..c677a21 100644 --- a/practice/practice-02/src/layouts/welcome.pug +++ b/practice/practice-02/src/layouts/welcome.pug @@ -3,7 +3,7 @@ section.welcome .welcome__banner .welcome__banner-container - img.welcome__banner-image( + img.welcome__banner-img( src=welcome_img_path + "welcome-image-mobile.png", alt="Welcome banner image" ) @@ -22,17 +22,27 @@ section.welcome srcset=welcome_img_path + "arrow-desktop.png", alt="Arrow image" ) - img.welcome__arrow-image( + img.welcome__arrow-img-up( src=welcome_img_path + "arrow-mobile.png", alt="Arrow image" ) - img.welcome__mint-image( + img.welcome__mint-img( src=welcome_img_path + "mint.png", alt="Mint image" ) .welcome__content - .welcome__orange-image-wrapper - img(src=welcome_img_path + "orange.png", alt="Orange background image") + .welcome__arrow-down-img-wrapper + img.welcome__arrow-img-down( + src=welcome_img_path + "arrow-desktop-2.png", + alt="Arrow image down" + ) + .welcome__orange-img-wrapper + picture + source( + media="(min-width: 840px)", + srcset=welcome_img_path + "orange-desktop.png" + ) + img(src=welcome_img_path + "orange.png", alt="Orange background image") .welcome__text-box .welcome__icon-container img.welcome__love-icon( @@ -49,9 +59,10 @@ section.welcome span.primary-text food = " & " span.secondary-text delivery + .welcome__underline-img-container + img(src=welcome_img_path + "underline.png", alt="Underline image") = "." - .welcome__underline-image-container - img(src=welcome_img_path + "underline.png", alt="Underline image") + p.welcome__description Best cooks and best delivery guys all at your service. Hot tasty food will reach you in 60 minutes. form.welcome__search-form(action="#") .welcome__search-icon-wrapper @@ -82,7 +93,7 @@ section.welcome ) span.welcome__text-download-btn Watch Video .welcome__slider-container - img.welcome__slider-image( + img.welcome__slider-img( src=welcome_img_path + "slider.png", alt="Slider image" ) diff --git a/practice/practice-02/src/styles/layouts/_header.scss b/practice/practice-02/src/styles/layouts/_header.scss index 87499ba..4166abe 100644 --- a/practice/practice-02/src/styles/layouts/_header.scss +++ b/practice/practice-02/src/styles/layouts/_header.scss @@ -1,5 +1,5 @@ .header { - @include flex-container(space-between, null, center); + @include flex-container(space-between, $align-items: center); position: relative; max-width: 428px; diff --git a/practice/practice-02/src/styles/layouts/_welcome.scss b/practice/practice-02/src/styles/layouts/_welcome.scss index fa36a13..6a9161e 100644 --- a/practice/practice-02/src/styles/layouts/_welcome.scss +++ b/practice/practice-02/src/styles/layouts/_welcome.scss @@ -3,7 +3,7 @@ margin: auto; max-width: 428px; - // Start banner css code + // Start banner &__banner-container { @include size(428px, auto); @include flex-container(center, column); @@ -11,7 +11,7 @@ position: relative; } - &__banner-image { + &__banner-img { z-index: 1; } @@ -20,18 +20,18 @@ @include size(187px, 430px); } - &__arrow-image { + &__arrow-img-up { @include setAbsoluteAndLocation($top: -15px, $right: 50px); @include size(43px, 215px); } - &__mint-image { + &__mint-img { @include setAbsoluteAndLocation($bottom: 100px, $right: 0); } - // End banner css code + // End banner - // Start content css code + // Start content &__content { @include flex-container($flex-direction: column); @include size(calc(428px - 48px), auto); @@ -41,7 +41,11 @@ padding-inline: 24px; } - &__orange-image-wrapper { + &__arrow-down-img-wrapper { + display: none; + } + + &__orange-img-wrapper { @include setAbsoluteAndLocation($top: 0, $right: 35px); } @@ -77,9 +81,10 @@ font-size: $fs-x-lg; text-transform: capitalize; font-weight: 900; + max-width: 530px; } - &__underline-image-container { + &__underline-img-container { margin-top: 12px; } @@ -88,6 +93,7 @@ font-size: $fs-x-md; line-height: 140%; letter-spacing: -0.2px; + max-width: 517px; } &__search-form { @@ -96,6 +102,7 @@ margin-top: 32px; border-radius: 100px; border: 0.5px solid $black; + max-width: 471px; } &__search-icon-wrapper { @@ -148,7 +155,7 @@ } .welcome__text-download-btn { - color: $primary-color; + color: $white; } } } @@ -183,7 +190,7 @@ &__slider-container { display: none; } - // End content css code + // End content } .slider-container { @@ -191,6 +198,10 @@ } @media screen and (min-width: 840px) { + .secondary-text { + position: relative; + } + .welcome { @include flex-container( $flex-direction: row-reverse, @@ -203,10 +214,10 @@ max-width: $max-width; // Start banner - &__banner-image { + &__banner-img { @include size(100%, 100%); - max-width: 689px; + max-width: 650px; } &__lines-background { @@ -214,7 +225,7 @@ @include size(313px, 718px); } - &__arrow-image { + &__arrow-img-up { @include size(117px, 315px); @include setAbsoluteAndLocation($top: -40px, $right: 5px); transition: 0.2s; @@ -237,13 +248,43 @@ @include size(auto, auto); padding-left: 70px; padding-right: 0px; - max-width: 440px; + max-width: 560px; + } + + &__orange-img-wrapper { + @include setAbsoluteAndLocation($top: 170px, $right: -50px); + transition: 0.2s; + } + + &__heading { + font-size: $fs-xx-lg; + } + + &__underline-img-container { + @include setAbsoluteAndLocation($bottom: -10px, $left: 8px); + } + + &__description { + font-size: $fs-lg; + } + + &__arrow-down-img-wrapper { + @include setAbsoluteAndLocation($top: -50px, $left: 220px); + + display: block; + transition: 0.2s; + } + + &__search-form { + @include size(auto, 54px); } &__slider-container { display: block; @include setAbsoluteAndLocation($bottom: -135px, $left: 65px); } + + // End content } } @@ -253,13 +294,16 @@ padding-right: 74px; } - &__arrow-image { - @include size(117px, 315px); + &__arrow-img-up { @include setAbsoluteAndLocation($top: 8px, $right: 62px); } - &__orange-image-wrapper { - @include setAbsoluteAndLocation($top: 110px, $right: -12px); + &__orange-img-wrapper { + @include setAbsoluteAndLocation($top: 110px, $right: -50px); + } + + &__arrow-down-img-wrapper { + @include setAbsoluteAndLocation($top: -95px, $left: 230px); } } }