nathalie/pedi2
3
3
Fork 1
Code Issues Pull requests 1 Projects Releases Wiki Activity

Compare commits

base: nathalie:2d8d218d1f75dc7836b886c9d4f96ac076412c5b
Branches Tags
nathalie:master
nathalie:funcion/saldos
nathalie:funcion/actualizaciones
nathalie:backup-90
..
compare: nathalie:dce06203654cacc175a205955df04ca3a591eb03
Branches Tags
nathalie:master
nathalie:funcion/saldos
nathalie:funcion/actualizaciones
nathalie:backup-90

No commits in common. "2d8d218d1f75dc7836b886c9d4f96ac076412c5b" and "dce06203654cacc175a205955df04ca3a591eb03" have entirely different histories.
2d8d218d1f ... dce0620365

3 changed files with 9 additions and 33 deletions
Show stats Expand all files Collapse all files

14
public/css/app.css vendored
View file

@ -19,7 +19,7 @@ nav.breadcrumb.is-fixed-top {
left: 0; left: 0;
position: fixed; position: fixed;
right: 0; right: 0;
z-index: 0; z-index: 30;
top: 3.25rem; top: 3.25rem;
height: 3.25rem; height: 3.25rem;
} }
@ -51,15 +51,3 @@ main.has-top-padding {
main.chisma-abierta { main.chisma-abierta {
padding-top: 25.5rem !important; padding-top: 25.5rem !important;
} }
@media screen and (min-width: 1024px) {
.hide-when-widescreen {
display: none;
}
}
@media screen and (max-width: 1023px) {
.hide-when-narrowscreen {
display: none;
}
}

20
public/js/app.js vendored
View file

@ -7,10 +7,8 @@ Vue.component('nav-bar', {
<a class="navbar-item" href="https://mps.org.uy"> <a class="navbar-item" href="https://mps.org.uy">
<img src="/assets/logoMPS.png" height="28"> <img src="/assets/logoMPS.png" height="28">
</a> </a>
<p style="margin:0 auto" class="navbar-item hide-when-widescreen"> <p style="margin:0 auto" class="navbar-item"><slot name="subpedido"></slot></p>
<slot name="subpedido"></slot> <a class="navbar-item" href="#chismosa" @click.capture="toggleChismosa">
</p>
<a class="navbar-item hide-when-widescreen" href="#chismosa" @click.capture="toggleChismosa">
<img style="padding:0 0.3em;" src="/assets/chismosa.png" height="28"> <img style="padding:0 0.3em;" src="/assets/chismosa.png" height="28">
<p style="margin:0 auto; color:white">$ <span v-text="subpedido == null ? 0 : subpedido.total"></span></p> <p style="margin:0 auto; color:white">$ <span v-text="subpedido == null ? 0 : subpedido.total"></span></p>
</a> </a>
@ -22,19 +20,9 @@ Vue.component('nav-bar', {
</div> </div>
<div id="navbarBasicExample" class="navbar-menu" :class="{'is-active':isActive}"> <div id="navbarBasicExample" class="navbar-menu" :class="{'is-active':isActive}">
<div class="navbar-start"></div> <div class="navbar-start has-text-right-mobile">
<div class="navbar-end has-text-right-mobile">
<p style="margin:0 auto" class="navbar-item hide-when-narrowscreen">
<slot name="subpedido"></slot>
</p>
<a class="navbar-item hide-when-narrowscreen" href="#chismosa" @click.capture="toggleChismosa">
<img style="padding:0 0.3em;" src="/assets/chismosa.png" height="28">
<p style="margin:0 auto; color:white">$ <span v-text="subpedido == null ? 0 : subpedido.total"></span></p>
</a>
<!-- Styles nombre del barrio--> <!-- Styles nombre del barrio-->
<p class="navbar-item"> <p class="navbar-item"><slot name="gdc"></slot></p>
<slot name="gdc"></slot>
</p>
<a class="navbar-item" <a class="navbar-item"
onclick="event.preventDefault(); onclick="event.preventDefault();
document.getElementById('logout-form').submit();"> document.getElementById('logout-form').submit();">

2
resources/views/layouts/app.blade.php
View file

@ -35,7 +35,7 @@
<nav-migas inline-template> <nav-migas inline-template>
<nav class="breadcrumb is-centered has-background-danger-light is-fixed-top" aria-label="breadcrumbs" v-show="visible"> <nav class="breadcrumb is-centered has-background-danger-light is-fixed-top" aria-label="breadcrumbs" v-show="visible">
<ul> <ul>
<li v-for="(miga, i) in migas" v-bind:class="i===migas.length-1 ? 'is-active' : ''"><a :href="miga.href" v-text="miga.nombre"></a></li> <li v-for="(miga, i) in migas" v-bind:class="i==migas.length-1 ? 'is-active' : ''"><a :href="miga.href" v-text="miga.nombre"></a></li>
</ul> </ul>
</nav> </nav>
</nav-migas> </nav-migas>