Commit 489b8620 authored by alex's avatar alex

MODIF DESIGN RAFFINERIE

parent bed80d12
......@@ -26,8 +26,8 @@ $bgColorHover1 = "#01607b";
$projectColorDefault = "rgba(239,42,0, 1)";
$projectColor = [
'rgba(39,42,220, 1)',
'rgba(139,142,220, 1)',
'rgba(1,121,96, 1)',
'rgba(231,184,36, 1)',
]
?>
......@@ -89,12 +89,16 @@ $projectColor = [
}
h1, h2, h3, h4{
font-family: "sweet_sorrowscript" !important;
font-family: "cardenio_modernbold" !important;
}
h3{
margin-top: 0;
margin-bottom: 25px;
font-size: 21px;
}
#horizontal{
display: none;
}
#bg-homepage{
width: 100%;
}
......@@ -269,12 +273,15 @@ $projectColor = [
text-align: center;
margin: 30px auto 0 auto;
}
.projectDescription p{
.projectDescription #descriptionAbout{
font-size: 20px;
max-height: 139px;
overflow: hidden;
font-family: "cardenio_modernregular" !important;
}
.projectDescription #descriptionAbout p:first-child{
font-size: 28px;
}
.projectChildren{
border-left: 4px solid rgba(239,42,0, 1);
......@@ -304,7 +311,7 @@ $projectColor = [
text-align: center;
border-radius: 50%;
background-color: rgba(0,0,0, 0.5);
padding-top: 60%;
padding-top: 32%;
border: 4px solid transparent;
}
.projectChildren a span:hover{
......@@ -334,12 +341,16 @@ $projectColor = [
background-color: transparent !important;
border: none !important;
margin: 0 !important;
font-size: 18px;
}
.projectInfosHeader .nav-tab:not(.active) a:hover{
background-color: #ddd !important;
background-color: <?php echo $bgColor1 ?> !important;
color: #fff !important;
border-radius: 0;
}
.projectInfosHeader .nav-tab.active a{
background-color: #ccc !important;
background-color: <?php echo $bgColorHover1 ?> !important;
color: #fff !important;
border-radius: 0;
}
.projectInfosHeader .nav-tab.active:first-of-type a{
......@@ -629,12 +640,11 @@ $projectList = [];
?>
<div id="descriptionMarkdown" class="hidden"><?php echo (empty($description) ? "" : $description ); ?></div>
<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>
</div>
<div class="projectChildren customBlock">
<div class="projectChildren projectColorBorder customBlock">
<h3>Les Projets de : <b class="projectNameParent"></b></h3>
<div class="row"></div>
</div>
......@@ -675,8 +685,8 @@ $projectList = [];
</style>
<div class="projectInfosContent tab-content">
<div id="journal" class="tab-pane active">Journal</div>
<div id="agenda" class="tab-pane">
<div id="journal" class="tab-pane active row">Journal</div>
<div id="agenda" class="tab-pane row">
<!-- <div class='col-xs-12 margin-bottom-10'>
<a href='javascript:;' id='showHideCalendar' class='text-azure' data-hidden='0'><i class='fa fa-caret-up'></i> Hide calendar</a>
</div> -->
......@@ -762,11 +772,11 @@ function initDescs() {
function toggleDesription(){
$('.projectDescription button').click(function(){
if($(this).hasClass('open')){
$('.projectDescription p').css({'max-height': '139px', 'overflow': 'hidden'});
$('.projectDescription #descriptionAbout').css({'max-height': '139px', 'overflow': 'hidden'});
$(this).removeClass('open').html('Lire la suite <i class="fa fa-angle-down"></i>');
}
else{
$('.projectDescription p').css({'max-height': 'none', 'overflow': 'auto'});
$('.projectDescription #descriptionAbout').css({'max-height': 'none', 'overflow': 'auto'});
$(this).addClass('open').html('Réduire <i class="fa fa-angle-up"></i>');
}
});
......@@ -795,8 +805,10 @@ function selectProject(){
$(".linkMenu").removeClass('active');
$(this).addClass('active');
$('.projectColorBorder, .projectColorBorderHover').css('border-color', color + ' !important');
$('.projectColorBorder, .projectNav .linkMenu.active').css('border-color', color);
$('.project').on('mouseenter','.projectColorBorderHover', function(){
$(this).css('border-color', color);
});
$.ajax({
type: "POST",
......@@ -833,14 +845,14 @@ function feedProject(el, countMembers, countEvents, countProjects){
// description
if(el.map.description){
$("#descriptionAbout").show();
$(".projectDescription").show();
if(el.map.description.length > 0){
descHtml = dataHelper.markdownToHtml(el.map.description) ;
}
$("#descriptionAbout").html(descHtml);
}
else{
$("#descriptionAbout").hide();
$(".projectDescription").hide();
}
// banner image
......
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