fix issues following rebase

src/app/+item-page/simple/item-page.component.ts

@@ -25,7 +25,7 @@ import { ItemViewMode } from '../../shared/items/item-type-decorator';
 @Component({
   selector: 'ds-item-page',
   styleUrls: ['./item-page.component.scss'],
-  templateUrl: './themes/item-page.component.mantis.html',
+  templateUrl: './item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut]
 })

src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.ts

@@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType('JournalIssue', ItemViewMode.Full)
 @Component({
   selector: 'ds-journal-issue',
-  styleUrls: ['./themes/journal-issue.component.mantis.scss'],
-  templateUrl: './themes/journal-issue.component.mantis.html'
+  styleUrls: ['./journal-issue.component.scss'],
+  templateUrl: './journal-issue.component.html'
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue

src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.ts

@@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType('JournalVolume', ItemViewMode.Full)
 @Component({
   selector: 'ds-journal-volume',
-  styleUrls: ['./themes/journal-volume.component.mantis.scss'],
-  templateUrl: './themes/journal-volume.component.mantis.html'
+  styleUrls: ['./journal-volume.component.scss'],
+  templateUrl: './journal-volume.component.html'
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume

src/app/+item-page/simple/item-types/journal/journal.component.ts

@@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType('Journal', ItemViewMode.Full)
 @Component({
   selector: 'ds-journal',
-  styleUrls: ['./themes/journal.component.mantis.scss'],
-  templateUrl: './themes/journal.component.mantis.html'
+  styleUrls: ['./journal.component.scss'],
+  templateUrl: './journal.component.html'
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal

src/app/+item-page/simple/item-types/orgunit/orgunit.component.ts

@@ -11,8 +11,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType('OrgUnit', ItemViewMode.Full)
 @Component({
   selector: 'ds-orgunit',
-  styleUrls: ['./themes/orgunit.component.mantis.scss'],
-  templateUrl: './themes/orgunit.component.mantis.html'
+  styleUrls: ['./orgunit.component.scss'],
+  templateUrl: './orgunit.component.html'
 })
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit

src/app/+item-page/simple/item-types/person/person.component.ts

@@ -12,8 +12,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType('Person', ItemViewMode.Full)
 @Component({
   selector: 'ds-person',
-  styleUrls: ['./themes/person.component.mantis.scss'],
-  templateUrl: './themes/person.component.mantis.html'
+  styleUrls: ['./person.component.scss'],
+  templateUrl: './person.component.html'
 })
 /**
  * The component for displaying metadata and relations of an item of the type Person

src/app/+item-page/simple/item-types/project/project.component.ts

@@ -12,8 +12,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType('Project', ItemViewMode.Full)
 @Component({
   selector: 'ds-project',
-  styleUrls: ['./themes/project.component.mantis.scss'],
-  templateUrl: './themes/project.component.mantis.html'
+  styleUrls: ['./project.component.scss'],
+  templateUrl: './project.component.html'
 })
 /**
  * The component for displaying metadata and relations of an item of the type Project

src/app/+item-page/simple/item-types/publication/publication.component.ts

@@ -15,8 +15,8 @@ import { filterRelationsByTypeLabel, relationsToItems } from '../shared/item-rel
 @rendersItemType(DEFAULT_ITEM_TYPE, ItemViewMode.Full)
 @Component({
   selector: 'ds-publication',
-  styleUrls: ['./themes/publication.component.mantis.scss'],
-  templateUrl: './themes/publication.component.mantis.html',
+  styleUrls: ['./publication.component.scss'],
+  templateUrl: './publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PublicationComponent extends ItemComponent implements OnInit {

src/app/+item-page/simple/item-types/publication/themes/publication.component.mantis.scss

@@ -1,30 +0,0 @@
-@import '../../../../../../styles/variables.scss';
-
-:host {
-    > * {
-        display: block;
-        padding-top: $content-spacing;
-        padding-bottom: $content-spacing;
-    }
-
-    .top-item-page {
-        background-color: $gray-100;
-        margin-top: -$content-spacing;
-    }
-
-    .relationships-item-page {
-        padding-bottom: $content-spacing - $spacer;
-    }
-
-    ds-metadata-field-wrapper {
-        @media screen and (max-width: map-get($grid-breakpoints, md)) {
-            flex: 1;
-            padding-right: $spacer/2;
-        }
-
-        ds-thumbnail {
-            display: block;
-            max-width: $thumbnail-max-width;
-        }
-    }
-}

src/app/thumbnail/themes/thumbnail.component.mantis.scss

@@ -1,4 +0,0 @@
-@import '../../../styles/variables.scss';
-img {
-  width: 100%;
-}

src/app/thumbnail/thumbnail.component.ts

@@ -10,7 +10,7 @@ import { hasValue } from '../shared/empty.util';
 
 @Component({
   selector: 'ds-thumbnail',
-  styleUrls: ['./themes/thumbnail.component.mantis.scss'],
+  styleUrls: ['./thumbnail.component.scss'],
   templateUrl: './thumbnail.component.html'
 })
 export class ThumbnailComponent implements OnInit {

themes/mantis/app/+home-page/home-news/home-news.component.html

@@ -1,20 +1,21 @@
-<div class="background-image">
-    <div class="container">
 <div class="jumbotron jumbotron-fluid">
   <div class="d-flex flex-wrap">
     <div>
       <h1 class="display-3">DSpace 7</h1>
-                    <p class="lead">DSpace is the world leading open source repository platform that enables organisations to:</p>
+      <p class="lead">DSpace is the world leading open source repository platform that enables
+        organisations to:</p>
     </div>
   </div>
   <ul>
-                <li>easily ingest documents, audio, video, datasets and their corresponding Dublin Core metadata
+    <li>easily ingest documents, audio, video, datasets and their corresponding Dublin Core
+      metadata
     </li>
-                <li>open up this content to local and global audiences, thanks to the OAI-PMH interface and Google Scholar optimizations
+    <li>open up this content to local and global audiences, thanks to the OAI-PMH interface and
+      Google Scholar optimizations
+    </li>
+    <li>issue permanent urls and trustworthy identifiers, including optional integrations with
+      handle.net and DataCite DOI
     </li>
-                <li>issue permanent urls and trustworthy identifiers, including optional integrations with handle.net and DataCite DOI</li>
   </ul>
-        </div>
-    </div>
-    <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">Anthony</a></small>
+  <p>Join an international community of <A HREF="https://wiki.duraspace.org/display/DSPACE/DSpace+Positioning" TARGET="_NEW">leading institutions using DSpace</A>.</p>
 </div>

themes/mantis/app/+home-page/home-page.component.html

@@ -1,5 +1,10 @@
-<ds-home-news></ds-home-news>
+<div class="background-image">
   <div class="container">
-  <ds-search-form class="d-block pt-4 pb-3"></ds-search-form>
+    <ds-home-news></ds-home-news>
+    <ds-search-form class="d-block pb-3" [inPlaceSearch]="false" [large]="true" [brandColor]="'success'"></ds-search-form>
+  </div>
+  <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">@inspiredimages</a></small>
+</div>
+<div class="container pt-3">
   <ds-top-level-community-list></ds-top-level-community-list>
 </div>

themes/mantis/app/+item-page/simple/item-types/journal-issue/journal-issue.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/journal-issue/journal-issue.component';
 
 :host {
     > * {

themes/mantis/app/+item-page/simple/item-types/journal-volume/journal-volume.component.scss

@@ -0,0 +1,30 @@
+@import '../../../../../../../src/app/+item-page/simple/item-types/journal-volume/journal-volume.component';
+
+:host {
+    > * {
+        display: block;
+        padding-top: $content-spacing;
+        padding-bottom: $content-spacing;
+    }
+
+    .top-item-page {
+        background-color: $gray-100;
+        margin-top: -$content-spacing;
+    }
+
+    .relationships-item-page {
+        padding-bottom: $content-spacing - $spacer;
+    }
+
+    ds-metadata-field-wrapper {
+        @media screen and (max-width: map-get($grid-breakpoints, md)) {
+            flex: 1;
+            padding-right: $spacer/2;
+        }
+
+        ds-thumbnail {
+            display: block;
+            max-width: $thumbnail-max-width;
+        }
+    }
+}

themes/mantis/app/+item-page/simple/item-types/journal/journal.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/journal/journal.component';
 
 :host {
     > * {

themes/mantis/app/+item-page/simple/item-types/orgunit/orgunit.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/orgunit/orgunit.component';
 
 :host {
     > * {

themes/mantis/app/+item-page/simple/item-types/person/person.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/person/person.component';
 
 :host {
     > * {

themes/mantis/app/+item-page/simple/item-types/project/project.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/project/project.component';
 
 :host {
     > * {

themes/mantis/app/+item-page/simple/item-types/publication/publication.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/publication/publication.component';
 
 :host {
     > * {

themes/mantis/app/+search-page/search-filters/search-filter/search-filter.component.html

@@ -2,6 +2,6 @@
   <div (click)="toggle()" class="filter-name"><h5 class="d-inline-block mb-0">{{'search.filters.filter.' + filter.name + '.head'| translate}}</h5> <span class="filter-toggle fas float-right text-info"
                                                                                                                                                          [ngClass]="(collapsed$ | async) ? 'fa-caret-down' : 'fa-caret-up'"></span></div>
   <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"  (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)" class="search-filter-wrapper" [ngClass]="{'closed' : closed}">
-        <ds-search-facet-filter-wrapper [filterConfig]="filter"></ds-search-facet-filter-wrapper>
+    <ds-search-facet-filter-wrapper [filterConfig]="filter" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-filter-wrapper>
   </div>
 </div>

themes/mantis/app/+search-page/search-filters/search-filters.component.html

@@ -1,7 +1,7 @@
 <h3>{{"search.filters.head" | translate}}</h3>
 <div *ngIf="(filters | async)?.hasSucceeded">
   <div *ngFor="let filter of (filters | async)?.payload">
-        <ds-search-filter [filter]="filter"></ds-search-filter>
+    <ds-search-filter [filter]="filter" [inPlaceSearch]="inPlaceSearch"></ds-search-filter>
   </div>
 </div>
 <a class="btn btn-primary" [routerLink]="[getSearchLink()]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button">{{"search.filters.reset" | translate}}</a>

webpack/webpack.common.js

@@ -48,7 +48,7 @@ module.exports = {
         use: (info) => {
           const parsedPath = path.parse(info.resource);
           const themedStylePath = getThemedPath(info.resource, 'scss');
-
+          console.log('themedStylePath', themedStylePath);
           return [
             'debug-loader',
             {

yarn.lock

@@ -9897,7 +9897,7 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
-string-replace-loader@2.1.1:
+string-replace-loader@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-2.1.1.tgz#b72e7b57b6ef04efe615aff0ad989b5c14ca63d1"
   integrity sha512-0Nvw1LDclF45AFNuYPcD2Jvkv0mwb/dQSnJZMvhqGrT+zzmrpG3OJFD600qfQfNUd5aqfp7fCm2mQMfF7zLbyQ==