diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index c08c9a9f6..9556614ad 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -1,49 +1,53 @@ th { - text-transform: uppercase; + text-transform: uppercase; +} + +a { + color: #212529; } .is-public { - padding-left: 5px; - padding-right: 5px; - border: 1px solid #00b29f3b; - color: #00b29f; - background-color: #00b29f0f; - border-radius: 10em; - text-align: center; + padding-left: 5px; + padding-right: 5px; + border: 1px solid #00b29f3b; + color: #00b29f; + background-color: #00b29f0f; + border-radius: 10em; + text-align: center; } .template-name { - padding-left: 0.5em; - border: 1px solid rgb(218, 227, 243); - color: rgb(43, 104, 209); - background-color: rgb(236, 241, 249); - border-radius: 10em; - text-align: center; - max-width: 160px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + padding-left: 0.5em; + border: 1px solid rgb(218, 227, 243); + color: rgb(43, 104, 209); + background-color: rgb(236, 241, 249); + border-radius: 10em; + text-align: center; + max-width: 160px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .chip { - padding: 0.1em 1em; - margin-bottom: 1em; - margin-left: 2.5em; - margin-right: 2.5em; - border-radius: 10em; - background-color: #0d7489; - /* background-color: rgba(0, 112, 192, 1); */ - /* background-color: #007bff; */ - color: #fff; - text-transform: uppercase; - text-align: center; - font-weight: 500; - max-width: 160px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + padding: 0.1em 1em; + margin-bottom: 1em; + margin-left: 2.5em; + margin-right: 2.5em; + border-radius: 10em; + background-color: #0d7489; + /* background-color: rgba(0, 112, 192, 1); */ + /* background-color: #007bff; */ + color: #fff; + text-transform: uppercase; + text-align: center; + font-weight: 500; + max-width: 160px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .mat-icon-button :hover { - color: rgb(120, 173, 220); + color: rgb(120, 173, 220); } diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index f64c48c3c..adc94417d 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -24,68 +24,76 @@ - - {{ activity.label }} - -
- {{ activity.profile }} -
-
--
+ + + {{ activity.label }} + +
+ {{ activity.profile }} +
+
--
+
- {{ activity.grant }} - {{ roleDisplay(activity.users)}} - {{ activity.organisations }} - -
- {{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}} -
+ {{ activity.grant }} + {{ roleDisplay(activity.users)}} + {{ activity.organisations }} + +
+ {{'TYPES.DMP-VISIBILITY.PUBLIC' | translate}} +
+
- {{ enumUtils.toDmpStatusString(activity.status) }} + + {{ enumUtils.toDmpStatusString(activity.status) }} - {{ enumUtils.toDmpStatusString(activity.status) }} + + {{ enumUtils.toDmpStatusString(activity.status) }} - {{ activity.modifiedTime | date: "shortDate" }} - - - - - - - - - - - - - - - + + {{ activity.modifiedTime | date: "shortDate" }} - + + + + + + + + + + + + + + + + + + diff --git a/dmp-frontend/src/assets/scss/core/_tables.scss b/dmp-frontend/src/assets/scss/core/_tables.scss index 2d3da29c3..0a11b48eb 100644 --- a/dmp-frontend/src/assets/scss/core/_tables.scss +++ b/dmp-frontend/src/assets/scss/core/_tables.scss @@ -31,7 +31,8 @@ > tfoot > tr > th, > thead > tr > td, > tbody > tr > td, - > tfoot > tr > td{ + > tfoot > tr > td, + > tbody > a > td{ padding: 12px 8px; vertical-align: middle; } @@ -67,6 +68,10 @@ > tbody > tr{ position: relative; + } + + > tbody > a{ + position: relative; } } @@ -83,6 +88,14 @@ margin-bottom: 5px; } } + > tbody > tr > a{ + font-size: $font-paragraph; + + b{ + display: block; + margin-bottom: 5px; + } + } .td-name{ font-weight: $font-weight-default; font-size: 1.5em; @@ -183,3 +196,11 @@ thead.thead-inverse, .table.table-hover tbody tr:hover{ background-color: #f5f5f5; } + +.table-striped>tbody>a:nth-of-type(odd){ + background-color: #f9f9f9; +} + +.table.table-hover tbody a:hover{ + background-color: #f5f5f5; +}