diff --git a/console/src/app/app.component.html b/console/src/app/app.component.html index 9e64ef676b..dd61103f61 100644 --- a/console/src/app/app.component.html +++ b/console/src/app/app.component.html @@ -134,7 +134,8 @@ - {{ 'MENU.GRANTS' | translate }} diff --git a/console/src/app/app.component.scss b/console/src/app/app.component.scss index 04591da529..836654ab0a 100644 --- a/console/src/app/app.component.scss +++ b/console/src/app/app.component.scss @@ -36,6 +36,10 @@ .doc-link { margin-right: 1rem; + + @media only screen and (max-width: 500px) { + display: none; + } } .icon-container { diff --git a/console/src/app/modules/accounts-card/accounts-card.component.scss b/console/src/app/modules/accounts-card/accounts-card.component.scss index f308d56de5..18939b3631 100644 --- a/console/src/app/modules/accounts-card/accounts-card.component.scss +++ b/console/src/app/modules/accounts-card/accounts-card.component.scss @@ -56,7 +56,7 @@ &:hover { cursor: pointer; - background-color: #ffffff10; + background-color: #00000010; } .small-avatar { diff --git a/console/src/app/modules/contributors/contributors.component.html b/console/src/app/modules/contributors/contributors.component.html index ec137c2480..7ee146b3a2 100644 --- a/console/src/app/modules/contributors/contributors.component.html +++ b/console/src/app/modules/contributors/contributors.component.html @@ -30,7 +30,7 @@ diff --git a/console/src/app/modules/form-field/form-field.component.ts b/console/src/app/modules/form-field/form-field.component.ts index e06efc1485..55fecceffc 100644 --- a/console/src/app/modules/form-field/form-field.component.ts +++ b/console/src/app/modules/form-field/form-field.component.ts @@ -45,7 +45,10 @@ class CnslFormFieldBase { '[class.ng-valid]': '_shouldForward("valid")', '[class.ng-invalid]': '_shouldForward("invalid")', '[class.ng-pending]': '_shouldForward("pending")', - // '[class.cnsl-form-field-invalid]': '_control.errorState', + '[class.cnsl-form-field-disabled]': '_control.disabled', + '[class.cnsl-form-field-autofilled]': '_control.autofilled', + '[class.cnsl-focused]': '_control.focused', + '[class.cnsl-form-field-invalid]': '_control.errorState', }, encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/console/src/app/modules/info-section/info-section.component.html b/console/src/app/modules/info-section/info-section.component.html new file mode 100644 index 0000000000..90564546d6 --- /dev/null +++ b/console/src/app/modules/info-section/info-section.component.html @@ -0,0 +1,6 @@ +
+ +
+ +
+
\ No newline at end of file diff --git a/console/src/app/modules/info-section/info-section.component.scss b/console/src/app/modules/info-section/info-section.component.scss new file mode 100644 index 0000000000..ee75019945 --- /dev/null +++ b/console/src/app/modules/info-section/info-section.component.scss @@ -0,0 +1,30 @@ +@import '~@angular/material/theming'; + +@mixin info-section-theme($theme) { + $primary: map-get($theme, primary); + $primary-color: mat-color($primary, 500); + $is-dark-theme: map-get($theme, is-dark); + + .info-section-row { + display: flex; + background-color: if($is-dark-theme, #ffffff13, #f3f3f3); + border-radius: 4px; + padding: .5rem 0; + padding-right: 1rem; + color: if($is-dark-theme, #d6d6d6, #3c4257); + font-size: 14px; + + .icon { + margin-right: 1rem; + height: 1.2rem; + line-height: 1.2rem; + font-size: 1.2rem; + margin-left: .5rem; + color: $primary-color; + } + + .info-section-content { + flex: 1; + } + } +} diff --git a/console/src/app/modules/info-section/info-section.component.spec.ts b/console/src/app/modules/info-section/info-section.component.spec.ts new file mode 100644 index 0000000000..74d521d403 --- /dev/null +++ b/console/src/app/modules/info-section/info-section.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InfoSectionComponent } from './info-section.component'; + +describe('InfoSectionComponent', () => { + let component: InfoSectionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [InfoSectionComponent], + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(InfoSectionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/console/src/app/modules/info-section/info-section.component.ts b/console/src/app/modules/info-section/info-section.component.ts new file mode 100644 index 0000000000..999364e46e --- /dev/null +++ b/console/src/app/modules/info-section/info-section.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'cnsl-info-section', + templateUrl: './info-section.component.html', + styleUrls: ['./info-section.component.scss'], +}) +export class InfoSectionComponent { } diff --git a/console/src/app/modules/info-section/info-section.module.ts b/console/src/app/modules/info-section/info-section.module.ts new file mode 100644 index 0000000000..894e0b250b --- /dev/null +++ b/console/src/app/modules/info-section/info-section.module.ts @@ -0,0 +1,17 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; + +import { InfoSectionComponent } from './info-section.component'; + + + +@NgModule({ + declarations: [InfoSectionComponent], + imports: [ + CommonModule, + ], + exports: [ + InfoSectionComponent, + ], +}) +export class InfoSectionModule { } diff --git a/console/src/app/modules/label/label.component.scss b/console/src/app/modules/label/label.component.scss index 969f672ac4..0f0d8a016b 100644 --- a/console/src/app/modules/label/label.component.scss +++ b/console/src/app/modules/label/label.component.scss @@ -5,12 +5,27 @@ $primary: map-get($theme, primary); $primary-color: mat-color($primary, 500); $is-dark-theme: map-get($theme, is-dark); + $warn: map-get($theme, warn); + $warn-color: mat-color($warn, 500); .cnsl-label { display: block; font-size: 12px; color: if($is-dark-theme, var(--grey), var(--grey)); + transition: color .2s ease; margin-bottom: 4px; font-weight: 400; } + + .cnsl-form-field-disabled { + .cnsl-label { + color: if($is-dark-theme, #ffffff80, #00000061); + } + } + + .cnsl-form-field-invalid { + .cnsl-label { + color: $warn-color; + } + } } diff --git a/console/src/app/modules/meta-layout/meta.scss b/console/src/app/modules/meta-layout/meta.scss new file mode 100644 index 0000000000..5d996d3dc5 --- /dev/null +++ b/console/src/app/modules/meta-layout/meta.scss @@ -0,0 +1,57 @@ + +@import '~@angular/material/theming'; + +@mixin meta-theme($theme) { + .meta-details { + margin-bottom: 1rem; + border-bottom: 1px solid #81868a40; + padding-bottom: 1rem; + + .meta-row { + display: flex; + margin-bottom: .5rem; + align-items: center; + + .first { + flex: 1; + font-size: 13px; + margin-right: .5rem; + } + + .fill-space { + flex: 1; + } + + .second { + font-size: 13px; + } + + .state { + border-radius: 50vw; + padding: 2px .5rem; + letter-spacing: .05em; + font-size: 13px; + background-color: #8795a120; + + &.active { + background-color: #85d996; + color: black; + } + + &.inactive { + background-color: #ff8981; + color: black; + } + } + } + } + + .mat-tab-label { + min-width: 100px !important; + } + + .meta-flex-col { + display: flex; + flex-direction: column; + } +} diff --git a/console/src/app/pages/iam/iam.component.html b/console/src/app/pages/iam/iam.component.html index 29355d4be7..fdd125fe3b 100644 --- a/console/src/app/pages/iam/iam.component.html +++ b/console/src/app/pages/iam/iam.component.html @@ -6,7 +6,7 @@ -
+
-
-
+
+
+ {{'RESOURCEID' | translate}}: + {{ org.id }} +
+
{{'ORG.PAGES.PRIMARYDOMAIN' | translate}} {{primaryDomain}}
-
+
{{'ORG.PAGES.STATE' | translate}} {{'ORG.STATE.'+org.state | translate}} @@ -54,7 +58,7 @@ (showDetailClicked)="showDetail()" (refreshClicked)="loadMembers()" [disabled]="false"> - + diff --git a/console/src/app/pages/orgs/org-detail/org-detail.component.scss b/console/src/app/pages/orgs/org-detail/org-detail.component.scss index 24cc3880fc..63c399b7ab 100644 --- a/console/src/app/pages/orgs/org-detail/org-detail.component.scss +++ b/console/src/app/pages/orgs/org-detail/org-detail.component.scss @@ -63,31 +63,3 @@ font-size: 14px; color: #818a8a; } - -.side { - .details { - margin-bottom: 1rem; - border-bottom: 1px solid #81868a40; - padding-bottom: 1rem; - - .row { - display: flex; - margin-bottom: .5rem; - align-items: center; - - .first { - flex: 1; - font-size: .8rem; - margin-right: .5rem; - } - - .second { - font-size: .8rem; - text-overflow: ellipsis; - overflow: hidden; - margin-left: 1rem; - text-align: right; - } - } - } -} diff --git a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html index 58c711675f..726a157dce 100644 --- a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html +++ b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html @@ -14,7 +14,7 @@
-
+
@@ -26,18 +26,18 @@ - + {{ 'APP.NAME' | translate }} -

Discovery Endpoint: {{docs.discoveryEndpoint}} -

-

Issuer: {{docs.issuer}}

+ +

Discovery Endpoint: {{docs.discoveryEndpoint}}

+

Issuer: {{docs.issuer}}

+
-
@@ -50,9 +50,12 @@
-

- {{problem.localizedMessage}} -

+ +
    +
  • + {{problem.localizedMessage}}
  • +
+
@@ -113,10 +116,16 @@ {{'APP.OIDC.ACCESSTOKENROLEASSERTION' | translate}} -

{{'APP.OIDC.ACCESSTOKENROLEASSERTION_DESCRIPTION' | translate}}

- + + + {{'APP.OIDC.ACCESSTOKENROLEASSERTION_DESCRIPTION' | translate}} + + {{'APP.OIDC.IDTOKENROLEASSERTION' | translate}} -

{{'APP.OIDC.IDTOKENROLEASSERTION_DESCRIPTION' | translate}}

+ + {{'APP.OIDC.IDTOKENROLEASSERTION_DESCRIPTION' | translate}} +
@@ -126,10 +135,15 @@ {{ 'APP.OIDC.DEVMODE' | translate }} -

{{'APP.OIDC.DEVMODEDESC' | translate}}

-

+ {{'APP.OIDC.DEVMODEDESC' | translate}} + + + - {{'APP.OIDC.REDIRECTDESCRIPTIONNATIVE' | translate}}

+ {{'APP.OIDC.REDIRECTDESCRIPTIONNATIVE' | translate}} + +

{{'APP.OIDC.REDIRECTDESCRIPTIONWEB' | translate}}

@@ -141,7 +155,8 @@ - @@ -164,7 +179,8 @@ - @@ -193,8 +209,12 @@
-
-
+
+
+ {{'RESOURCEID' | translate}}: + {{ app.id }} +
+
{{'PROJECT.STATE.TITLE' | translate}}:
-
-
+
+
+ {{'RESOURCEID' | translate}}: + {{ projectId }} +
+
{{'PROJECT.STATE.TITLE' | translate}}: {{'PROJECT.STATE.'+project.state | translate}} @@ -43,7 +47,7 @@ [disabled]="(['project.member.write$', 'project.member.write:'+ project.projectId]| hasRole | async) == false"> - + diff --git a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.scss b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.scss index ff25a9436a..c9a505fb34 100644 --- a/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.scss +++ b/console/src/app/pages/projects/granted-projects/granted-project-detail/granted-project-detail.component.scss @@ -39,54 +39,3 @@ font-size: .9rem; color: var(--grey); } - -.side { - .details { - margin-bottom: 1rem; - border-bottom: 1px solid #81868a40; - padding-bottom: 1rem; - - .row { - display: flex; - margin-bottom: .5rem; - align-items: center; - - .first { - flex: 1; - font-size: 13px; - margin-right: .5rem; - } - - .fill-space { - flex: 1; - } - - .state { - border-radius: 50vw; - padding: 2px .5rem; - letter-spacing: .05em; - font-size: 11px; - background-color: #8795a120; - - &.active { - background-color: #85d996; - color: black; - } - - &.inactive { - background-color: #ff8981; - color: black; - } - } - } - } - - .mat-tab-label { - min-width: 100px !important; - } - - .flex-col { - display: flex; - flex-direction: column; - } -} diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html index 0fc1cb0434..5a336524aa 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.html @@ -110,8 +110,12 @@
-
-
+
+
+ {{'RESOURCEID' | translate}}: + {{ projectId }} +
+
{{'PROJECT.STATE.TITLE' | translate}}: {{'PROJECT.STATE.'+project.state | translate}} @@ -127,7 +131,7 @@ [disabled]="(['project.member.write$', 'project.member.write:'+ project.projectId]| hasRole | async) == false"> - + diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.scss b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.scss index 92cb54503d..b20146e592 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.scss +++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.scss @@ -54,53 +54,6 @@ align-items: center; } -.side { - .details { - margin-bottom: 1rem; - border-bottom: 1px solid #81868a40; - padding-bottom: 1rem; - - .row { - display: flex; - margin-bottom: .5rem; - align-items: center; - - .first { - flex: 1; - font-size: 13px; - margin-right: .5rem; - } - - .state { - border-radius: 50vw; - padding: 2px .5rem; - letter-spacing: .05em; - font-size: 11px; - background-color: #8795a120; - - &.active { - background-color: #85d996; - color: black; - } - - &.inactive { - background-color: #ff8981; - color: black; - } - } - } - } - - .mat-tab-label { - min-width: 100px !important; - } - - .flex-col { - display: flex; - flex-direction: column; - } -} - .desc { color: var(--grey); font-size: 14px; diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html index be42b7f795..23ccdf36e8 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html @@ -66,8 +66,9 @@ - diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss index a2aa3ea710..a8d56fb13c 100644 --- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss +++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss @@ -45,4 +45,14 @@ h1 { tr { outline: none; + + .dlt-button { + visibility: hidden; + } + + &:hover { + .dlt-button { + visibility: visible; + } + } } diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html index fecc95363a..4f65a79667 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.html @@ -40,7 +40,7 @@ -
-
-
+
+
+ {{'RESOURCEID' | translate}}: + {{ user.id }} +
+
{{'USER.PREFERRED_LOGINNAME' | translate}} {{user.preferredLoginName}}
diff --git a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.scss b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.scss index 851fdb4fb0..d36f7f5b3c 100644 --- a/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.scss +++ b/console/src/app/pages/users/user-detail/auth-user-detail/auth-user-detail.component.scss @@ -65,40 +65,6 @@ } } -.side { - .details { - margin-bottom: 1rem; - border-bottom: 1px solid #81868a40; - padding-bottom: 1rem; - - .row { - display: flex; - margin-bottom: .5rem; - align-items: center; - - .first { - flex: 1; - font-size: .8rem; - margin-right: .5rem; - white-space: nowrap; - } - - .second { - font-size: .8rem; - text-overflow: ellipsis; - overflow: hidden; - margin-left: 1rem; - text-align: right; - } - } - - .changes { - flex: 1; - min-height: 0; - } - } -} - .resendemail { margin-right: 1rem; } diff --git a/console/src/app/pages/users/user-detail/external-idps/external-idps.component.html b/console/src/app/pages/users/user-detail/external-idps/external-idps.component.html index 1194cee981..5474e4634e 100644 --- a/console/src/app/pages/users/user-detail/external-idps/external-idps.component.html +++ b/console/src/app/pages/users/user-detail/external-idps/external-idps.component.html @@ -40,7 +40,7 @@ - diff --git a/console/src/app/pages/users/user-detail/memberships/memberships.component.html b/console/src/app/pages/users/user-detail/memberships/memberships.component.html index f5010e16ec..9249a989ae 100644 --- a/console/src/app/pages/users/user-detail/memberships/memberships.component.html +++ b/console/src/app/pages/users/user-detail/memberships/memberships.component.html @@ -30,7 +30,7 @@
diff --git a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html index 634356493a..b430a4d878 100644 --- a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html +++ b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.html @@ -67,7 +67,7 @@ -
-
-
+
+
+ {{'RESOURCEID' | translate}}: + {{ user.id }} +
+
{{'USER.PREFERRED_LOGINNAME' | translate}} {{user.preferredLoginName}}
-
+
{{'ORG.PAGES.STATE' | translate}} {{'USER.DATA.STATE'+user.state | translate}} diff --git a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.scss b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.scss index 7e6257f7e4..0f113e67c5 100644 --- a/console/src/app/pages/users/user-detail/user-detail/user-detail.component.scss +++ b/console/src/app/pages/users/user-detail/user-detail/user-detail.component.scss @@ -29,51 +29,6 @@ } .side { - .details { - margin-bottom: 1rem; - border-bottom: 1px solid #81868a40; - padding-bottom: 1rem; - - .row { - display: flex; - margin-bottom: .5rem; - align-items: center; - - .first { - flex: 1; - font-size: 13px; - margin-right: .5rem; - white-space: nowrap; - } - - .second { - font-size: .13px; - text-overflow: ellipsis; - overflow: hidden; - margin-left: 1rem; - text-align: right; - } - - .state { - border-radius: 50vw; - padding: 2px .5rem; - letter-spacing: .05em; - font-size: 11px; - background-color: #8795a120; - - &.active { - background-color: #85d996; - color: black; - } - - &.inactive { - background-color: #ff8981; - color: black; - } - } - } - } - .changes { flex: 1; min-height: 0; diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index be36063fb6..4feeac9ab1 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -95,6 +95,7 @@ "SEND":"Senden", "NEWVALUE":"Neuer Wert" }, + "RESOURCEID":"Ressourcen-ID", "TABLE": { "NOROWS":"Keine Daten" }, diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index 1c2446e98e..9fa4a9e2cc 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -95,6 +95,7 @@ "SEND":"Send", "NEWVALUE":"New Value" }, + "RESOURCEID":"Resource Id", "TABLE": { "NOROWS":"No data" }, diff --git a/console/src/component-themes.scss b/console/src/component-themes.scss index 3f8d7983fd..40f16d4354 100644 --- a/console/src/component-themes.scss +++ b/console/src/component-themes.scss @@ -6,6 +6,7 @@ @import './styles/sidenav-list'; @import 'src/app/modules/avatar/avatar.component'; @import 'src/app/modules/changes/changes.component'; +@import 'src/app/modules/info-section/info-section.component'; @import 'src/app/modules/detail-layout/detail-layout.component'; @import 'src/app/pages/projects/owned-projects/owned-project-detail/application-grid/application-grid.component'; @import 'src/app/pages/users/user-detail/auth-user-detail/theme-setting/theme-card'; @@ -13,6 +14,7 @@ @import 'src/app/app.component.scss'; @import 'src/app/modules/form-field/form-field.component.scss'; @import 'src/app/modules/label/label.component.scss'; +@import 'src/app/modules/meta-layout/meta.scss'; @mixin component-themes($theme) { @include avatar-theme($theme); @@ -30,4 +32,6 @@ @include cnsl-label-theme($theme); @include cnsl-error-theme($theme); @include link-theme($theme); + @include meta-theme($theme); + @include info-section-theme($theme); } diff --git a/console/src/styles/error.scss b/console/src/styles/error.scss index 02ff8722c7..2f3eca2cf3 100644 --- a/console/src/styles/error.scss +++ b/console/src/styles/error.scss @@ -11,9 +11,5 @@ font-size: 12px; color: $warn-color; margin-bottom: 5px; - - // &.block { - // display: block; - // } } } diff --git a/console/src/styles/input.scss b/console/src/styles/input.scss index 886e23ee8a..27992d3db3 100644 --- a/console/src/styles/input.scss +++ b/console/src/styles/input.scss @@ -54,7 +54,11 @@ &[disabled] { border-color: if($is-dark-theme,#36373850,#cccdce50); - cursor: not-allowed; + color: if($is-dark-theme, #ffffff80 ,#00000061); + + &::placeholder { + color: if($is-dark-theme, #ffffff80 ,#00000061); + } } }