Skip to content

Commit

Permalink
Merge pull request #21 from HackerspaceKRK/at
Browse files Browse the repository at this point in the history
add subpage with cameras
  • Loading branch information
hbrylkowski committed Aug 13, 2023
2 parents 23eef30 + b2ed09a commit a4cdf3e
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 2 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ header_pages:
- title: kontakt
url: /kontakt
- title: status siedziby
url: https://at.hskrk.pl/
url: /at

# Page default value
# defaults:
Expand Down
6 changes: 6 additions & 0 deletions _includes/views/banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
}
</style>
{%- endif -%}
{%- if banner_image != "" -%}
<section class="page-banner">
<div class="page-banner-img">
<div style="background-image: url({{ banner_image }})"></div>
Expand All @@ -71,5 +72,10 @@
<div class="wrapper">
</div>
</section>
{%- else -%}
<div style="height: 90px">

</div>
{%- endif -%}
{%- endif -%}

20 changes: 20 additions & 0 deletions _sass/yat/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ html {
// Gaps between nav items, but not on the last one
&:not(:last-child) {
margin-right: 24px;

&:hover {
text-decoration: underline;
}
Expand Down Expand Up @@ -569,6 +570,7 @@ html {
&:not(:first-child) {
margin-top: 18px;
}

margin-bottom: 8px;
}

Expand Down Expand Up @@ -815,14 +817,32 @@ img.sponsors {
margin: 0 auto;
}

.camera-container {
display: flex;
}

@include media-query($on-laptop) {
.camera-container {
display: block;
}
}

.camera-col {
flex-grow: 0;
flex-shrink: 0.9;
flex-basis: auto;
padding: 0 1em;

div {
margin-bottom: 1.5em;
}
}

#map {
height: 500px;
}

.charts {
padding: 2em 0;
text-align: center;
}
2 changes: 1 addition & 1 deletion assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $brand-color: map-get($brand-colors, "orangered");
$brand-color: "{{ site.brand_color | default: '#ff5100' }}";
}

$content-width: {{ site.content_width | default: '920px' }};
$content-width: {{ site.content_width | default: '1080px' }};

// Click to top theme
$click-to-top-light-background-color: "{{ site.click_to_top.light.background_color | default: white }}";
Expand Down
43 changes: 43 additions & 0 deletions at.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
layout: home
title: at
sidebar: ""
banner: ""
---
<div class="camera-container">

<div class="camera-col">
<div>
<h2>Hardroom</h2>
<img src="https://at.hskrk.pl/dynamic/hardroom.jpeg" alt="Widok na hardroom">
</div>

<div>
<h2>Lab elektro</h2>
<img src="https://at.hskrk.pl/dynamic/elelab.jpeg" alt="Widok na lab elektroniczny">
</div>
</div>

<div class="camer-col">
<div>
<h2>Korytarz</h2>
<img src="https://at.hskrk.pl/dynamic/korytarz.jpeg" alt="Widok na korytarz">
</div>

</div>
<div class="camera-col">
<div>
<h2>Magazynek</h2>
<img src="https://at.hskrk.pl/dynamic/netlab.jpeg" alt="Widok na magazynek">
</div>
<div>
<h2>Softroom</h2>
<img src="https://at.hskrk.pl/dynamic/softroom.jpeg" alt="Widok na softroom">
</div>

</div>
</div>

<div class="charts">
<img src="https://grafana.apps.hskrk.pl/render/d-solo/efd454c7-2714-4507-b5b5-188e1feceeb7/public-network-stats?orgId=1&from=1691763084987&to=1691935884987&theme=light&panelId=2&width=1000&height=500&tz=Europe%2FWarsaw" alt="">
</div>

0 comments on commit a4cdf3e

Please sign in to comment.