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

Merge branch 'mobile' into 'master'

Fix issue #8

Closes #8

See merge request !2
parents 5f8a990f 55a7fd80
Pipeline #2711 passed with stage
in 29 seconds
......@@ -71,25 +71,68 @@ section .container {
}
.burger {
display: flex;
align-items: center;
text-align: left;
}
.burger__ranking {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 10%;
text-align: left;
}
.burger__info {
display: flex;
align-items: center;
.burger__ingredients {
margin-bottom: 1em;
}
.burger__description {
margin-bottom: 1em;
}
.burger__voting {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 15%;
text-align: center;
}
@media (min-width: 768px) {
.burger {
display: flex;
align-items: center;
}
.burger__ranking {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 10%;
}
.burger__info {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 75%;
display: flex;
align-items: center;
text-align: left;
}
.burger__ingredients {
margin-bottom: 0;
margin-right: 1em;
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 67%;
}
.burger__description {
text-align: right;
margin-bottom: 0;
margin-left: auto;
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 33%;
}
.burger__voting {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 15%;
}
}
.messages {
......@@ -98,11 +141,43 @@ section .container {
}
.message {
text-align: center;
position: fixed;
z-index: 4;
background-color: white;
padding: 1em;
border: 1px solid #1F2D54;
border-radius: 5px;
top: 300px;
top: 250px;
max-width: 90%;
margin-left: auto;
margin-right: auto;
}
.amiv-brand__amiv {
display: block;
}
.amiv-brand__hyphen {
display: none;
}
.amiv-brand__burger {
display: block;
}
@media (min-width: 768px) {
.amiv-brand__amiv {
display: inline;
}
.amiv-brand__hyphen {
display: inline;
}
.amiv-brand__burger {
display: inline;
}
}
......@@ -30,7 +30,11 @@
<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 Jubiläum - Burger Contest</a>
<a class="navbar-brand js-scroll-trigger amiv-brand" >
<span class="amiv-brand__amiv">AMIV Jubiläum</span>
<span class="amiv-brand__hyphen"> - </span>
<span class="amiv-brand__burger"></span>Burger Contest</span>
</a>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto">
<li class="nav-item mx-0 mx-lg-1">
......
......@@ -30,13 +30,13 @@
{% for burger in burger_list %}
<div class="list-group-item burger">
<!-- Ranking -->
<h3 class="text-secondary mr-3 burger__ranking">
<h3 class="text-secondary burger__ranking">
{{ loop.index }}.
</h3>
<div class="burger__info">
<!-- Name & Ingredients -->
<div class="text-left w-50">
<div class="burger__ingredients">
<h4 class="text-primary">{{ burger.name }}</h4>
<p class="mb-0">
{{ patty.get(burger.patty) }}
......@@ -50,7 +50,7 @@
</div>
<!-- Description and username -->
<blockquote class="blockquote text-center mb-0 w-50">
<blockquote class="blockquote burger__description">
<p class="mb-0">
{{ burger.description }}
</p>
......
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