height cat+txt

This commit is contained in:
2018-08-27 12:10:05 +02:00
parent e5b6624bb5
commit 6fb89c5eb1
9 changed files with 46 additions and 13 deletions
+1 -1
View File
@@ -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
View File
@@ -1 +1 @@
{"08-2018":1464} {"08-2018":1568}
+1 -1
View File
@@ -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
View File
@@ -1 +1 @@
{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535121596} {"4b84b15bff6ee5796152495a230e45e3d7e947d9":1535364559}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+22 -2
View File
@@ -1,4 +1,4 @@
function hover() { function hovercat() {
var $work = $('.navbar > ul > li:nth-child(1)'); var $work = $('.navbar > ul > li:nth-child(1)');
var $workafter = $('.navbar > ul > li:nth-child(1)::after'); var $workafter = $('.navbar > ul > li:nth-child(1)::after');
var $cat = $('.navbar > ul.tags'); 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($) { jQuery(document).ready(function($) {
active(); active();
hover(); hovercat();
catprojets();
}); });
+10 -1
View File
@@ -20,7 +20,6 @@ header{
position: relative; position: relative;
z-index: 0; z-index: 0;
&::after{ &::after{
width: 0%;
content: " "; content: " ";
position: absolute; position: absolute;
background: rgb(0, 255, 0); background: rgb(0, 255, 0);
@@ -28,11 +27,18 @@ header{
margin: auto; margin: auto;
z-index: -1; z-index: -1;
transition: width 0.5s; transition: width 0.5s;
width: 0%;
} }
} }
&:hover{ &:hover{
li{ li{
&::after{ &::after{
content: " ";
position: absolute;
background: rgb(0, 255, 0);
height: 10px;
margin: auto;
z-index: -1;
width: 100%; width: 100%;
transition: width 0.5s; transition: width 0.5s;
} }
@@ -77,6 +83,9 @@ header{
margin-right: 50px; margin-right: 50px;
align-items: center; align-items: center;
display: flex; display: flex;
&:last-child{
margin-right: 0px!important;
}
} }
} }
ul.tags{ ul.tags{
@@ -42,12 +42,14 @@
.content-item{ .content-item{
.e-content{ .e-content{
display: flex; display: flex;
height: 100%;
} }
.media{ .media{
width: calc((100% / 3) * 2); width: calc((100% / 3) * 2);
} }
.content{ .content{
width: calc(100% / 3); width: calc(100% / 3);
height: calc(100vh - 40px);
.txt{ .txt{
position: fixed; position: fixed;
right: 0; right: 0;