Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Template #17

Merged
merged 4 commits into from
Dec 22, 2024
Merged

Template #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8e540f
Added logo
JulieSagan Dec 12, 2024
256a013
Adaptive inner page
JulieSagan Dec 17, 2024
b66fcb7
Removed media 768px
JulieSagan Dec 21, 2024
819c859
Changed name of modificator from content_transparent to content_padding
JulieSagan Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions assets/images/logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion components/container/container.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
.container {
max-width: 1110px;
margin: 0 auto;
/* text-align: center; */
}

@media screen and (max-width: 1140px) {
.container {
padding-inline: 30px;
}
}

@media screen and (max-width: 480px) {
.container {
padding-inline: 20px;
}
}
4 changes: 4 additions & 0 deletions components/content/content.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@
flex-wrap: wrap;
justify-content: center;
gap: 30px;
}

.content_padding {
padding-block: 0;
}
27 changes: 26 additions & 1 deletion components/header/header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
.header {
padding-top: 24px;
}

.header__title {
display: flex;
justify-content: flex-start;
align-items: center;
margin-top: 96px;
margin-top: 40px;
margin-bottom: 77px;
font-size: 3.125rem;
font-weight: 500;
Expand All @@ -11,4 +15,25 @@

.header_transparent {
background-color: transparent;
}

.header__logo {
padding-top: 24px;
}

@media screen and (max-width: 768px) {

.header__logo {
padding-top: 16px;
margin: 0 auto;
}
}

@media screen and (max-width: 480px) {

.header__title {
font-size: 1.75rem;
font-weight: 400;
line-height: 1.35;
}
}
7 changes: 7 additions & 0 deletions components/template-description/template-description.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,11 @@
border-radius: 12px;
box-shadow: 0px 2px 4px 0px rgba(33, 36, 41, 0.05);
padding: 32px 48px;
}

@media screen and (max-width: 768px) {
.template__component-description {
width: 100%;
padding: 32px 16px;
}
}
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<div class="wrapper">
<header class="header">
<div class="container">
<img class="header__logo" src="./assets/images/logo.svg" alt="logo">
<h1 class="header__title">Reusable component library</h1>
</div>
</header>
Expand Down
19 changes: 19 additions & 0 deletions pages/template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,23 @@
font-weight: 400;
line-height: 1.36;
margin-bottom: 24px;
}

@media screen and (max-width: 768px) {
.template__inner {
grid-template-columns: 1fr;
}

.template__sidebar {
display: none;
}
}

@media screen and (max-width: 480px) {
.template__title {
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: 1.3;
}
}
25 changes: 14 additions & 11 deletions pages/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
</head>

<body>
<main class="content">
<main class="content content_padding">
<div class="container">
<div class="template">
<div class="header header_transparent"></div>

<div class="header header_transparent">
<img class="header__logo" src="../assets/images/logo.svg" alt="logo">
</div>

<div class="template__inner">

<div class="template__sidebar">
Expand All @@ -28,7 +30,8 @@ <h4 class="sidebar__title">Components</h4>
<li class="sidebar__list-item"><a class="sidebar__link" href="">Avatar</a></li>
<li class="sidebar__list-item"><a class="sidebar__link" href="">Calendar</a></li>
<li class="sidebar__list-item"><a class="sidebar__link" href="">Histogram</a></li>
<li class="sidebar__list-item"><a class="sidebar__link" href="">Custom form elements</a>
<li class="sidebar__list-item"><a class="sidebar__link" href="">Custom form
elements</a>
</li>
<li class="sidebar__list-item"><a class="sidebar__link" href="">Main page</a></li>
</ul>
Expand All @@ -47,7 +50,7 @@ <h3 class="template__title">Histogram</h3>
</div>
<a href="#" class="histogram__link">View all</a>
</div>

<div class="histogram__body">
<div class="histogram__bar" style="height: 60%;"></div>
<div class="histogram__bar" style="height: 40%;"></div>
Expand All @@ -66,19 +69,19 @@ <h3 class="template__title">Histogram</h3>
</div>
</div>

</div>
</div>



</div>

<footer class="footer footer_transparent">
<h5 class="footer__caption">Reusable component library</h5>
</footer>
</div>
</div>
</main>


</body>

Expand Down
Loading