Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TechAachen/Webseite-Jekyll
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: TechAachen/Webseite-Jekyll
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.2
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on May 9, 2020

  1. Fix header display for portrait viewports

    @rleh
    rleh committed May 9, 2020
    Copy the full SHA
    1a7d736 View commit details

  2. WIP: Header: Button to scroll down

    @rleh
    rleh committed May 9, 2020
    Copy the full SHA
    72d3165 View commit details
Showing with 12 additions and 3 deletions.
  1. +1 −1 _includes/card.html
  2. +3 −0 _includes/header.html
  3. +1 −0 _sass/_base.scss
  4. +7 −2 _sass/_header.scss
2 changes: 1 addition & 1 deletion _includes/card.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section>
<section id="{{include.title | downcase | remove: ' ' }}">
<h2>{{include.title}}</h2>
<div class="card rounded shadow" style="height: 400px;">
<img srcset="{{include.image375}} 375w,
3 changes: 3 additions & 0 deletions _includes/header.html
View file
Original file line number Diff line number Diff line change
@@ -14,4 +14,7 @@
</div>
</div>
</div>
<div id="header-scroll-button" class="w-100 text-center">
<a href="#unseremission" class="btn btn-primary btn-xl page-scroll">Mehr erfahren</a>
</div>
</header>
1 change: 1 addition & 0 deletions _sass/_base.scss
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ html,
body {
height: 100%;
width: 100%;
scroll-behavior: smooth;
}

body {
9 changes: 7 additions & 2 deletions _sass/_header.scss
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@ header {
background-repeat: no-repeat;
background-size: auto;
background-image: url("../img/header/header-960.jpg");
@media (min-width: 961px) {
@media (min-width: 961px), (min-height: 635px) {
background-image: url("../img/header/header-1920.jpg");
background-size: cover;
background-position-y: -40px;
}
@media (min-width: 1921px) {
@media (min-width: 1921px), (min-height: 1268px) {
background-image: url("../img/header/header-3840.jpg");
background-size: cover;
background-position-y: -60px;
@@ -73,4 +73,9 @@ header {
}
}
}
#header-scroll-button {
margin: auto;
position: absolute;
top: 85%;
}
}