diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html index 2787116db..4fa8615cf 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html @@ -37,7 +37,8 @@ .
{{'GENERAL.STATUSES.EDIT' | translate}} : - {{dataset.modified | date:"longDate"}} + + {{dataset.modified | date:'longDate'}}
@@ -47,19 +48,13 @@
- - -
@@ -75,22 +70,26 @@
{{'DMP-OVERVIEW.GRANT' | translate}}
{{ dataset.grant.label }}
+
{{'DMP-OVERVIEW.RESEARCHERS' | translate}}
- +
 
{{ researcher.name }},
{{ researcher.name }}
+ horizontal_rule
{{'DATASET-LISTING.COLUMNS.DESCRIPTION' | translate}}

{{ dataset.description }}

+
+ horizontal_rule +
@@ -162,13 +161,10 @@

{{ roleDisplay(user) }}

- + -
+
- \ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss index e27c1ad3b..e6dedf2da 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss @@ -69,7 +69,7 @@ .dmp-btn, .dmp-btn > mat-icon { color: #ffffff; - opacity: 0.8; + // opacity: 0.8; } .show-more-btn { diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 711fc6c75..23345a6ff 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -72,11 +72,15 @@
{{ researcher.name }}
+ horizontal_rule
{{'DATASET-LISTING.COLUMNS.DESCRIPTION' | translate}}

{{ dmp.description }}

+
+ horizontal_rule +
{{'DMP-OVERVIEW.DATASETS-USED' | translate}}
@@ -89,6 +93,9 @@
+
+ horizontal_rule +
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index 87f634b7b..b1ac1472d 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -45,7 +45,7 @@ border-radius: 4px; justify-content: space-between; color: #212121; - opacity: 0.8; + // opacity: 0.8; } .show-more-btn { @@ -123,7 +123,6 @@ border-radius: 4px; font-size: 0.875em; color: #ffffff; - opacity: 0.8; } .label-txt { @@ -178,6 +177,10 @@ margin-right: 1em; overflow: hidden; text-overflow: ellipsis; + letter-spacing: 0px; + color: #212121; + opacity: 0.8; + font-style: normal; } .doi-label { diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss index 4c53a9302..7120dc3c1 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.scss @@ -1,43 +1,44 @@ @mixin navigation-component-theme($theme) { - $accent: map-get($theme, accent); + $accent: map-get($theme, accent); - .navigation-bar { - overflow: hidden; - position: fixed; - width: 100%; - top: 0; - left: 0; - z-index: 1000; + .navigation-bar { + overflow: hidden; + position: fixed; + width: 100%; + top: 0; + left: 0; + z-index: 1000; - .active { - color: mat-color($accent); - } + .active { + color: mat-color($accent); + } - .user-label { - font-size: 14px; - } + .user-label { + font-size: 14px; + } - .app-logo { - margin-right: 30px; - margin-left: 20px; - } - - } - - .progress-bar { - top: 64px; - left: 0; - position: fixed; - width: 100%; - z-index: 4; - } + .app-logo { + margin-right: 30px; + margin-left: 20px; + } + } + .progress-bar { + top: 64px; + left: 0; + position: fixed; + width: 100%; + z-index: 4; + } } .two-line-mat-option { - // height: 3.5em; - line-height: 1.2em; + // height: 3.5em; + line-height: 1.2em; } .buttonNav:hover { - color: aliceblue; + color: aliceblue; +} - } +.login-label { + text-transform: uppercase; +} diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html index ff72c6083..d1581031c 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.html +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html @@ -7,7 +7,7 @@
- + diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.scss b/dmp-frontend/src/app/ui/navbar/navbar.component.scss index 7d0e29640..988b1529d 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.scss +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.scss @@ -1,119 +1,123 @@ $mat-card-header-size: 40px !default; .my-mat-card-avatar { - height: $mat-card-header-size; - width: $mat-card-header-size; - border-radius: 50%; - flex-shrink: 0; + height: $mat-card-header-size; + width: $mat-card-header-size; + border-radius: 50%; + flex-shrink: 0; } .progress-bar { - top: 80px; - left: 0; - width: 100%; - position: fixed; - z-index: 4; + top: 80px; + left: 0; + width: 100%; + position: fixed; + z-index: 4; } .fixed-navbar { - position: fixed; - z-index: 1000; - height: 80px; + position: fixed; + z-index: 1000; + height: 80px; - display: flex; - background: #ffffff 0% 0% no-repeat padding-box; - box-shadow: 0px 0px 6px #00000029; - opacity: 1; - top: 0; - left: 0; - right: 0; + display: flex; + background: #ffffff 0% 0% no-repeat padding-box; + box-shadow: 0px 0px 6px #00000029; + opacity: 1; + top: 0; + left: 0; + right: 0; } .logo { - // width: 98px; - // height: 37px; - margin-top: 15px; - margin-left: 5px; + // width: 98px; + // height: 37px; + margin-top: 15px; + margin-left: 5px; } .faq-title { - text-align: left; - font: Bold 15px/18px "Roboto"; - letter-spacing: 0px; - color: #000000; - opacity: 1; - cursor: pointer; + text-align: left; + font: Bold 15px/18px "Roboto"; + letter-spacing: 0px; + color: #000000; + opacity: 1; + cursor: pointer; } .faq-title:hover { - color: #23bcba; + color: #23bcba; } .lang { - opacity: 0.8; + opacity: 0.8; } .hamburger { - display: inline-block; - cursor: pointer; - padding: 0.4rem 1.5rem 0rem; + display: inline-block; + cursor: pointer; + padding: 0.4rem 1.5rem 0rem; } .icon-bar1, .icon-bar2, .icon-bar3 { - width: 18px; - height: 2px; - background-color: #333; - margin: 3px 0; - transition: 0.4s; + width: 18px; + height: 2px; + background-color: #333; + margin: 3px 0; + transition: 0.4s; } .change .icon-bar1 { - -webkit-transform: rotate(-45deg) translate(-3px, 3px); - transform: rotate(-45deg) translate(-3px, 3px); + -webkit-transform: rotate(-45deg) translate(-3px, 3px); + transform: rotate(-45deg) translate(-3px, 3px); } .change .icon-bar2 { - opacity: 0; + opacity: 0; } .change .icon-bar3 { - -webkit-transform: rotate(45deg) translate(-4px, -4px); - transform: rotate(45deg) translate(-4px, -4px); + -webkit-transform: rotate(45deg) translate(-4px, -4px); + transform: rotate(45deg) translate(-4px, -4px); } ::ng-deep.lang-parent { - width: fit-content !important; - min-width: auto !important; + width: fit-content !important; + min-width: auto !important; } .mat-dialog-container { - display: block; - padding: 24px; - border-radius: 4px; - box-sizing: border-box; - overflow: auto; - outline: 0; - width: 100%; - height: 100%; - min-height: inherit; - max-height: inherit; + display: block; + padding: 24px; + border-radius: 4px; + box-sizing: border-box; + overflow: auto; + outline: 0; + width: 100%; + height: 100%; + min-height: inherit; + max-height: inherit; } .toggle-icon { - transform: scale(1.5); + transform: scale(1.5); } .list { - list-style-type:none; - padding-left: 0px; + list-style-type: none; + padding-left: 0px; } -.list >li { - padding: 5px; +.list > li { + padding: 5px; } .avatar { - cursor: pointer; + cursor: pointer; +} + +.login-label { + text-transform: uppercase; }