From 8a84e53e9769ca57ff0e1ac6ac01f221050d2b8b Mon Sep 17 00:00:00 2001
From: Florent Poittevin <florent.poittevin@unige.ch>
Date: Tue, 24 Sep 2019 15:34:58 +0200
Subject: [PATCH] fix: display of xml in home detail
---
package-lock.json | 45 ++++++-------------
...chive-detail-presentational.component.scss | 9 +---
.../home-detail/home-detail.routable.html | 1 -
.../home-detail/home-detail.routable.scss | 4 ++
4 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index fabe33210..a9727e3e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -700,7 +700,7 @@
"@angular/compiler": "^8.1.3",
"boxen": "^4.1.0",
"colorette": "^1.1.0",
- "flat": "git://github.com/lenchvolodymyr/flat.git#ffe77ef",
+ "flat": "git://github.com/lenchvolodymyr/flat.git#ffe77efe8c33bc80ffb2f7a465537610dea4f611",
"gettext-parser": "^4.0.1",
"glob": "^7.1.4",
"mkdirp": "^0.5.1",
@@ -4183,7 +4183,7 @@
"dependencies": {
"is-buffer": {
"version": "2.0.3",
- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+ "resolved": "https://packages.dlcm.ch/repository/npm-group/is-buffer/-/is-buffer-2.0.3.tgz",
"integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==",
"dev": true
}
@@ -4358,8 +4358,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"aproba": {
"version": "1.2.0",
@@ -4380,14 +4379,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -4402,20 +4399,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -4532,8 +4526,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -4545,7 +4538,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -4560,7 +4552,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -4568,14 +4559,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -4594,7 +4583,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -4675,8 +4663,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -4688,7 +4675,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -4774,8 +4760,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -4811,7 +4796,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -4831,7 +4815,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -4875,14 +4858,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
diff --git a/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail-presentational.component.scss b/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail-presentational.component.scss
index 452439e78..8a4ffa663 100644
--- a/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail-presentational.component.scss
+++ b/src/app/features/home/components/presentationals/home-archive-form/home-archive-detail-presentational.component.scss
@@ -6,15 +6,9 @@ $padding-bottom-desktop: 20px;
display: flex;
flex-direction: row;
overflow: hidden;
- width: calc(100vw - 130px); //TODO: search another way to show the table without specifying width
-
- @include respond-to-breakpoint('sm') {
- width: calc(100vw - 80px);
- }
@include respond-to-breakpoint('xs') {
flex-direction: column;
- width: calc(100vw - 65px);
}
}
@@ -53,8 +47,9 @@ dd {
border-radius: 4px;
overflow-x: auto;
}
+
.code {
font-family: monospace;
- white-space: pre;
+ white-space: pre-line;
padding-top: 0px;
}
diff --git a/src/app/features/home/components/routables/home-detail/home-detail.routable.html b/src/app/features/home/components/routables/home-detail/home-detail.routable.html
index 381c9ae87..c050ac2e3 100644
--- a/src/app/features/home/components/routables/home-detail/home-detail.routable.html
+++ b/src/app/features/home/components/routables/home-detail/home-detail.routable.html
@@ -1,4 +1,3 @@
-<script src="home-detail.routable.ts"></script>
<div class="wrapper">
<div class="spinner-wrapper"
*ngIf="((isLoadingObs | async) || (isLoadingOrgUnitObs | async)); else finishLoading"
diff --git a/src/app/features/home/components/routables/home-detail/home-detail.routable.scss b/src/app/features/home/components/routables/home-detail/home-detail.routable.scss
index f55972e58..761f686b9 100644
--- a/src/app/features/home/components/routables/home-detail/home-detail.routable.scss
+++ b/src/app/features/home/components/routables/home-detail/home-detail.routable.scss
@@ -1,3 +1,7 @@
@import "../../../../../../sass/abstracts/mixins";
@include content();
+
+.wrapper {
+ padding-bottom: 20px;
+}
--
GitLab