Skip to content

Commit 9119074

Browse files
Bertik23Bertik23
authored
Merge pull request #76 from klubFITpp/footer
Add footer
2 parents e353721 + 8c969ae commit 9119074

File tree

7 files changed

+133
-16
lines changed

7 files changed

+133
-16
lines changed

‎_includes/foot.html

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
1-
</html>
1+
<div class="footer_flex"></div>
2+
<footer>
3+
<div class="footer_line"></div>
4+
<div class="footer_colums">
5+
<div>
6+
<article class="refs__links">
7+
<a class="refs__links__link" href="https://facebook.com/klubFITpp"><i class="refs__links__link__logo ion ion-logo-facebook"></i> FITplusplus</a>
8+
<a class="refs__links__link" href="https://instagram.com/klubFITpp"><i class="refs__links__link__logo ion ion-logo-instagram"></i> @klubFITpp</a>
9+
<a class="refs__links__link" href="https://twitter.com/klubFITpp"><i class="refs__links__link__logo ion ion-logo-twitter"></i> @klubFITpp</a>
10+
<a class="refs__links__link" href="mailto:fitpp@su.cvut.cz"><i class="refs__links__link__logo ion ion-ios-mail"></i> fitpp@su.cvut.cz</a>
11+
</article>
12+
</div>
13+
<article class="refs__links">
14+
<a class="foot__button" href="https://discord.gg/2Bh93cXGJ3">Přidej se k nám!</a>
15+
<div class="footer_address">
16+
Klub FIT++<br>
17+
Thákurova 9<br>
18+
Praha 6, 160 00<br>
19+
</div>
20+
</article>
21+
</div>
22+
</footer>
23+
24+
</html>

‎_includes/head.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<!DOCTYPE html>
2-
<html lang="cs-CZ">
31
<head>
42
<meta charset="utf-8">
53
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -33,4 +31,4 @@
3331
<link rel="icon" type="image/png" href="{{ "/assets/images/icon-32.png" | relative_url }}" sizes="32x32">
3432
<link rel="icon" type="image/png" href="{{ "/assets/images/icon-96.png" | relative_url }}" sizes="96x96">
3533
<link rel="icon" type="image/png" href="{{ "/assets/images/icon-255.png" | relative_url }}" sizes="255x255">
36-
</head>
34+
</head>

‎_layouts/default.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
<!DOCTYPE html>
2+
<html lang="cs-CZ">
13
{% include head.html %}
24
<body class="w-screen max-w-screen min-h-screen overflow-x-hidden overflow-y-auto bg-slate-50">
35
{{ content }}
46
</body>
57
{% include foot.html %}
8+
</html>

‎_layouts/event.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
{% include head.html %}
2-
<body class="post">
3-
{% include nav.html %}
1+
---
2+
layout: default
3+
---
4+
{% include nav.html %}
5+
<section class="post">
46
<div class="post__title__wrapper post__image" style="background-image: url({{ page.img | relative_url }});">
57

68
<div class="post__title__background">
@@ -17,6 +19,5 @@ <h2 class="post__title">{{page.title}}</h2>
1719
{{ content }}
1820
</article>
1921
</main>
20-
21-
</body>
22-
{% include foot.html %}
22+
23+
</section>

‎_layouts/news.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
{% include head.html %}
2-
<body class="post">
1+
---
2+
layout: default
3+
---
34
{% include nav.html %}
5+
<section class="post">
46
<div class="post__title__wrapper post__image" style="background-image: url({{ page.img | relative_url }});">
57

68
<div class="post__title__background">
@@ -18,5 +20,4 @@ <h2 class="post__title">{{page.title}}</h2>
1820
</article>
1921
</main>
2022

21-
</body>
22-
{% include foot.html %}
23+
</section>

