kevin tessier 6 سال پیش
والد
کامیت
7c5caf97d2
24فایلهای تغییر یافته به همراه350 افزوده شده و 247 حذف شده
  1. 1 1
      .htaccess
  2. 5 0
      user/pages/01.projets/projet-n-1/item.md
  3. 2 0
      user/pages/01.projets/projet-n-2/item.md
  4. BIN
      user/pages/01.projets/projet-n-4/JPO2016_AfficheA3.jpg
  5. 5 0
      user/pages/01.projets/projet-n-4/item.md
  6. 39 24
      user/themes/gilles_acezat/css-compiled/theme.css
  7. 0 0
      user/themes/gilles_acezat/css-compiled/theme.min.css
  8. 6 0
      user/themes/gilles_acezat/js/imagesloaded.pkgd.min.js
  9. 10 0
      user/themes/gilles_acezat/js/isotope.pkgd.min.js
  10. 8 0
      user/themes/gilles_acezat/js/masonry.pkgd.min.js
  11. 54 50
      user/themes/gilles_acezat/js/site.js
  12. 2 1
      user/themes/gilles_acezat/scss/theme.scss
  13. 33 2
      user/themes/gilles_acezat/scss/theme/_blog.scss
  14. 77 76
      user/themes/gilles_acezat/scss/theme/_header.scss
  15. 32 6
      user/themes/gilles_acezat/scss/theme/_typography.scss
  16. 2 1
      user/themes/gilles_acezat/scss/theme/_variables.scss
  17. 29 0
      user/themes/gilles_acezat/scss/theme/all.scss
  18. 0 0
      user/themes/gilles_acezat/scss/theme/item.scss
  19. 1 14
      user/themes/gilles_acezat/templates/blog.html.twig
  20. 0 22
      user/themes/gilles_acezat/templates/modular.html.twig
  21. 6 13
      user/themes/gilles_acezat/templates/partials/base.html.twig
  22. 7 9
      user/themes/gilles_acezat/templates/partials/blog-item.html.twig
  23. 30 27
      user/themes/gilles_acezat/templates/partials/blog-list-item.html.twig
  24. 1 1
      user/themes/gilles_acezat/templates/partials/blog/category.html.twig

+ 1 - 1
.htaccess

@@ -9,7 +9,7 @@ RewriteEngine On
 # along the lines of: RewriteBase /<your_sub_folder>
 ##
 
-# RewriteBase /
+ #RewriteBase /
 
 ## End - RewriteBase
 

+ 5 - 0
user/pages/01.projets/projet-n-1/item.md

@@ -2,6 +2,11 @@
 title: 'Projet N°1'
 media_order: 'ouvrage Edith.jpg,affiche_grainesdelecteurs_2014.jpg'
 mea: true
+taxonomy:
+    category:
+        - Éditions
+    tag:
+        - mea
 categories: test
 ---
 

+ 2 - 0
user/pages/01.projets/projet-n-2/item.md

@@ -5,6 +5,8 @@ mea: true
 taxonomy:
     category:
         - Éditions
+    tag:
+        - mea
 ---
 
 Faux-texte: a pour fonction de faire office de texte de substitution ou d'outil permettant la comparaison et l'appréciation de différentes polices.

BIN
user/pages/01.projets/projet-n-4/JPO2016_AfficheA3.jpg


+ 5 - 0
user/pages/01.projets/projet-n-4/item.md

@@ -1,5 +1,10 @@
 ---
 title: 'projet n°4'
+taxonomy:
+    category:
+        - Éditions
+    tag:
+        - mea
 ---
 
 Faux-texte: a pour fonction de faire office de texte de substitution ou d'outil permettant la comparaison et l'appréciation de différentes polices.

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 39 - 24
user/themes/gilles_acezat/css-compiled/theme.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
user/themes/gilles_acezat/css-compiled/theme.min.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 0
user/themes/gilles_acezat/js/imagesloaded.pkgd.min.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 10 - 0
user/themes/gilles_acezat/js/isotope.pkgd.min.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 8 - 0
user/themes/gilles_acezat/js/masonry.pkgd.min.js


+ 54 - 50
user/themes/gilles_acezat/js/site.js

