diff --git a/src/app/app.component.scss b/src/app/app.component.scss index ba2f15413cc7c9ef035220527f02b97f3160c9d9..5064f84737b2d6c8dbc2edc772f9be0d9f606952 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,10 +1,12 @@ .app-component { - padding: 3%; + padding: 0 5% 0; z-index: 1; } main { height: 100%; + margin-left: auto; + margin-right: auto; } #rescale_screen { diff --git a/src/app/components/home/home-page/home-page.component.scss b/src/app/components/home/home-page/home-page.component.scss index a8c1e2067414cd8056b95130ba1719fb1d8d06f1..39f40f5d8a3fcc48ab2b60c021454d76d378dd95 100644 --- a/src/app/components/home/home-page/home-page.component.scss +++ b/src/app/components/home/home-page/home-page.component.scss @@ -17,6 +17,7 @@ .main-heading-secondary { display: block; + margin-top: 5vh; font-weight: bold; font-size: 80%; text-align: center; @@ -71,7 +72,7 @@ mat-card-header { .screenshot { display: block; - margin-top: -30px; + margin-top: -20px; margin-left: auto; margin-right: auto; max-width: 100%; diff --git a/src/app/components/home/new-landing/new-landing.component.scss b/src/app/components/home/new-landing/new-landing.component.scss index 78cfaa9bd746af52830db546092dc1c6d51c398a..80f3b9231884d3823e7e536e4dd420e1666bf7bb 100644 --- a/src/app/components/home/new-landing/new-landing.component.scss +++ b/src/app/components/home/new-landing/new-landing.component.scss @@ -2,7 +2,7 @@ width: 100%; height: 60px; border-radius: 5px; - margin: 10% 0 2% 0; + margin: 10% 0 17% 0; font-size: large; background-color: var(--background); color: var(--on-background); diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html index 16e56f2305dd069dc0d2b9d8d96328ed19bd02ba..912da28b8d36d28319dd347ce0084be44a9b1374 100644 --- a/src/app/components/shared/header/header.component.html +++ b/src/app/components/shared/header/header.component.html @@ -82,11 +82,18 @@ </div> <!--Feedback im Hörsaal--> - <h2 class="oldtypo-h2" - *ngIf="router.url.includes('home')" + <h2 class="header-slogan-mobile" + *ngIf="router.url.includes('home') && deviceType === 'mobile'" + fxLayoutAlign="center center"> + {{ 'header.home-header' | translate }} + </h2> + + <h2 class="header-slogan-desktop" + *ngIf="router.url.includes('home') && deviceType === 'desktop'" fxLayoutAlign="center center"> {{ 'header.home-header' | translate }} </h2> + <span class="fill-remaining-space"></span> <mat-menu #userMenu="matMenu" diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss index bf2188c10f2582ab7b531bc00566e192fc1d7324..3e8515d2ca5698e80bf634c06893afaec86bedd8 100644 --- a/src/app/components/shared/header/header.component.scss +++ b/src/app/components/shared/header/header.component.scss @@ -70,6 +70,20 @@ h2 { font-size: medium !important; } +.header-slogan-desktop { + margin-right: 10px; + margin-left: 120px; + font-size: medium !important; + color: var(--on-background); +} + +.header-slogan-mobile { + margin-right: 10px; + margin-left: 60px; + font-size: medium !important; + color: var(--on-background); +} + .label-icon { display: flex; align-items: center; diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts index 4c4097e7bc240b1ca9b705b7a9b4547dfc7883e3..13618fdf7522f89357c1f0d8b23e3a32b34e03df 100644 --- a/src/app/components/shared/header/header.component.ts +++ b/src/app/components/shared/header/header.component.ts @@ -39,7 +39,6 @@ export class HeaderComponent implements OnInit { user: User; cTime: string; shortId: string; - deviceType: string; isSafari = 'false'; moderationEnabled: boolean; motdState = false; @@ -51,6 +50,7 @@ export class HeaderComponent implements OnInit { private _subscriptionRoomService = null; toggleUserActivity=false; userActivity=0; + deviceType = localStorage.getItem('deviceType'); constructor(public location: Location, private authenticationService: AuthenticationService, diff --git a/src/app/components/shared/quiz-now/quiz-now.component.ts b/src/app/components/shared/quiz-now/quiz-now.component.ts index 1a0d3825a190838bb4cce68ed24e30415f004ddf..2c7fc356db5be3d03f20231a83858d9e7b19fc42 100644 --- a/src/app/components/shared/quiz-now/quiz-now.component.ts +++ b/src/app/components/shared/quiz-now/quiz-now.component.ts @@ -11,6 +11,6 @@ export class QuizNowComponent { constructor(public sanitizer: DomSanitizer) { } ngOnInit() { - this.urlSafe= this.sanitizer.bypassSecurityTrustResourceUrl("https://antworte.jetzt/"); + this.urlSafe= this.sanitizer.bypassSecurityTrustResourceUrl("https://staging.antworte.jetzt/"); } } diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json index 58933e2dc57ae67bf394dcaef010554cfe0f9935..6fd89c07b796e074008098e52e69a44048032e0c 100644 --- a/src/assets/i18n/home/de.json +++ b/src/assets/i18n/home/de.json @@ -194,7 +194,7 @@ "restart-account-activation-correct": "Der Aktivierungs-Schlüssel wurde erneut gesendet.", "restart-account-activation-tooltip": "Sendet den Aktivierungs-Schlüssel erneut an die angegebene Adresse.", "welcome": "»Haben Sie Fragen?«", - "welcome-feedback": "➜ Feedback an die Entwickler von »frag.jetzt«", + "welcome-feedback": "➜ Feedback an das »frag.jetzt«-Team", "feedback-aria": "Baggs, Features, Lob und Tadel kannst du über diesen Link in unserer Feedback-Säschen äussern." }, "overlay": { diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json index eab0f7d8c19fe8c0c62a360dc90436bca49ab9c1..482ca7cc8f2d8ad708781d3ab9a022fafc2d8786 100644 --- a/src/assets/i18n/home/en.json +++ b/src/assets/i18n/home/en.json @@ -196,7 +196,7 @@ "restart-account-activation-tooltip": "Sends the activation key again", "welcome": "»Any questions?«", "welcome-subtitle": "anonymous | in your browser | for free", - "welcome-feedback": "➜ Feedback to the developers of »frag.jetzt«", + "welcome-feedback": "➜ Feedback to the »frag.jetzt« team", "feedback-aria": "Please use the following Link to offer the developers bugs, features, praise and blame" }, "overlay": {