Merge branch 'master' into w2p-44988_search-sidebar

Conflicts:
	src/app/+search-page/search-page.component.html

src/app/+collection-page/collection-page.component.html

@@ -1,3 +1,4 @@
+<div class="container">
   <div class="collection-page">
     <div *ngIf="collectionData.hasSucceeded | async" @fadeInOut>
       <div *ngIf="collectionData.payload | async; let collectionPayload">
@@ -48,3 +49,4 @@
     <ds-error *ngIf="itemData.hasFailed | async" message="{{'error.items' | translate}}"></ds-error>
     <ds-loading *ngIf="itemData.isLoading | async" message="{{'loading.items' | translate}}"></ds-loading>
   </div>
+</div>

src/app/+community-page/community-page.component.html

@@ -1,3 +1,4 @@
+<div class="container">
   <div class="community-page" *ngIf="communityData.hasSucceeded | async" @fadeInOut>
     <div *ngIf="communityData.payload | async; let communityPayload">
       <!-- Community name -->
@@ -28,3 +29,4 @@
   </div>
   <ds-error *ngIf="communityData.hasFailed | async" message="{{'error.community' | translate}}"></ds-error>
   <ds-loading *ngIf="communityData.isLoading | async" message="{{'loading.community' | translate}}"></ds-loading>
+</div>

src/app/+home-page/home-news/home-news.component.html

@@ -1,6 +1,6 @@
 <div class="jumbotron jumbotron-fluid">
-  <div class="container-fluid">
-    <div class="row">
+  <div class="container">
+    <div class="d-flex">
       <div class="dspace-logo-container">
         <img src="assets/images/dspace-logo.png" />
       </div>
@@ -9,7 +9,6 @@
         <p class="lead">DSpace is an open source software platform that enables organisations to:</p>
       </div>
     </div>
-    <div class="row">
     <ul>
       <li>capture and describe digital material using a submission workflow module, or a variety of programmatic ingest options
       </li>
@@ -19,4 +18,3 @@
     </ul>
   </div>
 </div>
-</div>

src/app/+home-page/home-news/home-news.component.scss

@@ -1,8 +1,7 @@
 @import '../../../styles/variables.scss';
+
 :host {
   display: block;
-  margin-right: ($grid-gutter-width / -2);
-  margin-left:  ($grid-gutter-width / -2);
   margin-top: -$content-spacing;
   margin-bottom: -$content-spacing;
 }

src/app/+home-page/home-page.component.html

@@ -1,3 +1,5 @@
 <ds-home-news></ds-home-news>
+<div class="container">
   <ds-search-form></ds-search-form>
   <ds-top-level-community-list></ds-top-level-community-list>
+</div>

src/app/+item-page/full/full-item-page.component.html

@@ -1,3 +1,4 @@
+<div class="container">
   <div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
     <div *ngIf="item.payload | async; let itemPayload">
       <ds-item-page-title-field [item]="itemPayload"></ds-item-page-title-field>
@@ -21,3 +22,4 @@
   </div>
   <ds-error *ngIf="item.hasFailed | async" message="{{'error.item' | translate}}"></ds-error>
   <ds-loading *ngIf="item.isLoading | async" message="{{'loading.item' | translate}}"></ds-loading>
+</div>

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

@@ -1,3 +1,4 @@
+<div class="container">
   <div class="item-page" *ngIf="item.hasSucceeded | async" @fadeInOut>
     <div *ngIf="item.payload | async; let itemPayload">
       <ds-item-page-title-field [item]="itemPayload"></ds-item-page-title-field>
@@ -25,3 +26,4 @@
   </div>
   <ds-error *ngIf="item.hasFailed | async" message="{{'error.item' | translate}}"></ds-error>
   <ds-loading *ngIf="item.isLoading | async" message="{{'loading.item' | translate}}"></ds-loading>
+</div>

src/app/+search-page/search-page.component.html

@@ -1,3 +1,4 @@
+<div class="container">
     <div class="search-page">
         <ds-search-sidebar dsStick *ngIf="!(isMobileView | async)" class="col-3 sidebar-md-fixed" id="search-sidebar"
                            resultCount="{{(results.pageInfo | async)?.totalElements}}"></ds-search-sidebar>
@@ -30,3 +31,5 @@
             </div>
         </div>
     </div>
+</div>
+

src/app/app.component.html

@@ -3,9 +3,7 @@
     <ds-header></ds-header>
 
     <main class="main-content">
-      <div class="container-fluid">
       <router-outlet></router-outlet>
-      </div>
     </main>
 
     <ds-footer></ds-footer>

src/app/shared/comcol-page-logo/comcol-page-logo.component.html

@@ -1,3 +1,3 @@
 <div *ngIf="logo" class="dso-logo">
-    <img [src]="logo.content" class="img-responsive" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
+    <img [src]="logo.content" class="img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
 </div>

src/app/shared/pagination/pagination.component.html

@@ -6,9 +6,9 @@
         <span class="align-middle" *ngIf="collectionSize">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span>
       </div>
       <div class="col">
-        <div ngbDropdown #paginationControls="ngbDropdown" class="d-inline-block float-right">
+        <div ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
           <button class="btn btn-outline-primary" id="paginationControls" ngbDropdownToggle><i class="fa fa-cog" aria-hidden="true"></i></button>
-          <div class="dropdown-menu dropdown-menu-right" id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" ngbDropdownMenu>
+          <div id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" ngbDropdownMenu>
             <h6 class="dropdown-header">{{ 'pagination.results-per-page' | translate}}</h6>
             <button class="dropdown-item" *ngFor="let item of pageSizeOptions" (click)="doPageSizeChange(item)"><i [ngClass]="{'invisible': item != pageSize}" class="fa fa-check" aria-hidden="true"></i> {{item}} </button>
             <h6 class="dropdown-header">{{ 'pagination.sort-direction' | translate}}</h6>