Commit bed80d12 authored by Raph El's avatar Raph El
Browse files

Merge branch 'custom-alex' of https://gitlab.adullact.net/pixelhumain/co2 into custom-alex

parents fefa6855 3dd5f55a
......@@ -24,6 +24,7 @@ Yii::app()->theme->baseUrl. '/assets');
$bgColor1 = "#01809b";
$bgColorHover1 = "#01607b";
$projectColorDefault = "rgba(239,42,0, 1)";
$projectColor = [
'rgba(39,42,220, 1)',
'rgba(139,142,220, 1)',
......@@ -309,7 +310,7 @@ $projectColor = [
.projectChildren a span:hover{
color: transparent;
background-color: rgba(0,0,0,0);
border-color: rgba(239,42,0, 1)
border-color: rgba(239,42,0, 1);
}
.projectChildren h3{
margin-bottom: 45px;
......@@ -461,6 +462,7 @@ $projectList = [];
data-countmembers='".getCountMembers($elt)."'
data-countevents='".getCountEvents($elt)."'
data-countprojects='".getCountProjects($elt)."'
data-color='".$projectColorDefault."';
>".$elt["name"]."</a>
</li>";
......@@ -626,7 +628,7 @@ $projectList = [];
// $description .= '</span>';
?>
<div id="descriptionMarkdown" class="hidden"><?php echo (empty($description) ? "" : $description ); ?></div>
<div class="projectDescription customBlock">
<div class="projectDescription customBlock projectColorBorder">
<h3>Présentation</h3>
<div id="descriptionAbout"></div>
<button class="customBtn">Lire la suite <i class="fa fa-angle-down"></i></button>
......@@ -786,12 +788,15 @@ function selectProject(){
$(".projectNav").on('click','.linkMenu',function(){
var key = $(this).data("key");
var col = $(this).data("col");
var color = $(this).data("color");
var countMembers = $(this).data('countmembers');
var countEvents = $(this).data('countevents');
var countProjects = $(this).data('countprojects');
$(".linkMenu").removeClass('active');
$(this).addClass('active');
$('.projectColorBorder, .projectColorBorderHover').css('border-color', color + ' !important');
$.ajax({
type: "POST",
......@@ -872,7 +877,7 @@ function feedProject(el, countMembers, countEvents, countProjects){
var projectCollection = $link.attr('data-col');
var projectImage = $link.attr('data-img');
$("<div class='col col-xs-12 col-md-3'><a href='javascript:;' class='linkMenu' data-col='" + projectCollection + "' data-key='" + key + "' style='background-image: url(" + projectImage + ");'><span>" + projectName+ "</span></a></div>").appendTo('.projectChildren .row');
$("<div class='col col-xs-12 col-md-3'><a href='javascript:;' class='linkMenu' data-col='" + projectCollection + "' data-key='" + key + "' style='background-image: url(" + projectImage + ");'><span class='projectColorBorderHover'>" + projectName+ "</span></a></div>").appendTo('.projectChildren .row');
}
});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment