diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html index eb668ea0c514e7f55e8d637d6bf737209935403f..da729f91226b29e755e46f3cfc32c84b83f5290c 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.html +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html @@ -39,7 +39,7 @@ </mat-menu> <button id="settings-menu" mat-icon-button class="corner-icons" [matMenuTriggerFor]="settingsMenu" aria-labelledby="settings"> - <mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">edit</mat-icon> + <mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon> </button> </div> <mat-card-content *ngIf="room.description" fxLayoutAlign="center"> diff --git a/src/app/components/home/_dialogs/data-protection/data-protection.component.scss b/src/app/components/home/_dialogs/data-protection/data-protection.component.scss index 029ef351da684dfe73e89d5cf93931159826115c..3b5c809e1c3f5753109bdd37cdc85925e231aa02 100644 --- a/src/app/components/home/_dialogs/data-protection/data-protection.component.scss +++ b/src/app/components/home/_dialogs/data-protection/data-protection.component.scss @@ -7,7 +7,6 @@ h2 { } div { - font-family: Roboto, "Helvetica Neue", sans-serif; color: var(--on-surface); } diff --git a/src/app/components/home/_dialogs/demo-video/demo-video.component.scss b/src/app/components/home/_dialogs/demo-video/demo-video.component.scss index aa927cc2386a2d62c6deb516c65bdf852bdb1c1f..1a5194c91fbcbe2ac5e0457b7d6a6f4a98b8f35e 100644 --- a/src/app/components/home/_dialogs/demo-video/demo-video.component.scss +++ b/src/app/components/home/_dialogs/demo-video/demo-video.component.scss @@ -2,7 +2,6 @@ .intro-text { font-size: medium; - font-family: Roboto, "Helvetica Neue", sans-serif; color: var(--on-surface); } diff --git a/src/app/components/shared/footer/footer.component.scss b/src/app/components/shared/footer/footer.component.scss index cea2c7d9b1750f5784cf305a03d2b1f2ff6cf47a..05b8d234b26261f5c839f3e989a1d167fdda728b 100644 --- a/src/app/components/shared/footer/footer.component.scss +++ b/src/app/components/shared/footer/footer.component.scss @@ -189,7 +189,6 @@ mat-icon { padding:0px; margin:0px; margin-left:15px; - font-family:'Roboto',serif; color:rgba(0,0,0,0.8); } diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss index df682e3c84b9ee87998b61fded9f2e0ba7d35ae6..e19d2ffbc641489348face72f698fc402b743e2a 100644 --- a/src/app/components/shared/room-list/room-list.component.scss +++ b/src/app/components/shared/room-list/room-list.component.scss @@ -52,7 +52,6 @@ th { .noRoomHistory { color: var(--on-surface)!important; - font-style: italic; } .visually-hidden { diff --git a/src/assets/i18n/help/help.scss b/src/assets/i18n/help/help.scss index 47ff0c09d584c1f58610ca0054a71ab6aa876e72..381c3a08bed875b65ed5471567ce5e57669a49a4 100644 --- a/src/assets/i18n/help/help.scss +++ b/src/assets/i18n/help/help.scss @@ -6,7 +6,6 @@ p { } div { - font-family: Roboto, "Helvetica Neue", sans-serif; color: var(--on-surface); } diff --git a/src/assets/i18n/imprint/imprint.scss b/src/assets/i18n/imprint/imprint.scss index 535f2ab644e0bd98f4d6fa04e7c56f7658fc5ab4..08f090dfcbe0c8116baafc27fd28cd1f53ff1c91 100644 --- a/src/assets/i18n/imprint/imprint.scss +++ b/src/assets/i18n/imprint/imprint.scss @@ -6,6 +6,5 @@ p { } div { - font-family: Roboto, "Helvetica Neue", sans-serif; color: var(--on-surface); } diff --git a/src/index.html b/src/index.html index 4a36156691b4040107a7a6e22983728c808a073b..299d11172cf98053e31542822e337ec45a6658cb 100644 --- a/src/index.html +++ b/src/index.html @@ -42,8 +42,6 @@ <link href="/assets/splashscreens/ipadpro3_splash.png" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" /> <link href="/assets/splashscreens/ipadpro2_splash.png" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" /> - <link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&lang=en" rel="stylesheet"> - </head> <body> <app-root></app-root> diff --git a/src/styles.scss b/src/styles.scss index df559bcc44689258e952a1ca1f02a6bbc5e334c0..acc53ae0cfce861ee9f60a54b1b4e6a0610ae4ff 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -86,8 +86,11 @@ h4 { } p, div { - font-family: Roboto, "Helvetica Neue", sans-serif!important; color: var(--on-surface); + word-break: break-word; + -ms-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; } address{ diff --git a/src/theme/light-theme/_theme.scss b/src/theme/light-theme/_theme.scss index 3c65cfff4b068d1a22728163af5c4350b3ae148c..26e6c11c12a5ef36a65fc19f58299b31bfaac28b 100644 --- a/src/theme/light-theme/_theme.scss +++ b/src/theme/light-theme/_theme.scss @@ -1,19 +1,12 @@ @import './../../../node_modules/@angular/material/theming'; html, body { - font-family: sans-serif; margin: 0; padding: 0; width: 100%; height: 100%; } -/* quick hack, will be refactored in course SWTP ("Semantic HTML) */ - -h4 { - font-weight: normal !important; -} - @import 'util'; @import 'form';