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

-@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;
-        }
-    }
-}
\ No newline at end of file

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

-@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

-<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>
-                </div>
-            </div>
-            <ul>
-                <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>
-                <li>issue permanent urls and trustworthy identifiers, including optional integrations with handle.net and DataCite DOI</li>
-            </ul>
-        </div>
+<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>
     </div>
-    <small class="credits">Photo by <a href="https://www.pexels.com/@inspiredimages">Anthony</a></small>
-</div>
\ No newline at end of file
+  </div>
+  <ul>
+    <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>
+    <li>issue permanent urls and trustworthy identifiers, including optional integrations with
+      handle.net and DataCite DOI
+    </li>
+  </ul>
+  <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

-<ds-home-news></ds-home-news>
-<div class="container">
-  <ds-search-form class="d-block pt-4 pb-3"></ds-search-form>
+<div class="background-image">
+  <div class="container">
+    <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>

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

-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/journal-issue/journal-issue.component';
 
 :host {
     > * {
@@ -27,4 +27,4 @@
             max-width: $thumbnail-max-width;
         }
     }
-}
\ No newline at end of file
+}

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

+@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;
+        }
+    }
+}

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

-@import '../../../../../../styles/variables.scss';
+@import '../../../../../../../src/app/+item-page/simple/item-types/journal/journal.component';
 
 :host {
     > * {
@@ -35,4 +35,4 @@
             max-width: none;
         }
     }
-}
\ No newline at end of file
+}