From cdf53bb730ae88a5619a94585f07a73f6931c102 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Fri, 28 Sep 2018 15:08:18 -0500 Subject: [PATCH 1/8] guardando cambios --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index d2d0f7a..386110a 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit d2d0f7a3a98fbcf77322ae767c9105a5e48bff65 +Subproject commit 386110adb03b92b9f8b3e08643b2705635e8053f From 1af309fe2bd8e6d06e6f779bbae63af35d90c289 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Mon, 8 Oct 2018 19:40:09 -0500 Subject: [PATCH 2/8] ultimo pull milfs commit --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 386110a..86f1774 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 386110adb03b92b9f8b3e08643b2705635e8053f +Subproject commit 86f1774b3da588b0f156281e861ce34a581d78db From 9a0dc250a92c50a43f13873120a16452f145817e Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Tue, 9 Oct 2018 00:37:38 -0500 Subject: [PATCH 3/8] =?UTF-8?q?=20implementaci=C3=B3n=20landingpage=20logo?= =?UTF-8?q?=20y=20barra=20superior=20de=20navegaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 98 ++++++++++++++++---------- librerias/landingjs/scripts_landing.js | 11 +++ 2 files changed, 73 insertions(+), 36 deletions(-) create mode 100644 librerias/landingjs/scripts_landing.js diff --git a/index.php b/index.php index 28730c5..310bd46 100644 --- a/index.php +++ b/index.php @@ -1304,24 +1304,25 @@ document.oncopy = addLink; echo " " ; } if(isset($_SESSION['id'] )) { - $id_empresa_portada='1'; - if($_SESSION['grupo'] == '3'){ + $id_empresa_portada='1'; + if($_SESSION['grupo'] == '3'){ echo "
$_SESSION[username] $_SESSION[equipo] Salir
"; } else{ $usuario = $_SESSION['username']; - echo " ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." "; + echo " ".panel_aplicaciones('1',"$_SESSION[id_empresa]","")." "; } - + }else{ echo "
- - Ingresa, se parte de nuestra comunidad
"; - + + Ingresar Aportar a la inteligencia colectiva"; + + } - - - + + + if(isset($_REQUEST['eventos'])) { //$embebido='1'; $librerias_pie=" @@ -1492,36 +1493,62 @@ echo $css_adicional; -
-
- -
    - -
    • -
    • - +
    +
+ -
+ +
- -
-
-
- - - -
-
-

">

-

-
+
+ +

">

+

+
-
-
-
@@ -1712,6 +1737,7 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) { - + + diff --git a/librerias/landingjs/scripts_landing.js b/librerias/landingjs/scripts_landing.js new file mode 100644 index 0000000..b3dda70 --- /dev/null +++ b/librerias/landingjs/scripts_landing.js @@ -0,0 +1,11 @@ +$(window).scroll(function() { + if ($(document).scrollTop() > 5) { + $('nav').addClass('shrink'); + } else { + $('nav').removeClass('shrink'); + } +}); + +$(window).scroll(function(){ + $(".top").css("opacity", 1 - $(window).scrollTop() / 100); + }); From d1f6a4814ccaffcea8405b7667240f5b4036cc48 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Wed, 10 Oct 2018 22:09:27 -0500 Subject: [PATCH 4/8] =?UTF-8?q?cambios=20en=20el=20nav,=20implementaci?= =?UTF-8?q?=C3=B3n=20landingpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 125 +++++++++----------------- milfs | 2 +- temas/landingpage/css/landingpage.css | 2 + 3 files changed, 45 insertions(+), 84 deletions(-) diff --git a/index.php b/index.php index 310bd46..2f677d7 100644 --- a/index.php +++ b/index.php @@ -1110,36 +1110,47 @@ $uri = $_SERVER['REQUEST_URI']; if($tema=="") { $barra=" -
- -
"; echo $css; ?> @@ -1193,7 +1204,6 @@ $barra="
- +
@@ -1180,10 +1180,10 @@
- - + +