Commit e6c0ca97 authored by Mathis Dedial's avatar Mathis Dedial
Browse files

Merge branch 'last_minute' into 'master'

Last minute

See merge request !4
parents d559e3be 42a38ec7
Pipeline #2714 skipped with stage
app/static/images/T14.jpg

1.91 KB | W: | H:

app/static/images/T14.jpg

15.1 KB | W: | H:

app/static/images/T14.jpg
app/static/images/T14.jpg
app/static/images/T14.jpg
app/static/images/T14.jpg
  • 2-up
  • Swipe
  • Onion skin
......@@ -76,6 +76,7 @@ section .container {
.burger__ranking {
text-align: left;
margin-bottom: 0;
}
.burger__ingredients {
......@@ -94,6 +95,7 @@ section .container {
.burger {
display: flex;
align-items: center;
justify-content: flex-start;
}
.burger__ranking {
......@@ -116,7 +118,7 @@ section .container {
margin-right: 1em;
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 67%;
flex-basis: 60%;
}
.burger__description {
......@@ -132,6 +134,7 @@ section .container {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 15%;
text-align: right;
}
}
......
......@@ -30,7 +30,7 @@
<nav class="navbar navbar-expand-lg bg-secondary fixed-top text-uppercase" id="mainNav">
<div class="container">
<a class="navbar-brand js-scroll-trigger amiv-brand" >
<a class="navbar-brand js-scroll-trigger amiv-brand" href="/">
<span class="amiv-brand__amiv">AMIV Jubiläum</span>
<span class="amiv-brand__hyphen"> - </span>
<span class="amiv-brand__burger"></span>Burger Contest</span>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment