Commit 5aee517b authored by Mathis Dedial's avatar Mathis Dedial
Browse files

Fix issue #8

parent 5f8a990f
Pipeline #2703 skipped with stage
...@@ -71,25 +71,59 @@ section .container { ...@@ -71,25 +71,59 @@ section .container {
} }
.burger { .burger {
display: flex; text-align: left;
align-items: center;
} }
.burger__ranking { .burger__ranking {
flex-grow: 0; /* don't grow */ text-align: left;
flex-shrink: 0; /* don't shrink */
flex-basis: 10%;
} }
.burger__info { .burger__ingredients {
display: flex; margin-bottom: 1em;
align-items: center; }
.burger__description {
margin-bottom: 1em;
} }
.burger__voting { .burger__voting {
flex-grow: 0; /* don't grow */ text-align: center;
flex-shrink: 0; /* don't shrink */ }
flex-basis: 15%;
@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 {
display: flex;
align-items: center;
text-align: left;
}
.burger__description {
width: 50%;
text-align: center;
margin-bottom: 0;
}
.burger__ingredients {
width: 50%;
margin-bottom: 0;
}
.burger__voting {
flex-grow: 0; /* don't grow */
flex-shrink: 0; /* don't shrink */
flex-basis: 15%;
}
} }
.messages { .messages {
...@@ -98,11 +132,43 @@ section .container { ...@@ -98,11 +132,43 @@ section .container {
} }
.message { .message {
text-align: center;
position: fixed; position: fixed;
z-index: 4; z-index: 4;
background-color: white; background-color: white;
padding: 1em; padding: 1em;
border: 1px solid #1F2D54; border: 1px solid #1F2D54;
border-radius: 5px; 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 @@ ...@@ -30,7 +30,11 @@
<nav class="navbar navbar-expand-lg bg-secondary fixed-top text-uppercase" id="mainNav"> <nav class="navbar navbar-expand-lg bg-secondary fixed-top text-uppercase" id="mainNav">
<div class="container"> <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"> <div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item mx-0 mx-lg-1"> <li class="nav-item mx-0 mx-lg-1">
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="burger__info"> <div class="burger__info">
<!-- Name & Ingredients --> <!-- Name & Ingredients -->
<div class="text-left w-50"> <div class="burger__ingredients">
<h4 class="text-primary">{{ burger.name }}</h4> <h4 class="text-primary">{{ burger.name }}</h4>
<p class="mb-0"> <p class="mb-0">
{{ patty.get(burger.patty) }} {{ patty.get(burger.patty) }}
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</div> </div>
<!-- Description and username --> <!-- Description and username -->
<blockquote class="blockquote text-center mb-0 w-50"> <blockquote class="blockquote burger__description">
<p class="mb-0"> <p class="mb-0">
{{ burger.description }} {{ burger.description }}
</p> </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