Skip to content

Commit 1586d57

Browse files
Kovy95Kovy95
committed
Merge remote-tracking branch 'origin/NAE-2413' into NAE-2444
# Conflicts: # projects/netgrif-components/nae-theme.scss # projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss # projects/netgrif-components/src/lib/data-fields/data-field.theme.scss # projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html # projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss # projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html # projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html # projects/netgrif-components/src/lib/tabs/tabs.theme.scss
2 parents 301d29c + 2c8066a commit 1586d57

24 files changed

Lines changed: 159 additions & 37 deletions

File tree

‎nae.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,34 @@
321321
"routing": {
322322
"path": "breadcrumbs"
323323
}
324+
},
325+
"double-menu-tabbed-views": {
326+
"component": {
327+
"class": "TabbedViewsExampleComponent",
328+
"from": "./doc/tabbed-case-view/tabbed-views-example.component"
329+
},
330+
"access": "private",
331+
"navigation": {
332+
"title": "Custom Tabbed View",
333+
"icon": "tab"
334+
},
335+
"routing": {
336+
"path": "double-menu-tabbed-views"
337+
},
338+
"children": {
339+
"custom-redirect": {
340+
"component": {
341+
"class": "TabbedViewsExampleComponent",
342+
"from": "./doc/tabbed-case-view/tabbed-views-example.component"
343+
},
344+
"access": "private",
345+
"navigation": false,
346+
"routing": {
347+
"path": "**"
348+
}
349+
}
350+
},
351+
"processUri": "/"
324352
}
325353
}
326354
},

‎projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<nc-navigation-double-drawer #sidenav image="assets/img/netgrif_full_white.svg" imageRouterLink="/tabbed-views">
1+
<nc-navigation-double-drawer #sidenav image="assets/img/netgrif_full_black.svg" imageRouterLink="/tabbed-views">
22
<router-outlet></router-outlet>
33
</nc-navigation-double-drawer>

‎projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ export class TabbedCaseViewComponent extends AbstractTabbedCaseViewComponent imp
7878
@Inject(NAE_TAB_DATA) injectedTabData: InjectedTabbedCaseViewData) {
7979
super(caseViewService, loggerService, injectedTabData, overflowService, undefined, undefined, {
8080
enableCaseTitle: true,
81-
isCaseTitleRequired: true
81+
isCaseTitleRequired: true,
82+
newCaseButtonConfig: {
83+
createCaseButtonTitle: 'My custom create case button',
84+
createCaseButtonIcon: 'home'
85+
}
8286
});
8387
}
8488

‎projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
.search-panel {
99
margin-top: 16px;
10-
padding: 8px 16px;
10+
margin-bottom: 2px;
1111
}
1212

1313
.content-margin {

‎projects/nae-example-app/src/assets/img/netgrif_full_grey.svg‎

Lines changed: 56 additions & 0 deletions
Loading

‎projects/netgrif-components/nae-theme.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,7 @@
5353
.mat-mdc-card {
5454
padding: 24px;
5555
}
56+
57+
.mat-paginator {
58+
background: transparent !important;
59+
}

‎projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@
4343
padding-bottom: 9px;
4444
}
4545

46+
.no-shadow {
47+
box-shadow: unset !important;
48+
}

‎projects/netgrif-components/src/lib/data-fields/data-field.theme.scss‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
$color-text-enabled: #64748B;
1616
$color-outline-enabled: #64748B;
1717

18+
.mat-form-field-label {
19+
color: $color-text-enabled !important;
20+
}
21+
1822
.editor-preview > h1 {
1923
border-bottom: 1px solid #ddd;
2024
}
@@ -62,13 +66,13 @@
6266
}
6367

6468
.invalid-form-input {
65-
border: solid 2px mat.get-color-from-palette($primary) !important;
69+
border: solid 2px mat.get-color-from-palette($warn) !important;
6670
padding: 1px !important;
6771
}
6872

69-
.invalid-form-label {
70-
color: mat.get-color-from-palette($primary) !important;
71-
}
73+
//.invalid-form-label {
74+
// color: mat.get-color-from-palette($primary) !important;
75+
//}
7276

7377
.mat-mdc-option {
7478
height: auto !important;
@@ -236,7 +240,7 @@
236240
}
237241

238242
.mat-mdc-form-field-appearance-outline .mat-mdc-form-field-wrapper {
239-
margin: 0.25px 0 0;
243+
margin: 0.25px 0 2px;
240244
}
241245

242246
// DISABLED
@@ -344,6 +348,17 @@
344348
}
345349
}
346350

351+
.netgrif-chip-button-fix {
352+
&.mat-form-field .mat-form-field-prefix {
353+
top: 0.33em !important;
354+
padding-right: 4px !important;
355+
}
356+
357+
.netgrif-label {
358+
font-weight: 400 !important;
359+
}
360+
}
361+
347362
.mat-mdc-select-trigger {
348363
height: unset;
349364
min-height: 1.125em;

‎projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
.form-input {
3434
background: #FFFFFF;
35-
color: #64748B;
35+
//color: #64748B;
3636
outline: none;
3737
border: 1px solid #64748B;
3838
text-align: left;

‎projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
.form-input {
3434
background: #FFFFFF;
35-
color: #64748B;
35+
//color: #64748B;
3636
outline: none;
3737
border: 1px solid #64748B;
3838
text-align: left;

0 commit comments

Comments
 (0)