Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize alert panels #2411

Merged
merged 23 commits into from
Dec 9, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@ import { SettingsTrustedOrganizationsComponent } from './components/settings-tru
import { SettingsUsersThatThrustYouComponent } from './components/settings-users-that-thrust-you/settings-users-that-thrust-you.component'
import { SettingsComponent } from './components/settings/settings.component'
import { AccountTrustedPartiesComponent } from './pages/account-trusted-parties/account-trusted-parties.component'
import { AlertMessageModule } from '../cdk/alert-message/alert-message.module'

@NgModule({
declarations: [
@@ -78,6 +79,7 @@ import { AccountTrustedPartiesComponent } from './pages/account-trusted-parties/
TwoFactorAuthenticationFormModule,
AccountPanelModule,
TopBarMyPublicRecordPreviewModule,
AlertMessageModule,
MatTooltipModule,
],
providers: [VerificationEmailModalService],
Original file line number Diff line number Diff line change
@@ -22,37 +22,26 @@
<div>{{ permissions.key | scopePathType }}</div>
</div>

<div
class="info"
[ngClass]="{
'orc-font-body-small': !isMobile,
'orc-font-small-print': isMobile
}"
>
<div class="col">
<mat-icon class="large-material-icon">info</mat-icon>
</div>
<div class="col l11 m6 s3">
<p>
<ng-container i18n="@@account.organizationsCanStillDelete"
>Organizations can still delete items they added to your record even
after their access permissions have been revoked.
</ng-container>
<app-alert-message class="orc-font-body-small">
<ng-container content>
<ng-container i18n="@@account.organizationsCanStillDelete"
>Organizations can still delete items they added to your record even
after their access permissions have been revoked.
</ng-container>

<ng-container>
<a
href="https://support.orcid.org/hc/en-us/articles/360006973893-Trusted-organizations"
rel="noopener noreferrer"
target="_blank"
i18n="@@account.findOutMoreAboutTrusted"
class="underline"
>
Find out more about Trusted Organizations and access permissions
</a>
</ng-container>
</p>
</div>
</div>
<ng-container>
<a
href="https://support.orcid.org/hc/en-us/articles/360006973893-Trusted-organizations"
rel="noopener noreferrer"
target="_blank"
i18n="@@account.findOutMoreAboutTrusted"
class="underline"
>
Find out more about Trusted Organizations and access permissions
</a>
</ng-container>
</ng-container>
</app-alert-message>

<app-modal-footer>
<button
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
.info {
padding: 16px;
margin-top: 16px;
margin-bottom: 16px;
border: solid 2px;
border-radius: 4px;
display: flex;

p {
margin: 0;
}
}

.permission-container.last {
border-bottom: 1px solid;
}
Original file line number Diff line number Diff line change
@@ -8,19 +8,6 @@
$foreground: map-get($theme, foreground);
$background: map-get($theme, background);

.info {
border-color: mat.get-color-from-palette(
$foreground,
'state-notice-dark'
) !important;

mat-icon {
color: mat.get-color-from-palette(
$foreground,
'state-notice-dark'
) !important;
}
}
.permission-container.last {
border-color: map-get($background, light-grey);
}