浏览代码

height cat+txt

Kévin Tessier 5 年之前
父节点
当前提交
6fb89c5eb1

+ 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":255}
+{"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":86}

+ 1 - 1
logs/popularity/monthly.json

@@ -1 +1 @@
-{"08-2018":1464}
+{"08-2018":1568}

+ 1 - 1
logs/popularity/totals.json

@@ -1 +1 @@
-{"\/":780,"\/projets":99,"\/news":146,"\/a-propros":56,"\/projets-n-1":1,"\/projets\/projets-n-1":336,"\/projets\/projet-n-2":32,"\/projets\/projets-n-2":4,"\/projets\/projets-n":10}
+{"\/":790,"\/projets":99,"\/news":146,"\/a-propros":56,"\/projets-n-1":1,"\/projets\/projets-n-1":428,"\/projets\/projet-n-2":33,"\/projets\/projets-n-2":4,"\/projets\/projets-n":11}

+ 1 - 1
logs/popularity/visitors.json

@@ -1 +1 @@
-{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535121596}
+{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535364559}

文件差异内容过多而无法显示
+ 6 - 4
user/themes/hehe/css-compiled/template.css


文件差异内容过多而无法显示
+ 0 - 0
user/themes/hehe/css-compiled/template.min.css


+ 22 - 2
user/themes/hehe/js/site.js

@@ -1,4 +1,4 @@
-function hover() {
+function hovercat() {
   var $work = $('.navbar > ul > li:nth-child(1)');
   var $workafter = $('.navbar > ul > li:nth-child(1)::after');
   var $cat = $('.navbar > ul.tags');
@@ -32,7 +32,27 @@ function active() {
   });
 }
 
+function catprojets() {
+
+  $(window).load(function () {
+    var $content = $('.content');
+    var $txt = $('#items .content .txt');
+    var $cat = $('#items .content .taxonomy');
+
+    var $Hcontent = $content.outerHeight();
+    var $Hcat = $cat.outerHeight();
+    var $Htxt = $Hcontent - $Hcat;
+
+    $txt.css({
+      "height" : $Htxt + "px"
+    });
+
+  });
+
+}
+
 jQuery(document).ready(function($) {
   active();
-  hover();
+  hovercat();
+  catprojets();
 });

+ 10 - 1
user/themes/hehe/scss/template/_header.scss

@@ -20,7 +20,6 @@ header{
           position: relative;
           z-index: 0;
           &::after{
-            width: 0%;
             content: " ";
             position: absolute;
             background: rgb(0, 255, 0);
@@ -28,11 +27,18 @@ header{
             margin: auto;
             z-index: -1;
             transition: width 0.5s;
+            width: 0%;
           }
         }
         &:hover{
           li{
             &::after{
+              content: " ";
+              position: absolute;
+              background: rgb(0, 255, 0);
+              height: 10px;
+              margin: auto;
+              z-index: -1;
               width: 100%;
               transition: width 0.5s;
             }
@@ -77,6 +83,9 @@ header{
       margin-right: 50px;
       align-items: center;
       display: flex;
+      &:last-child{
+        margin-right: 0px!important;
+      }
     }
   }
   ul.tags{

+ 2 - 0
user/themes/hehe/scss/template/_section.scss

@@ -42,12 +42,14 @@
   .content-item{
     .e-content{
       display: flex;
+      height: 100%;
     }
     .media{
       width: calc((100% / 3) * 2);
     }
     .content{
       width: calc(100% / 3);
+      height: calc(100vh - 40px);
       .txt{
         position: fixed;
         right: 0;

部分文件因为文件数量过多而无法显示