Commit e920c037 authored by Christopher Mark Fullarton's avatar Christopher Mark Fullarton
Browse files

Adjusts styling

parent 978be4a8
......@@ -47,6 +47,16 @@
"src/styles/themes"
]
},
"fileReplacements": [
{
"replace": "src/assets/images/logo.svg",
"with": "src/assets/images/logo.westermann.svg"
},
{
"replace": "src/assets/images/logo_transparent.png",
"with": "src/assets/images/logo_transparent.westermann.png"
}
],
"styles": [
"src/styles/styles.scss",
"node_modules/prism-themes/themes/prism-ghcolors.css",
......
......@@ -2,7 +2,8 @@
id="header">
<div class="arsnova-logo d-flex align-items-center cursor-pointer">
<a [routerLink]="['/']">
<svg-icon class="text-white"
<svg-icon [svgStyle]="{height: '60px', width: '60px'}"
class="text-white"
src="/assets/images/logo.svg"></svg-icon>
</a>
</div>
......
......@@ -93,3 +93,7 @@ export enum DeprecatedKeys {
export enum DeprecatedDb {
DEFAULT = 'DEFAULT', //
}
export enum Title {
Default, Westermann
}
import { LoginMechanism } from '../enums/enums';
import { LoginMechanism, Title } from '../enums/enums';
import { QuizTheme } from '../enums/QuizTheme';
export interface IEnvironment {
title: Title;
enableCasLogin: boolean;
sentryDSN?: string;
version: string;
......
<ng-template #arsclaim>
<span class="color-changing-ars logo-header-chars">a r s </span>
<span class="color-changing-nova logo-header-chars">n o v a </span>
<span class="color-changing-dot logo-header-dot">. </span>
<span class="color-changing-click logo-header-chars logo-header-margin-for-dot">c l i c k</span>
</ng-template>
<div class="row flex-column"
id="landingPageContent">
<div *ngIf="!isShowingQuiznameDatalist"
class="col-12 text-center my-5 my-sm-5"
id="arsnova-click-description">
<h1 class="text-center header-label text-bold my-0">
<span class="color-changing-ars logo-header-chars">a r s </span>
<span class="color-changing-nova logo-header-chars">n o v a </span>
<span class="color-changing-dot logo-header-dot">. </span>
<span class="color-changing-click logo-header-chars logo-header-margin-for-dot">c l i c k</span>
<h1 *ngIf="selectedTitle === Title.Default"
class="text-center header-label text-bold my-0">
<ng-container *ngTemplateOutlet="arsclaim"></ng-container>
</h1>
<div *ngIf="selectedTitle === Title.Westermann"
class="row">
<div class="col-md-10 col-xl-8 offset-md-1 offset-xl-2">
<h1>Westermann Quiz</h1>
<h6 class="text-right"
style="color: #5a5758; font-size: 90%;">
<span class="mr-2">Powered by</span>
<ng-container *ngTemplateOutlet="arsclaim"></ng-container>
</h6>
</div>
</div>
</div>
<div [class.mt-sm-5]="!isShowingQuiznameDatalist"
class="col-md-10 col-xl-8 offset-md-1 offset-xl-2">
......@@ -188,7 +204,8 @@
</div>
<ng-container *ngIf="!isShowingQuiznameDatalist">
<div class="col-12 text-center mt-5">
<p [innerHTML]="'component.name_home.demo_quiz.title.3' | translate"></p>
<p *ngIf="selectedTitle === Title.Default"
[innerHTML]="'component.name_home.demo_quiz.title.3' | translate"></p>
<p>
<a *ngIf="canUsePublicQuizzes && publicQuizAmount > 0"
[routerLink]="['/quiz', 'public']">{{'component.home.view-public' | translate:{amount: publicQuizAmount} }}
......@@ -200,12 +217,5 @@
</a>
</p>
</div>
<div *ngIf="claimSrc"
class="col-12 mt-5 justify-content-center d-flex">
<img [src]="claimSrc"
alt="claim"
style="width: auto;height: 90px;"/>
</div>
</ng-container>
</div>
......@@ -7,10 +7,6 @@
#landingPageContent {
#arsnova-click-description {
color: #fff;
}
#collapse-quiz-name-datalist {
right: 0;
font-size: 2rem;
......
......@@ -12,7 +12,7 @@ import { AbstractAnswerEntity } from '../../lib/entities/answer/AbstractAnswerEn
import { DefaultAnswerEntity } from '../../lib/entities/answer/DefaultAnswerEntity';
import { ABCDSingleChoiceQuestionEntity } from '../../lib/entities/question/ABCDSingleChoiceQuestionEntity';
import { QuizEntity } from '../../lib/entities/QuizEntity';
import { Language, StorageKey } from '../../lib/enums/enums';
import { Language, StorageKey, Title } from '../../lib/enums/enums';
import { MessageProtocol, StatusProtocol } from '../../lib/enums/Message';
import { QuestionType } from '../../lib/enums/QuestionType';
import { QuizState } from '../../lib/enums/QuizState';
......@@ -56,7 +56,8 @@ export class HomeComponent implements OnInit, OnDestroy {
public canUsePublicQuizzes: boolean = !environment.requireLoginToCreateQuiz;
public showJoinableQuizzes: boolean = environment.showJoinableQuizzes;
public isQueryingQuizState: boolean;
public readonly claimSrc = environment.claimSrc;
public Title = Title;
public readonly selectedTitle = environment.title;
private _serverPassword = '';
......
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="43.000000pt" height="43.000000pt" viewBox="0 0 43.000000 43.000000"
preserveAspectRatio="xMidYMid meet">
<metadata>
Created by potrace 1.15, written by Peter Selinger 2001-2017
</metadata>
<g transform="translate(0.000000,43.000000) scale(0.100000,-0.100000)"
fill="#ed1c24" stroke="none">
<path d="M140 419 c-79 -31 -137 -117 -138 -205 0 -67 38 -138 96 -179 39 -27
52 -30 117 -30 65 0 78 3 117 30 127 89 126 274 -1 359 -36 24 -57 30 -105 32
-34 1 -72 -2 -86 -7z m0 -136 c-1 -16 -1 -46 0 -68 1 -38 2 -39 12 -15 6 14
12 27 12 30 1 3 10 22 20 43 16 31 23 38 45 35 27 -3 28 -4 30 -93 l1 -40 14
30 c8 17 22 47 31 68 13 28 23 37 41 37 13 0 24 -2 24 -5 0 -3 -21 -48 -46
-100 -42 -88 -48 -95 -75 -95 -26 0 -29 3 -30 33 0 17 -4 40 -8 50 -5 15 -11
9 -31 -32 -20 -44 -27 -51 -52 -51 -15 0 -29 6 -30 13 -10 85 -16 176 -10 182
3 3 16 5 29 5 20 0 24 -5 23 -27z"/>
</g>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg enable-background="new 0 0 100 100"
height="100px"
id="Layer_1"
version="1.1"
viewBox="0 0 100 100"
width="100px"
x="0px"
xml:space="preserve"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
y="0px"> <image height="100"
id="image0"
width="100"
x="0"
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAMAAABHPGVmAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAC7lBMVEUAAADWABzWABzWABzW
ABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzW
ABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzW
ABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABzWABze
MUjgQFXXCCPbIDjcJDzfNkzfOlD1wMf////2yM7vnqnaGzT//f3xqLLbIjrfO1Hzs7vqfYvgPVL0
ucHeMEfyrrf2xcvWAh764OP40dbysLncIzv//v752NzhRlrmZnfulKD86uzyrbb98PLYCybxpa/Z
Eiz99fbaFjD++vvtjprvnKfeMknqe4nZESvpdoXbITntkJzXBiH75+rWAR352d3rg5HlYHHhQ1jp
eYjiSV3409jyr7j3zNLob3/jUGPlW23bHjflXG7lX3HlXnD0usLobn7sh5T64+bXBSDjT2LmY3Td
LUTXByL86+3oc4LgP1TocIDwn6r++frulaHYDSjeL0bpeIfaGTL41Nn2ytDsiJXbHzjrgI7rhZLh
RVn0vcTtjJn87vD40tfxqrP3zdLwpK7vm6bnbHzlXW/ul6L64eT75unxq7T53OD75OfrhJL99PXs
iZbjUmXYDCf87/HdLkX0vMP98/TZECrkWmzzsrr52t7fOE7hR1vdK0Ltkp7//PzeNErgPlP0uMDx
prDjU2b2xMrYCiXtkZ3eM0nmZXbfNUv1v8b+9/jpd4biS1/sipfZFS/iSl775ej41tv3z9Tvnaj+
+PnmYnPmZHXysbr529/30NX76Ovxp7H1vsXhRFnztLzwoavztr7ZEy3qf4376ev63+Pna3v++/vk
V2ndKkHgQVbyrLXjUWTZFC7qfozuk5/naXnocYH87O7XCST3y9HjTmHrgY/519vXBCDshpO5jGyk
AAAAPHRSTlMAIE55mrrU5vgudbLsAj2T5Rx+4X8zpfwxsBqiGwNy9CrLAWr3DKoh1TbpQvahppTk
TbnT5/kyzICVL0+Hhj1QAAAAAWJLR0RFjrOoVwAAAAd0SU1FB+MMGw0KC3sJXEIAAAYTSURBVGje
vZpnYBRFFMc39dJjSAfSe8BENBHLA0lkNYkNJRYEpAgRMRACNhSDBrFEBYRERAVRrIjRiKAgRtFg
A0WxoKgoKvaOWL65e7fzZmZ3dm+vZN+nmfefeb+bvd3pkmTTQkLDwiMiXVGgWJQrMiI8LDTEbl1b
Fh0TGwcCi4uNiQ4KID4h8QiwMFdiQnyAiKQByeDVklOSAkCkpqV7R6iWnpbqJyIj0x7BY5kZfiAG
DvIFodqgwT4isrJzfGUA5GRn+cLIzfMdoVperm1EfkGhfwyAwoJ8e4yiYn8RqhUX2WGUlAbCACgt
8c4oKw+MAVBe5o0xZGigDIChQ6wZoVGBM5ReOtSyHUFhKBSLtpQF4VlpT8z0fykJ+D+nVm7yjhVF
Bo+hvMnC7yU/oG/QaMWib78guAyAAiMj1+/+yswKc/WMLD/7XSvL0/f82cFnAGTzjIF+jFHeLYcf
K4/sD4YyIrOMjP5hALCzC5/mJb5YpnlDRoxEO0knjaJSjT5iLUono4/Ox9J0pUfLaKN00ilUOlUn
1dWj1IDOCsJISjeHnMYrp1NFPkNX60wqnYXOdDKDHaBv9xha/GxeOYeBjOWlxnNROY9xp3gY8YY5
9flmkAvGMZAL+UrjqTKBcSd75vwJYBsykWHIF/GVJqEweQrrT3BDEg2QqSaQi6exkHquzvQmFC7h
hEo35CgDZAaNdCnrnylzdhmrNVP4LC6YSx1Xog0MmE0DjWTcLXN4CPuhtM5F9yRdNHXFF2OEzBND
LucZci2jXSF6fz0Wo0BijZAraY2rmB97tQ7CaDAfvdfoo8UqkDgj5FoaaAH1jtcx5Ouo1ka/9oX6
aHHK+tzIgOtpoBuot10PWUS1G9G5+CZDuBBpmAByMw10Czpv1TPkeah13IbO243hQqUwAeQOGmgJ
OpcS1zKSuFPQ9MnLjeHCpHABZAWFdBJfF/nY2u8iGu1rV2L5uwXhwqWjBd5VFHIP8d1LPPetJql2
otVi8aYuQbgI6RiBdzmFrNFcU+7XHGtbHyDag6T8Oiw+QxANIiWXyE37oYc0z8PE8Qg8SpKPaVod
Fq+vEUWrkoQrkscRst7jaHxCy29ogSeJ1q2VfgpLN4iCQbUkdK/Fatpzf5rkmwEWodji1nqeQcdG
YTQQQ57Fais9jrFadtNmgOdQ7OKfpPw8+AJpwHpb3PmtJKsOFS+guI17krK81SfIi1jPM/yt13K9
q5TMSyi+rGoLMLsdzCDCP76TvvhqdlavlntFzbWh+Kqa7fPakGrxK8yMHDuU7Gsk87oq7kDtDSX3
JuZWmzWkSvgxMo9dVh7Q5m4t/ZZH3Um0TuZJ8uMbZ5HCbgU2Uogy/O0i6bc96gaSfwegBidJo80Y
Srci6iBhN4W8Cy3vack9rR71faJ9APTzN2+I0kGGCf0fYt2PYCFJ7tVEHL0+hun46MaYMpSufpjQ
/wlCdsE+LfVphyZ+RrQ+2sWYvlqgDlohQv/nWHnNfpKaSUScR+7pIX2z/IU5Qxl+RRMJgC8RMvWA
lpj2FRG/Jto3S7DYCHNGnHhKxAxR8kGSmIjit8T13WKSmm/RkFjx5A5gr6y3cXSl8r1B7P3BAhIj
nqYC/GiI8xMV9xvEpRYM9zRVMOHmRnnj27NCry1rs2C4J9yCpYPSfzfp4vQxYp0eMtuqIZUmiyDF
5uri/MxoHTpt0y9WkAST5ZxiB/g4WxpZsZsXf7ViaMs548JUsd/4OL9z4kFOm9NjBUkxW2Ir9gcX
589DnPgXJ06wYuAS27BZoNhhLs7fvLid1f751wqCmwXSsUZxGxtn525eXMeKh60YzLaHYAPn0D7G
/tOJzYzWYMlgNnCc2YqSfD7Asmfcppoz24OObHT2y5btcMNhnRObz85soztzICAVBXgsx1upyVGg
E4c0zhw3Be/grNryEDA4R4DVlkeAzhxmOnMs68wBszNH5c4c+kv+X18YnmsbITlzEUOxwf1/pUQ1
By7HqJZaYfeaT4W/13xUS0qxc2HpuEAuLKkWn1DpsiK4jg/46pXb8i0ukZ1g/7uwYZ7rcFXVavDq
KvU63IkhdgH/A3r+2E131QiEAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE5LTEyLTI3VDEzOjEwOjEx
KzAzOjAwdSe+tgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOS0xMi0yN1QxMzoxMDoxMSswMzowMAR6
BgoAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC"
y="0"/>
</svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg height="43.000000pt"
preserveAspectRatio="xMidYMid meet"
version="1.0"
viewBox="0 0 43.000000 43.000000"
width="43.000000pt"
xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by potrace 1.15, written by Peter Selinger 2001-2017
</metadata>
<g fill="#ed1c24"
stroke="none"
transform="translate(0.000000,43.000000) scale(0.100000,-0.100000)">
<path d="M140 419 c-79 -31 -137 -117 -138 -205 0 -67 38 -138 96 -179 39 -27
52 -30 117 -30 65 0 78 3 117 30 127 89 126 274 -1 359 -36 24 -57 30 -105 32
-34 1 -72 -2 -86 -7z m0 -136 c-1 -16 -1 -46 0 -68 1 -38 2 -39 12 -15 6 14
12 27 12 30 1 3 10 22 20 43 16 31 23 38 45 35 27 -3 28 -4 30 -93 l1 -40 14
30 c8 17 22 47 31 68 13 28 23 37 41 37 13 0 24 -2 24 -5 0 -3 -21 -48 -46
-100 -42 -88 -48 -95 -75 -95 -26 0 -29 3 -30 33 0 17 -4 40 -8 50 -5 15 -11
9 -31 -32 -20 -44 -27 -51 -52 -51 -15 0 -29 6 -30 13 -10 85 -16 176 -10 182
3 3 16 5 29 5 20 0 24 -5 23 -27z"/>
</g>
</svg>
import { LoginMechanism } from '../app/lib/enums/enums';
import { LoginMechanism, Title } from '../app/lib/enums/enums';
import { QuizTheme } from '../app/lib/enums/QuizTheme';
import { IEnvironment } from '../app/lib/interfaces/IEnvironment';
export const environment: IEnvironment = {
production: true,
title: Title.Default,
version: 'VERSION',
enableCasLogin: true,
sentryDSN: 'https://f16c02fdefe64c018f5d580d1cf05b56@sentry.io/1819496',
......
import { LoginMechanism } from '../app/lib/enums/enums';
import { LoginMechanism, Title } from '../app/lib/enums/enums';
import { QuizTheme } from '../app/lib/enums/QuizTheme';
import { IEnvironment } from '../app/lib/interfaces/IEnvironment';
export const environment: IEnvironment = {
production: true,
title: Title.Westermann,
version: 'VERSION',
enableCasLogin: false,
sentryDSN: 'https://f16c02fdefe64c018f5d580d1cf05b56@sentry.io/1819496',
......
import { LoginMechanism } from '../app/lib/enums/enums';
import { LoginMechanism, Title } from '../app/lib/enums/enums';
import { QuizTheme } from '../app/lib/enums/QuizTheme';
import { IEnvironment } from '../app/lib/interfaces/IEnvironment';
export const environment: IEnvironment = {
production: true,
title: Title.Default,
version: 'VERSION',
enableCasLogin: true,
sentryDSN: 'https://f16c02fdefe64c018f5d580d1cf05b56@sentry.io/1819496',
......
import { LoginMechanism } from '../app/lib/enums/enums';
import { LoginMechanism, Title } from '../app/lib/enums/enums';
import { QuizTheme } from '../app/lib/enums/QuizTheme';
import { IEnvironment } from '../app/lib/interfaces/IEnvironment';
export const environment: IEnvironment = {
production: false,
title: Title.Westermann,
version: 'VERSION',
enableCasLogin: true,
sentryDSN: 'https://f16c02fdefe64c018f5d580d1cf05b56@sentry.io/1819496',
......
import { LoginMechanism } from '../app/lib/enums/enums';
import { LoginMechanism, Title } from '../app/lib/enums/enums';
import { QuizTheme } from '../app/lib/enums/QuizTheme';
import { IEnvironment } from '../app/lib/interfaces/IEnvironment';
export const environment: IEnvironment = {
production: true,
title: Title.Westermann,
enableCasLogin: false,
version: 'VERSION',
ssrEndpoint: 'https://test01.ars.sbzo.de',
......
......@@ -16,7 +16,7 @@ $modal-content-color: #000c19;
$modal-header-border-color: transparent;
$body-bg: #a2c2e42b;
$body-color: $primary_text_color;
$body-color: #5a5758;
$text-muted: $secondary_text_color;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment