qwerty/tupali
4
1
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

quitando el rebote de los formularios #191

Merged
humano merged 22 commits from h4ckypurpl3/tupali_fork:master into master 2019-03-25 23:20:30 +00:00
Conversation 0 Commits 22 Files Changed 3 +10 -32
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 640e8bf956 - Show all commits

22
index.php
View File

@ -33,13 +33,8 @@
<meta name='apple-mobile-web-app-capable' content='yes'/> <meta name='apple-mobile-web-app-capable' content='yes'/>
<meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/> <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
<!-- Chrome, Firefox OS y Opera --> <!-- Chrome, Firefox OS y Opera -->
<<<<<<< HEAD
<script type="text/javascript">
=======
<link rel='stylesheet' href='./librerias/animate/animate.min.css'> <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
<script type="text/javascript"> <script type="text/javascript">
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
window.addEventListener("load",function() { window.addEventListener("load",function() {
setTimeout(function(){ setTimeout(function(){
window.scrollTo(0, 1); window.scrollTo(0, 1);
@ -714,22 +709,6 @@ if('serviceWorker' in navigator) {
$footer=" $footer="
<<<<<<< HEAD
<nav class='navbar navbar-inverse navbar-fixed-bottom'>
<div id='navbar' class='' aria-expanded='false' style='height: 1px;'>
<ul class='nav navbar-nav center-block' style='
float:none;
margin:0 auto;
display: block;
text-align: center;'>
$acciones
</ul>
</div>
</nav>";
=======
<nav class='navbar navbar-default navbar-fixed-bottom'> <nav class='navbar navbar-default navbar-fixed-bottom'>
<div class='container-fluid'> <div class='container-fluid'>
@ -754,7 +733,6 @@ $acciones
</div> </div>
</nav>"; </nav>";
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861