Skip to content

Commit

Permalink
Updated with correctives
Browse files Browse the repository at this point in the history
  • Loading branch information
Irina-Bondarenko committed Feb 18, 2022
1 parent 8ac7f34 commit 1e8e888
Show file tree
Hide file tree
Showing 20 changed files with 202 additions and 82 deletions.
Binary file added .DS_Store
Binary file not shown.
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/Duo-Unlimited-Display.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/watcherTasks.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"devDependencies": {
"prettier": "2.5.1"
}
}
146 changes: 77 additions & 69 deletions pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
<div class="row">
<div class="contact-form d-flex justify-content-between">
<div class="contact-form__phone d-flex align-items-center p">
<div
class="contact-form__img"
style="
background-image: url('./../images/icons/phone-icon.svg');
"
></div>
<div class="contact-form__img"></div>
<!-- style="-->
<!-- background-image: url('./../images/icons/phone-icon.svg');-->
<!-- "></div>-->

<div class="contact-form__number">
<p>+33 (0)4 99 63 20 50</p>
Expand Down Expand Up @@ -176,30 +174,32 @@
style="--bs-breadcrumb-divider: ''"
aria-label="breadcrumb p-0"
>
<ol class="breadcrumb m-0 p-0">
<li class="breadcrumb-item">
<a class="green-item" href="#">Products</a>
</li>
<div class="breadcrumb m-0 p-0">
<ul>
<li class="breadcrumb-item">
<a class="green-item" href="#">Products</a>
</li>
</ul>

<img
class="main-search__line"
class="main-search__line line1-1"
src="./../images/icons/line-icon.svg"
alt="line1"
class="line1-1"
/>

<li class="breadcrumb-item active" aria-current="page">
Display Wall
</li>
<ul>
<li class="breadcrumb-item active" aria-current="page">
Display Wall
</li>
</ul>
<img
class="main-search__line"
class="main-search__line line2-2"
src="./../images/icons/line-icon.svg"
alt="line2"
class="line2-2"
/>

<li class="breadcrumb-item"><a href="#">Products</a></li>
</ol>
<ul>
<li class="breadcrumb-item"><a href="#">Products</a></li>
</ul>
</div>
</nav>

<h2>Display Wall</h2>
Expand Down Expand Up @@ -1129,31 +1129,35 @@ <h2>Display Wall</h2>
<div class="paginationPage d-flex">
<div class="paginationPage__pages">
<nav aria-label="Page navigation example">
<ul class="pagination align-items-center">
<li class="page-item">
<a class="page-link" id="img-page1" href="#">
<img
src="./../images/icons/arrow-left.svg"
alt="Previous"
/>
</a>
</li>
<div class="pagination align-items-center">
<ul>
<li class="page-item">
<a class="page-link" id="img-page1" href="#">
<img
src="./../images/icons/arrow-left.svg"
alt="Previous"
/>
</a>
</li>
</ul>
<p>Page</p>
<div
class="page-number d-flex align-items-center justify-content-center"
>
<span>1</span>
</div>
<p>of 128</p>
<li class="page-item">
<a class="page-link" id="img-page2" href="#">
<img
src="./../images/icons/arrow-right.svg"
alt="Next"
/>
</a>
</li>
</ul>
<ul>
<li class="page-item">
<a class="page-link" id="img-page2" href="#">
<img
src="./../images/icons/arrow-right.svg"
alt="Next"
/>
</a>
</li>
</ul>
</div>
</nav>
</div>

Expand Down Expand Up @@ -1228,48 +1232,52 @@ <h2>Display Wall</h2>
<div class="footer__nav col-6">
<div class="products">
<h5>Products</h5>

<li><a href="">Banner stands</a></li>
<li><a href="">Counters</a></li>
<li><a href="">Outdoor</a></li>
<li><a href="">Frames</a></li>
<li><a href="">Stands</a></li>
<li><a href="">Outdoor</a></li>
<li><a href="">Frames</a></li>
<li><a href="">Stands</a></li>
<ul>
<li><a href="">Banner stands</a></li>
<li><a href="">Counters</a></li>
<li><a href="">Outdoor</a></li>
<li><a href="">Frames</a></li>
<li><a href="">Stands</a></li>
<li><a href="">Outdoor</a></li>
<li><a href="">Frames</a></li>
<li><a href="">Stands</a></li>
</ul>
</div>

<div class="products">
<h5>Applications</h5>

