Bladeren bron

bugfix js

Kévin Tessier 5 jaren geleden
bovenliggende
commit
e4cac3d01e

+ 1 - 1
logs/popularity/daily.json

@@ -1 +1 @@
-{"01-08-2018":19,"02-08-2018":424,"20-08-2018":112,"21-08-2018":214,"22-08-2018":440,"24-08-2018":273,"27-08-2018":358,"28-08-2018":82,"29-08-2018":104}
+{"01-08-2018":19,"02-08-2018":424,"20-08-2018":112,"21-08-2018":214,"22-08-2018":440,"24-08-2018":273,"27-08-2018":358,"28-08-2018":82,"29-08-2018":155}

+ 1 - 1
logs/popularity/monthly.json

@@ -1 +1 @@
-{"08-2018":2026}
+{"08-2018":2077}

+ 1 - 1
logs/popularity/totals.json

@@ -1 +1 @@
-{"\/":979,"\/projets":99,"\/news":197,"\/a-propros":66,"\/projets-n-1":1,"\/projets\/projets-n-1":602,"\/projets\/projet-n-2":54,"\/projets\/projets-n-2":5,"\/projets\/projets-n":23}
+{"\/":1027,"\/projets":99,"\/news":198,"\/a-propros":66,"\/projets-n-1":1,"\/projets\/projets-n-1":603,"\/projets\/projet-n-2":55,"\/projets\/projets-n-2":5,"\/projets\/projets-n":23}

+ 1 - 1
logs/popularity/visitors.json

@@ -1 +1 @@
-{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535549030}
+{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535552759}

File diff suppressed because it is too large
+ 4 - 4
user/themes/hehe/css-compiled/template.css


File diff suppressed because it is too large
+ 0 - 0
user/themes/hehe/css-compiled/template.min.css


+ 42 - 34
user/themes/hehe/js/site.js

@@ -1,39 +1,30 @@
-function hovercat() {
-  var $work = $('.navbar > ul > li:nth-child(1)');
-  var $workafter = $('.navbar > ul > li:nth-child(1)::after');
-  var $cat = $('.navbar > ul.tags');
-
-  $work.hover(
-    function() {
-      $( this ).addClass( "hover" );
-      $(this).parents().find('.tags').addClass("visible");
-    }, function() {
-      $( this ).removeClass( "hover" );
-      $(this).parents().find('.tags').removeClass("visible");
-    }
-  );
-
-  $cat.hover(
-    function() {
-      $( this ).addClass( "visible" );
-      $(this).parents().find($work).addClass('hover');
-    }, function() {
-      $( this ).removeClass( "visible" );
-      $(this).parents().find($work).removeClass('hover');
-    }
-  );
-}
-
-// function active() {
+// function hovercat() {
 //   var $work = $('.navbar > ul > li:nth-child(1)');
+//   var $workafter = $('.navbar > ul > li:nth-child(1)::after');
+//   var $cat = $('.navbar > ul.tags');
 //
-//   $work.click(function(event) {
-//     $(this).parents().find('.tags').toggleClass("active");
-//   });
+//   $work.hover(
+//     function() {
+//       $( this ).addClass( "hover" );
+//       $(this).parents().find('.tags').addClass("visible");
+//     }, function() {
+//       $( this ).removeClass( "hover" );
+//       $(this).parents().find('.tags').removeClass("visible");
+//     }
+//   );
+//
+//   $cat.hover(
+//     function() {
+//       $( this ).addClass( "visible" );
+//       $(this).parents().find($work).addClass('hover');
+//     }, function() {
+//       $( this ).removeClass( "visible" );
+//       $(this).parents().find($work).removeClass('hover');
+//     }
+//   );
 // }
 
 function catprojets() {
-
   $(window).load(function () {
     var $content = $('.content');
     var $txt = $('#items .content .txt');
@@ -47,12 +38,29 @@ function catprojets() {
       "height" : $Htxt + "px"
     });
   });
+}
+
+function removeAct(){
+  var $cat = $('.navbar > ul.tags');
+  var $work = $('.navbar > ul:first-child > li:first-child a');
+  var $start = $("body #start");
+
+  $work.click(function(event) {
+    event.preventDefault();
+    $(this).parents('.navbar').find('.tags').toggleClass('visible');
+    $(this).parents('.navbar').find(' ul > li:first-child').toggleClass('hover');
+  });
+
+  $start.click(function(event) {
+    $(this).parents('#top').find('.tags').removeClass('visible');
+    $(this).parents('#top').find(' ul > li:first-child').removeClass('hover');
+  });
 
 }
 
+
 jQuery(document).ready(function($) {
-  // active();
-  hovercat();
+  removeAct();
+  // hovercat();
   catprojets();
-
 });

+ 5 - 4
user/themes/hehe/scss/template/_section-media-queries.scss

@@ -21,6 +21,7 @@
       margin: auto 0;
       & > .tags{
         & > a {
+          height: 30px!important;
           li{
             position: relative;
             z-index: 0;
@@ -59,9 +60,9 @@
           display: -ms-flexbox;
           display: flex;
           position: relative;
-          margin-right: 35px;
+          margin-right: 35px!important;
           & > a{
-            pointer-events: none;
+            // pointer-events: none;
           }
           &:after{
             content: " ";
@@ -100,7 +101,7 @@
               justify-content: flex-end;
       li{
         height: 40px;
-        margin-right: 20px;
+        margin-right: 20px!important;
         -webkit-box-align: center;
             -ms-flex-align: center;
                 align-items: center;
@@ -133,7 +134,7 @@
         height: 40px;
         padding: 0 20px;
         &:first-child{
-          margin-top: 10px;
+          margin-top: 0px;
         }
         &:last-child{
           margin-bottom: 10px;

Some files were not shown because too many files changed in this diff