‎assets/css/app.css

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ body {
583583
color: var(--black);
584584
letter-spacing: 0.5px;
585585
background-color: var(--slate);
586+
display: flex;
587+
flex-direction: column;
586588
min-height: 100vh;
587589
width: 100vw;
588590
overflow-y: auto;
@@ -1396,14 +1398,18 @@ section {
13961398

13971399
/* POST */
13981400

1401+
section.post {
1402+
margin: 0;
1403+
padding: 3rem 0rem;
1404+
}
1405+
13991406
.post article p, .post article ul, .post article ol, .post article h1, .post article h2, .post article h3, .post article h4, .post article code{
14001407
-ms-word-wrap: break-word;
14011408
word-wrap: break-word;
14021409
}
14031410

14041411
.post__title__wrapper {
14051412
position: relative;
1406-
margin-top: 3.5rem;
14071413
height: -moz-max-content;
14081414
height: max-content;
14091415
min-height: 7rem;
@@ -1775,3 +1781,45 @@ section {
17751781
line-height: 1.75rem;
17761782
font-weight: 700;
17771783
}
1784+
1785+
.footer_flex{
1786+
flex:1;
1787+
}
1788+
1789+
footer {
1790+
text-align: center;
1791+
padding: 10px 0;
1792+
position: relative;
1793+
bottom: 0;
1794+
width: 100%;
1795+
}
1796+
1797+
footer .footer_line {
1798+
height: 0.2rem;
1799+
background-color: var(--blue);
1800+
margin-bottom: 0.5rem;
1801+
}
1802+
1803+
footer .footer_colums {
1804+
display: grid;
1805+
}
1806+
1807+
@media (min-width: 640px) {
1808+
footer .footer_colums {
1809+
grid-template-columns: repeat(2, minmax(0, 1fr));
1810+
}
1811+
}
1812+
1813+
.foot__button {
1814+
display: flex;
1815+
align-items: center;
1816+
justify-content: start;
1817+
width: 100%;
1818+
margin: .5em 0;
1819+
background-color: var(--yellow);
1820+
color: var(--black);
1821+
font-size: 1em;
1822+
padding: 0.5em;
1823+
text-decoration: none;
1824+
transition: background-color 300ms;
1825+
}

‎assets/css/input.css

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ body {
3434
color: var(--black);
3535
letter-spacing: 0.5px;
3636
background-color: var(--slate);
37+
display: flex;
38+
flex-direction: column;
3739
@apply w-screen min-h-screen overflow-x-hidden overflow-y-auto bg-slate-50;
3840
}
3941

@@ -500,13 +502,18 @@ section {
500502

501503
/* POST */
502504

505+
section.post {
506+
margin: 0;
507+
padding: 3rem 0rem;
508+
}
509+
503510
.post article p, .post article ul, .post article ol, .post article h1, .post article h2, .post article h3, .post article h4, .post article code{
504511
-ms-word-wrap: break-word;
505512
word-wrap: break-word;
506513
}
507514

508515
.post__title__wrapper {
509-
@apply h-max min-h-28 w-screen mt-14 relative;
516+
@apply h-max min-h-28 w-screen relative;
510517
}
511518

512519
.post__title__background {
@@ -721,3 +728,39 @@ section {
721728
.page h6 {
722729
@apply text-lg font-bold;
723730
}
731+
732+
.footer_flex{
733+
flex:1;
734+
}
735+
736+
footer {
737+
text-align: center;
738+
padding: 10px 0;
739+
position: relative;
740+
bottom: 0;
741+
width: 100%;
742+
}
743+
744+
footer .footer_line {
745+
height: 0.2rem;
746+
background-color: var(--blue);
747+
margin-bottom: 0.5rem;
748+
}
749+
750+
footer .footer_colums {
751+
@apply grid sm:grid-cols-2
752+
}
753+
754+
.foot__button {
755+
display: flex;
756+
align-items: center;
757+
justify-content: start;
758+
width: 100%;
759+
margin: .5em 0;
760+
background-color: var(--yellow);
761+
color: var(--black);
762+
font-size: 1em;
763+
padding: 0.5em;
764+
text-decoration: none;
765+
transition: background-color 300ms;
766+
}

0 commit comments

Comments
 (0)