@@ -1,59 +1,63 @@
-var isTouch = window.DocumentTouch && document instanceof DocumentTouch;
-
-function scrollHeader() {
-    // Has scrolled class on header
-    var zvalue = $(document).scrollTop();
-    if ( zvalue > 75 )
-        $("#header").addClass("scrolled");
-    else
-        $("#header").removeClass("scrolled");
+var $cards = $('#items .full-works');
+var $card = $('#items .card');
+var $cat = $('.cat-list .cat a');
+
+function masonry() {
+  var $grid = $cards.masonry({
+    itemSelector: '.card',
+    columnWidth: '.card',
+    percentPosition: true,
+    transitionDuration: '0.2s'
+  });
+
+  $grid.imagesLoaded().progress( function() {
+    $grid.masonry();
+  });
 }
 
-function parallaxBackground() {
-    $('.parallax').css('background-positionY', ($(window).scrollTop() * 0.3) + 'px');
-}
-
-jQuery(document).ready(function($){
-
-    scrollHeader();
+function isotype() {
+  var $grid = $cards.isotope({
+    itemSelector: '.card',
+    layoutMode: 'fitRows'
+  });
 
-    // Scroll Events
-    if (!isTouch){
-        $(document).scroll(function() {
-            scrollHeader();
-            parallaxBackground();
-        });
-    };
-
-    // Touch scroll
-    $(document).on({
-        'touchmove': function(e) {
-            scrollHeader(); // Replace this with your code.
-        }
-    });
+  $cat.on( 'click', function(e) {
+    e.preventDefault();
+    var filterValue = $( this ).attr('data-filter');
+    filterValue = filterFns[ filterValue ] || filterValue;
+    $grid.isotope({ filter: filterValue });
+  });
 
-    //Smooth scroll to start
-    $('#to-start').click(function(){
-        var start_y = $('#start').position().top;
-        var header_offset = 45;
-        window.scroll({ top: start_y - header_offset, left: 0, behavior: 'smooth' });
-        return false;
-    });
+}
 
-    //Smooth scroll to top
-    $('#to-top').click(function(){
-        window.scroll({ top: 0, left: 0, behavior: 'smooth' });
-        return false;
-    });
+function card(){
+  var $item = $('.card')
+  console.log($item);
+}
 
-    // Responsive Menu
-    $('#toggle').click(function () {
-        $(this).toggleClass('active');
-        $('#overlay').toggleClass('open');
-        $('body').toggleClass('mobile-nav-open');
+function ajax() {
+    var form = $('#ajax-test-form');
+    form.submit(function(e) {
+        // prevent form submission
+        e.preventDefault();
+
+        // submit the form via Ajax
+        $.ajax({
+            url: form.attr('action'),
+            type: form.attr('method'),
+            dataType: 'html',
+            data: form.serialize(),
+            success: function(result) {
+                // Inject the result in the HTML
+                $('#form-result').html(result);
+            }
+        });
     });
 
-    // Tree Menu
-    $(".tree").treemenu({delay:300});
-
+}
+jQuery(document).ready(function($){
+  masonry();
+  // card();
+  // ajax();
+  // isotype();
 });

+ 2 - 1
user/themes/gilles_acezat/scss/theme.scss

@@ -9,6 +9,7 @@
 
 @import 'theme/all';
 @import 'theme/header';
-@import 'theme/home'; 
+@import 'theme/home';
 @import 'theme/blog';
+@import 'theme/item';
 @import 'theme/footer';

+ 33 - 2
user/themes/gilles_acezat/scss/theme/_blog.scss

@@ -1,7 +1,6 @@
 .card{
   width: calc(100% / 3);
-  height: 100%;
-  padding: 0 5px;
+  padding: 0 10px;
   .card-header{
     display: inline-flex;
     & > div{
@@ -15,3 +14,35 @@
     }
   }
 }
+
+#items{
+  .full-works{
+    width: 100%;
+  }
+  .card{
+    margin-bottom: 20px;
+    min-width: 200px;
+  }
+}
+
+#body-wrapper.blog-listing{
+  border-top: 1px solid black;
+  padding-top: 20px;
+  #items{
+    .content-title{
+      display: inline-flex;
+      align-items: baseline;
+    }
+    .e-content{
+      width: calc(33% * 2);
+      column-count: 2;
+      margin: 20px  0;
+      & > p{
+      }
+    }
+    .top{
+      text-align: center;
+      margin-bottom: 20px;
+    }
+  }
+}

+ 77 - 76
user/themes/gilles_acezat/scss/theme/_header.scss

@@ -1,84 +1,85 @@
-header{
-  h1{
-    font-size: 11.2vw;
-    line-height: 7vw!important;
-  }
-  h2{
-    font-size: 3.7vw;
-  }
-  width: 100%;
-  height: 100vh;
-  position: relative;
-  display: inline-flex;
-  flex-direction: column;
-  nav{
-    position: relative;
-    height: 100%;
-    .logo{
-      position: absolute;
-      top: 50%;
-      transform: translateY(-50%);
-    }
-  }
-  .contact{
-    position: fixed;
-    top: 50px;
-    right: 50px;
-    transform: scale(1);
-    transition: transform 0.5s ease;
-    cursor: pointer;
-    &:hover{
-      transition: transform 0.5s ease;
-      transform: scale(0.9);
-    }
-    svg{
-      animation: rotation 6s infinite linear;
-      width: 90.4px;
-      height: 87.45px;
-    }
-    h3{
-      transform: rotate(35deg);
-    }
-    p{
-      display: none;
-    }
-  }
-  & > section{
-    height: 100%;
-    &.works-mea{
-      height: auto!important;
+// home
+body{
+  &> .blog{
+    header{
+      width: 100%;
+      height: 100vh;
       display: inline-flex;
-      flex-wrap: wrap;
-      margin-bottom: 10px;
-      .card{
-        line-height: 0.8!important;
-        .card-header{
-          margin-top: 10px;
+      flex-direction: column;
+      & > section{
+        position: relative;
+        height: 50vh;
+        min-height: 250px;
+        &.works-mea{
+          display: inline-flex;
+          flex-wrap: wrap;
+          // margin-bottom: 70px;
+          align-items: flex-end;
+          height: 100%;
+          .card{
+            line-height: 0.8!important;
+            .card-header{
+              margin-top: 10px;
+            }
+          }
+        }
+      }
+      h1{
+        font-size: 11.2vw;
+        line-height: 7vw!important;
+      }
+      h2{
+        font-size: 3.7vw;
+      }
+      nav{
+        margin-top: 25vh; /* poussé de la moitié de hauteur de viewport */
+        transform: translateY(-50%); /* tiré de la moitié de sa propre hauteur */
+      }
+      .scroll{
+        width: 50px;
+        height: 15px;
+        margin: 0 auto 10px auto;
+        overflow: hidden;
+        position: relative;
+        & > p:nth-child(1){
+          text-align: center;
+          position: absolute;
+          top: -20px;
+          animation: translatep1 2s infinite linear;
+        }
+        & > p:nth-child(2){
+          text-align: center;
+          position: absolute;
+          top: -20px;
+          animation: translatep1 2s infinite linear;
+          animation-delay: 1s;
         }
       }
     }
   }
-  h2{
-    margin-left: 10px;
-  }
-  .scroll{
-    width: 50px;
-    height: 40px;
-    margin: 0 auto 10px auto;
-    overflow: hidden;
-    position: relative;
-    & > p:nth-child(1){
-      text-align: center;
-      position: absolute;
-      top: -20px;
-      animation: translatep1 2s infinite linear;
-    }
-    & > p:nth-child(2){
-      text-align: center;
-      position: absolute;
-      top: -20px;
-      animation: translatep1 2s infinite linear;
-      animation-delay: 1s;
+}
+
+
+// page
+body{
+  & > .item{
+    header{
+      height: 100px;
+      position: relative;
+      nav{
+        position: absolute;
+        margin-top: 50px; /* poussé de la moitié de hauteur de viewport */
+        transform: translateY(-50%); /* tiré de la moitié de sa propre hauteur */
+      }
+      h1{
+        color: black;
+      }
+      h2{
+        display: none;
+      }
+      .scroll{
+        display: none;
+      }
     }
   }
 }

+ 32 - 6
user/themes/gilles_acezat/scss/theme/_typography.scss

@@ -3,11 +3,23 @@ h1, h2{
   font-weight: normal;
 }
 
-h1{
-  font-size: $fh1;
-  -webkit-text-stroke:.1rem #111;
-  color: transparent;
-  line-height: 7rem;
+body{
+  &>.blog{
+    h1{
+      font-size: $fh1;
+      -webkit-text-stroke:.1rem #111;
+      color: transparent;
+      line-height: 7rem;
+    }
+  }
+}
+
+body{
+  &>.item{
+    h1{
+      font-size: $fh2;
+    }
+  }
 }
 
 h2{
@@ -21,7 +33,7 @@ h3{
 }
 
 h5{
-  font-size: 1rem;
+  font-size: $fh5;
   font-family: $bold;
   font-weight: normal;
 }
@@ -55,6 +67,10 @@ header{
   .card-category{
       font-family: $italic;
       font-weight: normal;
+      font-size: $fs;
+  }
+  .card-date{
+    font-size: $fs;
   }
   .card-footer{
     span{
@@ -72,6 +88,7 @@ header{
 
 .scroll{
   p{
+    font-size: $fs;
     font-family: $bold;
     font-weight: normal;
   }
@@ -104,3 +121,12 @@ header{
     }
   }
 }
+
+
+body{
+  & > .item{
+    h2{
+      font-size: $fh2-i;
+    }
+  }
+}

+ 2 - 1
user/themes/gilles_acezat/scss/theme/_variables.scss

@@ -11,8 +11,9 @@ $fh1: 11rem;
 $fh2:3rem;
 $fh2-i: 1.3rem;
 $fh3: 1rem;
+$fh5:0.8rem;
 $fp: 1rem;
-$fs:0.9rem;
+$fs:0.8rem;
 // interline
 
 //interlettre

+ 29 - 0
user/themes/gilles_acezat/scss/theme/all.scss

@@ -1,3 +1,32 @@
 body{
   padding: 0 2%;
 }
+
+header{
+  .contact{
+    position: fixed;
+    top: 50px;
+    right: 50px;
+    transform: scale(1);
+    transition: transform 0.5s ease;
+    cursor: pointer;
+    &:hover{
+      transition: transform 0.5s ease;
+      transform: scale(0.9);
+    }
+    svg{
+      animation: rotation 6s infinite linear;
+      width: 90.4px;
+      height: 87.45px;
+    }
+    h3{
+      transform: rotate(35deg);
+    }
+    p{
+      display: none;
+    }
+  }
+  h2{
+    margin-left: 10px;
+  }
+}

+ 0 - 0
user/themes/gilles_acezat/scss/theme/item.scss


+ 1 - 14
user/themes/gilles_acezat/templates/blog.html.twig

@@ -6,16 +6,6 @@
 {% set show_sidebar = header_var('show_sidebar', [page, blog])|defined(true)  %}
 {% set show_pagination = header_var('show_pagination', [page, blog])|defined(true) %}
 
-{% block stylesheets %}
-    {% do assets.addCss('theme://css/bricklayer.css') %}
-    {{ parent() }}
-{% endblock %}
-
-{% block javascripts %}
-    {{ parent() }}
-    {% do assets.add('theme://js/bricklayer.min.js') %}
-    {% do assets.add('theme://js/scopedQuerySelectorShim.min.js') %}
-{% endblock %}
 
 {% block body %}
     <section id="body-wrapper">
@@ -58,8 +48,5 @@
         {% endembed %}
         </section>
     </section>
-    <script>
-        //Bricklayer
-        var bricklayer = new Bricklayer(document.querySelector('.bricklayer'))
-    </script>
+
 {% endblock %}

+ 0 - 22
user/themes/gilles_acezat/templates/modular.html.twig

@@ -6,28 +6,6 @@
 
 {% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
 
-{% block javascripts %}
-    {% if show_onpage_menu %}
-        {% do assets.add('theme://js/singlepagenav.min.js') %}
-    {% endif %}
-    {{ parent() }}
-{% endblock %}
-
-{% block bottom %}
-    {{ parent() }}
-    {% if show_onpage_menu %}
-        <script>
-        // singlePageNav initialization & configuration
-        $('ul.navigation').singlePageNav({
-            offset: $('#header').outerHeight(),
-            filter: ':not(.external)',
-            updateHash: true,
-            currentClass: 'active'
-        });
-        </script>
-    {% endif %}
-{% endblock %}
-
 {% block header_navigation %}
     {% if show_onpage_menu %}
         <ul class="navigation">

+ 6 - 13
user/themes/gilles_acezat/templates/partials/base.html.twig

@@ -22,7 +22,9 @@
 
     {% block javascripts %}
         {% do assets.addJs('jquery', 101) %}
-        {% do assets.addJs('theme://js/jquery.treemenu.js', {group:'bottom'}) %}
+        {% do assets.addJs('theme://js/imagesloaded.pkgd.min.js', {group:'bottom'}) %}
+        {% do assets.addJs('theme://js/isotope.pkgd.min.js', {group:'bottom'}) %}
+        {% do assets.addJs('theme://js/masonry.pkgd.min.js', {group:'bottom'}) %}
         {% do assets.addJs('theme://js/site.js', {group:'bottom'}) %}
     {% endblock %}
     {{ assets.js()|raw }}
@@ -30,23 +32,14 @@
 {% endblock head %}
 </head>
 <body id="top">
-    <div id="page-wrapper">
+    <div id="page-wrapper" class="{{page.template}}">
 
     {% block header %}
         <header>
             <section class="container {{ grid_size }}">
                 <nav class="navbar">
-                    <section class="navbar-section logo">
-                      <a href="/"><h1>{{site.title|capitalize}}</h1></a>
-                      <h2>{{site.header.status|upper}}</h2>
-                    </section>
-                    <section class="navbar-section desktop-menu">
-
-                        {% if config.plugins.login.enabled and grav.user.username %}
-                            <span class="login-status-wrapper"><i class="fa fa-user"></i> {% include 'partials/login-status.html.twig' %}</span>
-                        {% endif %}
-
-                    </section>
+                  <a href="/"><h1>{{site.title|capitalize}}</h1>
+                  <h2>{{site.header.status|upper}}</h2></a>
                 </nav>
                 <div class="contact">
                   <svg>

+ 7 - 9
user/themes/gilles_acezat/templates/partials/blog-item.html.twig

@@ -1,7 +1,3 @@
-
-
-<div class="content-item h-entry">
-
   {% if not hero_image_name %}
       <div class="content-title text-center">
           {% include 'partials/blog/title.html.twig' with {title_level: 'h2'} %}
@@ -62,16 +58,18 @@
 
   <div class="e-content">
       {{ page.content|raw }}
-      {% set image = page.media.images|first %}
-      {% if image %}
-          {{ image.cropZoom(800,400).html }}
-      {% endif %}
   </div>
 
+  <div class="img">  
+  {% set image = page.media.images|first %}
+  {% if image %}
+  {{ image.cropZoom(800,400).html }}
+  {% endif %}
+</div>
+
   <div class="top">
     <a href="#page-wrapper">
       <img src="" alt="">
       <p>top</p>
     </a>
   </div>
-</div>

+ 30 - 27
user/themes/gilles_acezat/templates/partials/blog-list-item.html.twig

@@ -1,33 +1,36 @@
-<div class="card">
-    {% set image = page.media.images|first %}
-    {% if image %}
-    <div class="card-image">
-        <a href="{{ page.url }}">{{ image.html }}</a>
-    </div>
-    {% endif %}
-
-    <div class="card-header">
-        <div class="card-title">
-        {% include 'partials/blog/title.html.twig' with {title_level: 'h5'} %}
-        </div>
+{% for category in page.taxonomy.category %}
+  <div class="card {{ category }}" data-category= "{{ category }}">
 
+      {% set image = page.media.images|first %}
+      {% if image %}
+      <div class="card-image">
+          <a href="{{ page.url }}">{{ image.html }}</a>
+      </div>
+      {% endif %}
 
-        {% if page.taxonomy.category %}
-          <div class="card-category">
-            {% include 'partials/blog/category.html.twig' %}
+      <div class="card-header">
+          <div class="card-title">
+          {% include 'partials/blog/title.html.twig' with {title_level: 'h5'} %}
           </div>
-      {% endif %}
 
-      {% if page.date %}
-      <div class="card-date">
-        {% include 'partials/blog/date.html.twig' %}
-      </div>
-      {% endif %}
-    </div>
 
-    {% if page.taxonomy.tag %}
-      <div class="card-footer">
-        {% include 'partials/blog/taxonomy.html.twig' %}
+          {% if page.taxonomy.category %}
+            <div class="card-category">
+              {% include 'partials/blog/category.html.twig' %}
+            </div>
+        {% endif %}
+
+        {% if page.date %}
+        <div class="card-date">
+          {% include 'partials/blog/date.html.twig' %}
+        </div>
+        {% endif %}
       </div>
-  {% endif %}
-</div>
+
+      {% if page.taxonomy.tag %}
+        <div class="card-footer">
+          {% include 'partials/blog/taxonomy.html.twig' %}
+        </div>
+    {% endif %}
+  </div>
+{% endfor %}

+ 1 - 1
user/themes/gilles_acezat/templates/partials/blog/category.html.twig

@@ -1,5 +1,5 @@
 {% if page.taxonomy.category %}
     {% for category in page.taxonomy.category %}
-    <a href="{{ blog.url|rtrim('/') }}/category{{ config.system.param_sep }}{{ category }}">{{ category }}</a>
+    <a href="{{ blog.url|rtrim('/') }}/category{{ config.system.param_sep }}{{ category }}" data-filter="{{ category }}" >{{ category }}</a>
     {% endfor %}
 {% endif %}

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است