Merge 29c9682 into 3c0adf9

DSpace · Nov 22, 2019 · ffb4825 · ffb4825
2 parents 3c0adf9 + 29c9682
commit ffb4825
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...pp/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/...pp/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"></ds-thumbnail>
+                    <ds-thumbnail [thumbnail]="object.getThumbnail() | async"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
                     <a class="btn btn-secondary"

diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
@@ -15,6 +15,9 @@ module.exports = (env) => {
   let copyWebpackOptions = [{
     from: path.join(__dirname, '..', 'node_modules', '@fortawesome', 'fontawesome-free', 'webfonts'),
     to: path.join('assets', 'fonts')
+  }, {
+    from: path.join(__dirname, '..', 'resources', 'fonts'),
+    to: path.join('assets', 'fonts')
   }, {
     from: path.join(__dirname, '..', 'resources', 'images'),
     to: path.join('assets', 'images')
@@ -24,6 +27,15 @@ module.exports = (env) => {
   }
   ];
 
+  const themeFonts = path.join(themePath, 'resources', 'fonts');
+  if(theme && fs.existsSync(themeFonts)) {
+    copyWebpackOptions.push({
+      from: themeFonts,
+      to: path.join('assets', 'fonts')  ,
+      force: true,
+    });
+  }
+
   const themeImages = path.join(themePath, 'resources', 'images');
   if(theme && fs.existsSync(themeImages)) {
     copyWebpackOptions.push({
@@ -161,7 +173,7 @@ module.exports = (env) => {
                     ]
                 },
                 {
-                    test: /\.html$/,
+                    test: /\.(html|eot|ttf|svg|woff|woff2)$/,
                     loader: 'raw-loader'
                 }
             ]