Skip to content

Commit b8eea35

Browse files
authored
fix: word wrap in logo and profile-user (#41)
1 parent bf5272e commit b8eea35

File tree

7 files changed

+32
-11
lines changed

7 files changed

+32
-11
lines changed

projects/lib-workspace/src/app/app.module.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,15 @@ import { de } from 'date-fns/locale';
88
import { AppRoutingModule } from './app-routing.module';
99
import { AppComponent } from './app.component';
1010

11+
import { MatButtonModule } from '@angular/material/button';
12+
import { MatCardModule } from '@angular/material/card';
1113
import { MAT_DATE_LOCALE } from '@angular/material/core';
12-
import { FsCalendarModule, FsCalendarService, FsMaterialFullModule, FsNavFrameModule } from 'projects/ng-mat-components/src/public-api';
14+
import { MatFormFieldModule } from '@angular/material/form-field';
15+
import { MatIconModule } from '@angular/material/icon';
16+
import { MatInputModule } from '@angular/material/input';
17+
import { MatSelectModule } from '@angular/material/select';
18+
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
19+
import { FsCalendarModule, FsCalendarService, FsNavFrameModule } from 'projects/ng-mat-components/src/public-api';
1320
import { HomeComponent } from './content/home/home.component';
1421
import { ShowcaseCalendarPanelsComponent } from './content/showcase-calendar-panels/showcase-calendar-panels.component';
1522
import { ShowcaseCalendarTableComponent } from './content/showcase-calendar-table/showcase-calendar-table.component';
@@ -23,8 +30,15 @@ import { ShowcaseNavFrameComponent } from './content/showcase-nav-frame/showcase
2330
AppRoutingModule,
2431
BrowserAnimationsModule,
2532
ReactiveFormsModule,
33+
/* Mat Modules */
34+
MatButtonModule,
35+
MatIconModule,
36+
MatFormFieldModule,
37+
MatInputModule,
38+
MatSelectModule,
39+
MatCardModule,
40+
MatSlideToggleModule,
2641
/* Lib modules */
27-
FsMaterialFullModule,
2842
FsNavFrameModule,
2943
FsCalendarModule,
3044
],

projects/lib-workspace/src/app/content/showcase-calendar-panels/showcase-calendar-panels.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
</div>
44

55
<div class="selection">
6-
<mat-form-field>
6+
<mat-form-field appearance="fill">
77
<mat-label>Months before</mat-label>
8-
<mat-select [(ngModel)]="monthsBefore">
8+
<mat-select name="monthsBefore" [(ngModel)]="monthsBefore">
99
<mat-option *ngFor="let num of monthsAfterBefore" [value]="num">{{ num }}</mat-option>
1010
</mat-select>
1111
</mat-form-field>
12-
<mat-form-field>
12+
<mat-form-field appearance="fill">
1313
<mat-label>Months after</mat-label>
14-
<mat-select [(ngModel)]="monthsAfter">
14+
<mat-select name="monthsAfter" [(ngModel)]="monthsAfter">
1515
<mat-option *ngFor="let num of monthsAfterBefore" [value]="num">{{ num }}</mat-option>
1616
</mat-select>
1717
</mat-form-field>

projects/lib-workspace/src/app/content/showcase-calendar-panels/showcase-calendar-panels.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ export class ShowcaseCalendarPanelsComponent implements OnInit {
2323
monthsBefore = 1;
2424
monthsAfter = 1;
2525

26+
// monthsBefore = new FormControl(1);
27+
// monthsAfter = new FormControl(1);
28+
2629
dataSource: CalendarPanels = {
2730
config: {
2831
renderMode: 'monthly', // 'annual' | 'monthly'

projects/lib-workspace/src/app/content/showcase-nav-frame/showcase-nav-frame.component.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<div style="height: 300px; display: flex">
22
<div style="width: 100%; display: flex; justify-content: space-between">
33
<p>
4-
&#8593; Title can be changed vis contend projection
4+
&#8593; Title and the hole Toolbar can be changed with content projection
55
<br />
66
<br />
77
Note: The toolbar is optional, but then you have to implement your own solution!
88
<br />
99
This one is also slightly thinner than the original material bar in height.
1010
</p>
11-
<p>&#8593; use perdifined content or your own</p>
12-
<p>&#8593; like this search</p>
1311
</div>
1412

1513
<p style="position: absolute; top: 200px">&#8592; In the sidenav you can set preregisterd entrys</p>

projects/ng-mat-components/src/fs-nav-frame/fs-nav-frame.component.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141

4242
.app-name {
4343
font-size: 1.2rem;
44+
white-space: nowrap;
45+
text-overflow: ellipsis;
4446
}
4547

4648
.app-version {

projects/ng-mat-components/src/fs-nav-frame/fs-nav-user-profile/fs-nav-user-profile.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,14 @@ fs-nav-user-profile {
4949

5050
.fs-nav-user-profile-name {
5151
font-size: 1rem;
52+
white-space: nowrap;
53+
text-overflow: ellipsis;
5254
}
5355

5456
.fs-nav-user-profile-subname {
5557
font-size: .7rem;
58+
white-space: nowrap;
59+
text-overflow: ellipsis;
5660
}
5761
}
5862

projects/ng-mat-components/styles/fonts/_roboto.scss

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)