<li><a href="">Tradeshows</a></li>
<li><a href="">Events</a></li>
<li><a href="">Road-shows</a></li>
<li><a href="">Decoration</a></li>
<li><a href="">Retail</a></li>
<li><a href="">Printing</a></li>
<ul>
<li><a href="">Tradeshows</a></li>
<li><a href="">Events</a></li>
<li><a href="">Road-shows</a></li>
<li><a href="">Decoration</a></li>
<li><a href="">Retail</a></li>
<li><a href="">Printing</a></li>
</ul>
</div>

<div class="products">
<h5>My Profile</h5>

<li><a href="">Dashboard</a></li>
<li><a href="">Account</a></li>
<li><a href="">Orders</a></li>
<li><a href="">Quotes</a></li>
<li><a href="">Retail</a></li>
<li><a href="">My Contacts</a></li>
<ul>
<li><a href="">Dashboard</a></li>
<li><a href="">Account</a></li>
<li><a href="">Orders</a></li>
<li><a href="">Quotes</a></li>
<li><a href="">Retail</a></li>
<li><a href="">My Contacts</a></li>
</ul>
</div>

<div class="products">
<h5>Duo Display</h5>

<li><a href="">About Duo</a></li>
<li><a href="">General terms</a></li>
<li><a href="">Warranty</a></li>
<li><a href="">Legal notice</a></li>
<li><a href="">Retail</a></li>
<li><a href="">Contact us</a></li>
<ul>
<li><a href="">About Duo</a></li>
<li><a href="">General terms</a></li>
<li><a href="">Warranty</a></li>
<li><a href="">Legal notice</a></li>
<li><a href="">Retail</a></li>
<li><a href="">Contact us</a></li>
</ul>
</div>
</div>

Expand Down
Binary file added scss/.DS_Store
Binary file not shown.
10 changes: 5 additions & 5 deletions scss/common/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@

@mixin footer-btn-before {
content: "";
background-image: url("./../../../images/icons/white_planet.svg");
background-image: url("./../images/icons/white_planet.svg");
width: 17px;
height: 16px;
position: absolute;
right: 70%;
right: 75%;
top: 20%;
}

@mixin footer-btn-after {
content: "";
background-image: url("./../../../images/icons/send_24px.svg");
background-image: url("./../images/icons/send_24px.svg");
width: 13px;
height: 11px;
position: absolute;
right: 15%;
right: 25%;
top: 40%;
}

Expand Down Expand Up @@ -59,7 +59,7 @@
}

@mixin btn-up {
background-image: url("../../../images/icons/btn-up.svg");
background-image: url("./../images/icons/btn-up.svg");
width: 30px;
height: 30px;
border-radius: 20px;
Expand Down
Binary file added scss/components/.DS_Store
Binary file not shown.
5 changes: 5 additions & 0 deletions scss/components/footer/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ footer {
li {
list-style: none;
}

ul {
margin-left: 0;
padding-left: 0;
}
}

&__form {
Expand Down
Binary file added scss/components/header/.DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions scss/components/header/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ header {
font-size: $font-size-md;
padding-bottom: 5px;


&__img {
background-image: url("./../../../images/icons/phone-icon.svg");
width: 15px;
height: 15px;
background-repeat: no-repeat;


}

&__number p {
Expand Down
4 changes: 3 additions & 1 deletion scss/components/main/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

&:after {
content: "";
background-image: url("./../images/icons/zoom-icon.svg");
background-image: url("./../../../images/icons/zoom-icon.svg");
width: 10px;
height: 20px;
}
Expand Down Expand Up @@ -175,10 +175,12 @@

.plate_image {
transition: 0.7s;
margin-left: 20px;

img {
width: 100%;
margin-right: 10px;
padding-right: 20px;
}
}

Expand Down
7 changes: 7 additions & 0 deletions scss/components/pagination/pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
img {
margin-bottom: 3px;
}


}

& .dropdown-toggle::after {
Expand Down Expand Up @@ -69,5 +71,10 @@
color: $dark-grey;
display: contents;
}

ul {
list-style: none;
margin-bottom: 0;
}
}
}
6 changes: 6 additions & 0 deletions scss/components/search/search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@
font-weight: 800;
margin: 0 auto;
}

ul {
list-style: none;
margin-bottom: 0;
padding-left: 0;
}
}
Loading

0 comments on commit 1e8e888

Please sign in to comment.