Skip to content

Commit 45934e3

Browse files
132350: Fixed some SASS variables not being overridable in the themes
Also fixed the authority icons not being totally centered in the onebox submission fields
1 parent 404ccd9 commit 45934e3

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

src/app/breadcrumbs/breadcrumbs.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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
margin-top: calc(-1 * var(--ds-content-spacing));
88
padding-bottom: var(--ds-content-spacing / 3);
99
padding-top: var(--ds-content-spacing / 3);
10-
background-color: var(--ds-breadcrumb-bg);
10+
background-color: var(--ds-breadcrumb-bg) !important;
1111
}
1212

1313
li.breadcrumb-item {

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
</ng-template>
2222

2323
<div *ngIf="!(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
24-
<i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
25-
<i *ngIf="!searching"
26-
dsAuthorityConfidenceState
27-
class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
28-
aria-hidden="true"
29-
[authorityValue]="currentValue"
30-
(whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
24+
<div class="authority-icons position-absolute d-flex align-items-center">
25+
<i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary my-auto p-0" aria-hidden="true"></i>
26+
<i *ngIf="!searching"
27+
dsAuthorityConfidenceState
28+
class="far fa-circle fa-2x fa-fw my-auto p-0"
29+
aria-hidden="true"
30+
[authorityValue]="currentValue"
31+
(whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
32+
</div>
3133
<input #instance="ngbTypeahead"
3234
class="form-control"
3335
[attr.aria-labelledby]="'label_' + model.id"

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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
--ds-navbar-link-color: #{$cyan};
3030
--ds-navbar-link-color-hover: #{darken($cyan, 15%)};
3131

32-
$admin-sidebar-bg: darken(#2B4E72, 17%);
33-
$admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%);
32+
$admin-sidebar-bg: darken(#2B4E72, 17%) !default;
33+
$admin-sidebar-active-bg: darken($admin-sidebar-bg, 3%) !default;
3434
--ds-admin-sidebar-bg: #{$admin-sidebar-bg};
3535
--ds-admin-sidebar-active-bg: #{$admin-sidebar-active-bg};
3636
--ds-admin-sidebar-header-bg: #{darken($admin-sidebar-bg, 7%)};
@@ -71,12 +71,12 @@
7171
--ds-footer-padding-bottom: 0;
7272
--ds-footer-logo-height: 50px;
7373

74-
$home-news-link-color: $cyan;
74+
$home-news-link-color: $cyan !default;
7575
--ds-home-news-link-color: #{$home-news-link-color};
7676
--ds-home-news-link-hover-color: #{darken($home-news-link-color, 15%)};
7777
--ds-home-news-background-color: #{$gray-200};
7878

79-
--ds-breadcrumb-bg: #{$gray-200} !important;
79+
--ds-breadcrumb-bg: #{$gray-200};
8080
--ds-breadcrumb-link-color: #{$cyan};
8181
--ds-breadcrumb-link-active-color: #{darken($cyan, 30%)};
8282
--ds-breadcrumb-max-length: 200px;

0 commit comments

Comments
 (0)