diff --git a/src/core/features/policy/pages/acceptances/acceptances.html b/src/core/features/policy/pages/acceptances/acceptances.html index d9a123a62..478a5abf6 100644 --- a/src/core/features/policy/pages/acceptances/acceptances.html +++ b/src/core/features/policy/pages/acceptances/acceptances.html @@ -28,26 +28,28 @@ - - - - - - - - - - +
+
{{ 'core.policy.policydocname' | translate }}{{ 'core.policy.policydocrevision' | translate }}{{ 'core.policy.response' | translate }}{{ 'core.policy.responseon' | translate }}{{ 'core.policy.responseby' | translate }}{{ 'core.policy.acceptancenote' | translate }}
+ + + + + + + + + + + + + + + - - - - - - - -
{{ 'core.policy.policydocname' | translate }}{{ 'core.policy.policydocrevision' | translate }}{{ 'core.policy.response' | translate }}{{ 'core.policy.responseon' | translate }}{{ 'core.policy.responseby' | translate }}{{ 'core.policy.acceptancenote' | translate }}
+ + +
diff --git a/src/core/features/policy/pages/acceptances/acceptances.scss b/src/core/features/policy/pages/acceptances/acceptances.scss index eca3e66bd..e638029c7 100644 --- a/src/core/features/policy/pages/acceptances/acceptances.scss +++ b/src/core/features/policy/pages/acceptances/acceptances.scss @@ -75,7 +75,7 @@ } } - table.core-policy-tablet-container { + .core-policy-tablet-container table { th { &:first-child { @include padding-horizontal(24px, 0px); @@ -83,7 +83,6 @@ } th, td { - min-width: 200px; text-wrap: nowrap; } diff --git a/src/core/features/policy/pages/acceptances/acceptances.ts b/src/core/features/policy/pages/acceptances/acceptances.ts index 0212671ec..036091e0a 100644 --- a/src/core/features/policy/pages/acceptances/acceptances.ts +++ b/src/core/features/policy/pages/acceptances/acceptances.ts @@ -24,7 +24,7 @@ import { CorePolicyViewPolicyModalComponent } from '@features/policy/components/ import { CoreTime } from '@singletons/time'; import { CoreScreen } from '@services/screen'; import { Subscription } from 'rxjs'; -import { CORE_DATAPRIVACY_PAGE_NAME } from '@features/dataprivacy/constants'; +import { CORE_DATAPRIVACY_FEATURE_NAME, CORE_DATAPRIVACY_PAGE_NAME } from '@features/dataprivacy/constants'; import { CoreNavigator } from '@services/navigator'; import { CoreDataPrivacy } from '@features/dataprivacy/services/dataprivacy'; @@ -81,6 +81,13 @@ export class CorePolicyAcceptancesPage implements OnInit, OnDestroy { * Check if user can contact DPO. */ protected async fetchCanContactDPO(): Promise { + const site = CoreSites.getCurrentSite(); + if (!site || site.isFeatureDisabled(CORE_DATAPRIVACY_FEATURE_NAME)) { + this.canContactDPO = false; + + return; + } + this.canContactDPO = await CoreUtils.ignoreErrors(CoreDataPrivacy.isEnabled(), false); } diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.html b/src/core/features/reportbuilder/components/report-detail/report-detail.html index d05ddfcdc..594e4eb65 100644 --- a/src/core/features/reportbuilder/components/report-detail/report-detail.html +++ b/src/core/features/reportbuilder/components/report-detail/report-detail.html @@ -21,8 +21,8 @@ - - +
+
@@ -40,7 +40,7 @@
-
+
diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 9b77bdcd2..c674fc16a 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -2031,6 +2031,11 @@ ion-datetime-button p { margin-bottom: 4px; } +.x-scrollable { + overflow-x: auto; + display: block; +} + // Table App styles table.core-table { border-collapse: collapse; @@ -2039,11 +2044,6 @@ table.core-table { margin: 1em auto; color: var(--text-color); - &.x-scrollable { - overflow-x: auto; - display: block; - } - thead th { vertical-align: bottom; font-weight: bold;