Преглед изворни кода

project widget: Fix long title appearing on new line (Fix #324)

* Only affects simple list mode, not card mode
George Cushen пре 7 година
родитељ
комит
b1c975fa4c
3 измењених фајлова са 28 додато и 28 уклоњено
  1. 0 1
      layouts/partials/css/academic.css
  2. 2 2
      layouts/partials/widgets/projects.html
  3. 26 25
      static/js/hugo-academic.js

+ 0 - 1
layouts/partials/css/academic.css

@@ -667,7 +667,6 @@ article {
 }
 
 #projects.home-section .project-title {
-  display: inline-block;
   margin-bottom: 6px;
 }
 

+ 2 - 2
layouts/partials/widgets/projects.html

@@ -31,7 +31,7 @@
 
     {{ if eq $page.Params.view 0 }}
 
-    <div class="row isotope projects-container">
+    <div class="row isotope projects-container js-layout-row">
         {{ range where $.Site.RegularPages "Type" "project" }}
         <div class="col-md-12 project-item isotope-item {{ delimit .Params.tags " " }}" itemscope itemtype="http://schema.org/CreativeWork">
           <i class="fa fa-files-o pub-icon" aria-hidden="true"></i>
@@ -52,7 +52,7 @@
 
     {{ else }}
 
-    <div class="row isotope projects-container">
+    <div class="row isotope projects-container js-layout-masonry">
 
       {{ range $project := where $.Site.RegularPages "Type" "project" }}
       {{ $.Scratch.Set "project_url" $project.Permalink }}

+ 26 - 25
static/js/hugo-academic.js

@@ -97,31 +97,6 @@
     }
   });
 
-  /* ---------------------------------------------------------------------------
-   * Filter projects.
-   * --------------------------------------------------------------------------- */
-
-  $('.projects-container').each(function(index, container) {
-    let $container = $(container);
-    let $section = $container.closest('section');
-
-    $container.imagesLoaded(function() {
-      // Initialize Isotope after all images have loaded.
-      $container.isotope({
-        itemSelector: '.isotope-item',
-        layoutMode: 'masonry',
-        filter: $section.find('.default-project-filter').text()
-      });
-      // Filter items when filter link is clicked.
-      $section.find('.project-filters a').click(function() {
-        let selector = $(this).attr('data-filter');
-        $container.isotope({filter: selector});
-        $(this).removeClass('active').addClass('active').siblings().removeClass('active all');
-        return false;
-      });
-    });
-  });
-
   /* ---------------------------------------------------------------------------
    * Filter publications.
    * --------------------------------------------------------------------------- */
@@ -262,6 +237,32 @@
       resizeTimer = setTimeout(fixScrollspy, 200);
     });
 
+    // Filter projects.
+    $('.projects-container').each(function(index, container) {
+      let $container = $(container);
+      let $section = $container.closest('section');
+      let layout = 'masonry';
+      if ($section.find('.isotope').hasClass('js-layout-row')) {
+        layout = 'fitRows';
+      }
+
+      $container.imagesLoaded(function() {
+        // Initialize Isotope after all images have loaded.
+        $container.isotope({
+          itemSelector: '.isotope-item',
+          layoutMode: layout,
+          filter: $section.find('.default-project-filter').text()
+        });
+        // Filter items when filter link is clicked.
+        $section.find('.project-filters a').click(function() {
+          let selector = $(this).attr('data-filter');
+          $container.isotope({filter: selector});
+          $(this).removeClass('active').addClass('active').siblings().removeClass('active all');
+          return false;
+        });
+      });
+    });
+
     // Enable publication filter for publication index page.
     if ($('.pub-filters-select')) {
       filter_publications();