Skip to content

Commit

Permalink
Merge branch 'master' of github.com:growlerapp/webapp into fix/geo-de…
Browse files Browse the repository at this point in the history
…tection
  • Loading branch information
raulghm committed Oct 17, 2019
2 parents 4704839 + 035eca2 commit 9c1add2
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@growlerapp/webapp",
"version": "0.4.5",
"version": "0.4.6",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
Binary file modified public/img/icons/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/img/icons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Loading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export default {
animation-timing-function: linear;
animation-iteration-count: infinite;
position: fixed;
width: 36px;
height: 36px;
width: 46px;
height: 46px;
top: 50%;
left: 50%;
z-index: 10;
Expand Down
9 changes: 8 additions & 1 deletion src/components/StoreItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,17 @@ export default {
.StoreItem-meta-name {
font-family: var(--font-family-primary);
font-weight: 600;
font-size: 1.2rem;
font-size: 1.1rem;
text-transform: uppercase;
letter-spacing: 1px;
margin-bottom: 6px;
margin-right: 80px;
}
@media (--sm-viewport) {
.StoreItem-meta-name {
font-size: 1.2rem;
}
}
.StoreItem-meta-address {
Expand Down
8 changes: 7 additions & 1 deletion src/components/StoreItemFull.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,18 @@ export default {
.StoreItemFull-name {
font-family: var(--font-family-primary);
font-weight: 600;
font-size: 2rem;
font-size: 1.6rem;
text-transform: uppercase;
letter-spacing: 1px;
margin-bottom: 6px;
}
@media (--sm-viewport) {
.StoreItemFull-name {
font-size: 2rem;
}
}
.StoreItemFull-address {
margin-bottom: 2px;
}
Expand Down
13 changes: 8 additions & 5 deletions src/views/Splash.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
</div>

<div class="Splash-step">
<i class="ico-pin"></i>
<h2>
Encuentra los bares <br>
más cercanos para <br>
Expand Down Expand Up @@ -196,7 +195,7 @@ export default {
margin: 0 auto;
transform: translateY(20px);
animation: anim-fade 1s .6s ease forwards;
max-height: 40%;
max-height: 36%;
}
.Splash h1 {
Expand Down Expand Up @@ -230,11 +229,15 @@ export default {
position: absolute;
left: 40px;
right: 40px;
bottom: -20px;
bottom: 0;
}
.Splash-step:nth-child(2) {
bottom: -30px;
}
.Splash-step:nth-child(1) {
bottom: 10px;
.Splash-step:nth-child(2) h2 {
margin-bottom: 0;
}
.Splash-step.is-active {
Expand Down

0 comments on commit 9c1add2

Please sign in to comment.