Skip to content

Commit 425be8b

Browse files
committed
Move some styles form general styles file
1 parent ccbc18a commit 425be8b

File tree

4 files changed

+58
-57
lines changed

4 files changed

+58
-57
lines changed

libs/schematic/generators/ng-generate/components/shared/generators/styles/general/files/__name@dasherize__.component.scss.template

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
/** <%= options.generationDisclaimerText %> **/
2-
.resizing {
3-
.js-sdk-component-container {
4-
// Ignore columns with active sorting
5-
.mat-sort-header[aria-sort]:not([aria-sort='ascending']):not([aria-sort='descending']) {
6-
.mat-sort-header-container::after {
7-
// Compensate the empty space when sorting indicator is hidden for a resizable column
8-
content: '';
9-
display: block;
10-
height: 100%;
11-
min-width: 18px;
12-
max-width: 18px;
13-
}
14-
}
15-
}
16-
}
172

183
::ng-deep {
194
.advanced-search-option-description {
@@ -75,32 +60,6 @@
7560
margin: 0;
7661
}
7762

78-
.menu-actions-container {
79-
display: flex;
80-
align-items: center;
81-
align-content: space-around;
82-
padding: 16px 16px 8px 16px;
83-
min-width: 450px;
84-
85-
.column-menu {
86-
&-restore-btn {
87-
align-self: flex-start;
88-
}
89-
90-
&-cancel-btn {
91-
cursor: pointer;
92-
margin: 0 8px;
93-
}
94-
}
95-
96-
.config-menu {
97-
&-cancel-btn {
98-
cursor: pointer;
99-
margin: 0 8px;
100-
}
101-
}
102-
}
103-
10463
.list-content {
10564
display: flex;
10665
align-items: center;
@@ -131,13 +90,4 @@
13190
max-width: max-content !important;
13291
}
13392

134-
.table-cell-tooltip,
135-
.table-column-tooltip {
136-
max-height: none;
137-
138-
.mat-mdc-tooltip-surface.mdc-tooltip__surface {
139-
display: block;
140-
}
141-
}
142-
14393
<%= customStyleImports %>

libs/schematic/generators/ng-generate/components/table/generators/components/table/files/__name@dasherize__.component.scss.template

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,23 @@
22
$gray-100: #f5f5f5;
33
$gray-300: #e0e0e0;
44

5+
// Required for resizing functionality
6+
.resizing {
7+
.js-sdk-component-container {
8+
// Ignore columns with active sorting
9+
.mat-sort-header[aria-sort]:not([aria-sort='ascending']):not([aria-sort='descending']) {
10+
.mat-sort-header-container::after {
11+
// Compensate the empty space when sorting indicator is hidden for a resizable column
12+
content: '';
13+
display: block;
14+
height: 100%;
15+
min-width: 18px;
16+
max-width: 18px;
17+
}
18+
}
19+
}
20+
}
21+
522
.js-sdk-component-container {
623
display: flex;
724
flex-direction: column;
@@ -104,4 +121,13 @@ $gray-300: #e0e0e0;
104121
overflow: hidden;
105122
text-overflow: ellipsis;
106123
}
124+
125+
.table-cell-tooltip,
126+
.table-column-tooltip {
127+
max-height: none;
128+
129+
.mat-mdc-tooltip-surface.mdc-tooltip__surface {
130+
display: block;
131+
}
132+
}
107133
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.menu-actions-container {
2+
display: flex;
3+
align-items: center;
4+
align-content: space-around;
5+
padding: 16px 16px 8px 16px;
6+
min-width: 450px;
7+
8+
.column-menu {
9+
&-restore-btn {
10+
align-self: flex-start;
11+
}
12+
13+
&-cancel-btn {
14+
cursor: pointer;
15+
margin: 0 8px;
16+
}
17+
}
18+
19+
.config-menu {
20+
&-cancel-btn {
21+
cursor: pointer;
22+
margin: 0 8px;
23+
}
24+
}
25+
}

libs/schematic/src/lib/components/config-menu/config-menu.component.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
1515
import {ComponentRef} from '@angular/core';
1616
import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
1717
import {By} from '@angular/platform-browser';
18-
import {EsmfConfigMenuComponent, ConfigMenuBase} from './config-menu.component';
18+
import {Config, EsmfConfigMenuComponent} from './config-menu.component';
1919
import {EsmfLocalStorageService} from '../../services/storage.service';
2020
import {getTranslocoTestingModule} from '../../test-utils';
2121

2222
describe('EsmfConfigMenuComponent', () => {
23-
let component: EsmfConfigMenuComponent<ConfigMenuBase>;
24-
let fixture: ComponentFixture<EsmfConfigMenuComponent<ConfigMenuBase>>;
25-
let componentRef: ComponentRef<EsmfConfigMenuComponent<ConfigMenuBase>>;
23+
let component: EsmfConfigMenuComponent;
24+
let fixture: ComponentFixture<EsmfConfigMenuComponent>;
25+
let componentRef: ComponentRef<EsmfConfigMenuComponent>;
2626
let storageService: jest.Mocked<EsmfLocalStorageService>;
2727

28-
const createMockConfigs = (): ConfigMenuBase[] => [
28+
const createMockConfigs = (): Config[] => [
2929
{name: 'config.name1', desc: 'config.desc1', selected: true, color: '#ff0000'},
3030
{name: 'config.name2', desc: 'config.desc2', selected: false, color: '#00ff00'},
3131
{name: 'config.name3', desc: 'config.desc3', selected: true, color: '#0000ff'},
@@ -37,7 +37,7 @@ describe('EsmfConfigMenuComponent', () => {
3737
stopPropagation: jest.fn(),
3838
} as unknown as MouseEvent);
3939

40-
const setupComponent = async (dialogData?: {configs: ConfigMenuBase[]; keyLocalStorage: string} | null) => {
40+
const setupComponent = async (dialogData?: {configs: Config[]; keyLocalStorage: string} | null) => {
4141
await TestBed.configureTestingModule({
4242
imports: [EsmfConfigMenuComponent, getTranslocoTestingModule({langs: {en: {}, de: {}}})],
4343
providers: [
@@ -48,7 +48,7 @@ describe('EsmfConfigMenuComponent', () => {
4848
}).compileComponents();
4949

5050
storageService = TestBed.inject(EsmfLocalStorageService) as jest.Mocked<EsmfLocalStorageService>;
51-
fixture = TestBed.createComponent(EsmfConfigMenuComponent<ConfigMenuBase>);
51+
fixture = TestBed.createComponent(EsmfConfigMenuComponent);
5252
component = fixture.componentInstance;
5353
componentRef = fixture.componentRef;
5454
};

0 commit comments

Comments
 (0)