Skip to content

Commit 1bc47d0

Browse files
Merge branch 'w2p-132350_minor-css-fixes_contribute-7.6' into bootstrap-issues_contribute-9_x
2 parents d0f61c1 + 45934e3 commit 1bc47d0

File tree

4 files changed

+61
-53
lines changed

4 files changed

+61
-53
lines changed

src/app/breadcrumbs/breadcrumbs.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.nav-breadcrumb {
2-
background-color: var(--ds-breadcrumb-bg);
2+
background-color: var(--ds-breadcrumb-bg) !important;
33
}
44

55
.breadcrumb {
66
border-radius: 0;
77
padding-bottom: calc(var(--ds-content-spacing) / 2);
88
padding-top: calc(var(--ds-content-spacing) / 2);
9-
background-color: var(--ds-breadcrumb-bg);
9+
background-color: var(--ds-breadcrumb-bg) !important;
1010
padding-left: calc(var(--bs-spacer) *.75);
1111
padding-right: calc(var(--bs-spacer) *.75);
1212
}

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,40 @@
2424

2525
@if ((isHierarchicalVocabulary() | async) !== true) {
2626
<div class="position-relative right-addon">
27-
@if (searching || loadingInitialValue) {
28-
<i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
29-
}
30-
@if (!searching && !loadingInitialValue) {
31-
<i
32-
dsAuthorityConfidenceState
33-
class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
34-
aria-hidden="true"
35-
[authorityValue]="currentValue"
36-
(whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
37-
}
27+
<div class="authority-icons position-absolute d-flex align-items-center">
28+
@if (searching || loadingInitialValue) {
29+
<i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary my-auto p-0" aria-hidden="true"></i>
30+
}
31+
@if (!searching && !loadingInitialValue) {
32+
<i
33+
dsAuthorityConfidenceState
34+
class="far fa-circle fa-2x fa-fw my-auto p-0"
35+
aria-hidden="true"
36+
[authorityValue]="currentValue"
37+
(whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
38+
}
39+
</div>
3840
<input #instance="ngbTypeahead"
39-
class="form-control"
40-
[attr.aria-labelledby]="'label_' + model.id"
41-
[attr.autoComplete]="model.autoComplete"
42-
[attr.aria-label]="model.label | translate"
43-
[class.is-invalid]="showErrorMessages"
44-
[id]="model.id"
45-
[inputFormatter]="formatter"
46-
[name]="model.name"
47-
[ngbTypeahead]="search"
48-
[placeholder]="model.placeholder"
49-
[readonly]="model.readOnly"
50-
[disabled]="model.readOnly"
51-
[resultTemplate]="rt"
52-
[type]="model.inputType"
53-
[(ngModel)]="currentValue"
54-
(blur)="onBlur($event)"
55-
(focus)="onFocus($event)"
56-
(change)="onChange($event)"
57-
(input)="onInput($event)"
58-
(selectItem)="onSelectItem($event)">
41+
class="form-control"
42+
[attr.aria-labelledby]="'label_' + model.id"
43+
[attr.autoComplete]="model.autoComplete"
44+
[attr.aria-label]="model.label | translate"
45+
[class.is-invalid]="showErrorMessages"
46+
[id]="model.id"
47+
[inputFormatter]="formatter"
48+
[name]="model.name"
49+
[ngbTypeahead]="search"
50+
[placeholder]="model.placeholder"
51+
[readonly]="model.readOnly"
52+
[disabled]="model.readOnly"
53+
[resultTemplate]="rt"
54+
[type]="model.inputType"
55+
[(ngModel)]="currentValue"
56+
(blur)="onBlur($event)"
57+
(focus)="onFocus($event)"
58+
(change)="onChange($event)"
59+
(input)="onInput($event)"
60+
(selectItem)="onSelectItem($event)">
5961
@if (searchFailed) {
6062
<div class="invalid-feedback">Sorry, suggestions could not be loaded.</div>
6163
}
@@ -65,25 +67,25 @@
6567
@if ((isHierarchicalVocabulary() | async)) {
6668
<div class="position-relative right-addon">
6769
<i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
68-
aria-hidden="true"></i>
70+
aria-hidden="true"></i>
6971
<input class="form-control"
70-
[attr.aria-labelledby]="'label_' + model.id"
71-
[attr.autoComplete]="model.autoComplete"
72-
[attr.aria-label]="model.label | translate"
73-
[class.is-invalid]="showErrorMessages"
74-
[class.tree-input]="!model.readOnly"
75-
[id]="id"
76-
[name]="model.name"
77-
[placeholder]="model.placeholder"
78-
[readonly]="true"
79-
[disabled]="model.readOnly"
80-
[type]="model.inputType"
81-
[value]="currentValue?.display"
82-
(focus)="onFocus($event)"
83-
(change)="onChange($event)"
84-
(click)="openTree($event)"
85-
(keydown)="$event.preventDefault()"
86-
(keypress)="$event.preventDefault()"
87-
(keyup)="$event.preventDefault()">
72+
[attr.aria-labelledby]="'label_' + model.id"
73+
[attr.autoComplete]="model.autoComplete"
74+
[attr.aria-label]="model.label | translate"
75+
[class.is-invalid]="showErrorMessages"
76+
[class.tree-input]="!model.readOnly"
77+
[id]="id"
78+
[name]="model.name"
79+
[placeholder]="model.placeholder"
80+
[readonly]="true"
81+
[disabled]="model.readOnly"
82+
[type]="model.inputType"
83+
[value]="currentValue?.display"
84+
(focus)="onFocus($event)"
85+
(change)="onChange($event)"
86+
(click)="openTree($event)"
87+
(keydown)="$event.preventDefault()"
88+
(keypress)="$event.preventDefault()"
89+
(keyup)="$event.preventDefault()">
8890
</div>
8991
}

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@
3131
.tree-input[readonly]{
3232
background-color: #fff;
3333
}
34+
35+
.authority-icons {
36+
top: 50%;
37+
right: 0;
38+
transform: translateY(-50%)
39+
}

src/styles/_custom_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
--ds-home-news-link-hover-color: #{darken($ds-home-news-link-color, 15%)};
106106
--ds-home-news-background-color: #{$gray-200};
107107

108-
--ds-breadcrumb-bg: #{$gray-200} !important;
108+
--ds-breadcrumb-bg: #{$gray-200};
109109
--ds-breadcrumb-link-color: #{$ds-breadcrumb-link-color};
110110
--ds-breadcrumb-link-active-color: #{darken($ds-breadcrumb-link-color, 30%)};
111111
--ds-breadcrumb-max-length: 200px;

0 commit comments

Comments
 (0)