From 0e46f8eceacc4fc474f58dc37d04b4c0792eb70f Mon Sep 17 00:00:00 2001 From: rhenck <richard.henck@iqb.hu-berlin.de> Date: Sat, 20 Nov 2021 22:36:32 +0100 Subject: [PATCH] Change default font size to 20px --- projects/common/models/button-element.ts | 2 +- projects/common/models/checkbox-element.ts | 2 +- projects/common/models/compound-elements/drop-list.ts | 2 +- projects/common/models/compound-elements/likert-element.ts | 2 +- projects/common/models/compound-elements/radio-group-images.ts | 2 +- projects/common/models/dropdown-element.ts | 2 +- projects/common/models/radio-button-group-element.ts | 2 +- projects/common/models/text-area-element.ts | 2 +- projects/common/models/text-field-element.ts | 2 +- projects/common/util/unit-interface-initializer.ts | 2 +- projects/editor/src/app/text-editor/font-size-extension.ts | 2 +- projects/editor/src/app/text-editor/orderedList-extension.ts | 2 +- .../editor/src/app/text-editor/rich-text-editor.component.ts | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/common/models/button-element.ts b/projects/common/models/button-element.ts index 683f72e19..7e189f55f 100644 --- a/projects/common/models/button-element.ts +++ b/projects/common/models/button-element.ts @@ -10,7 +10,7 @@ export class ButtonElement extends UIElement implements FontElement, SurfaceUIEl fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/checkbox-element.ts b/projects/common/models/checkbox-element.ts index 67dd466bf..4f748b1d2 100644 --- a/projects/common/models/checkbox-element.ts +++ b/projects/common/models/checkbox-element.ts @@ -5,7 +5,7 @@ import { initFontElement, initSurfaceElement } from '../util/unit-interface-init export class CheckboxElement extends InputElement implements FontElement, SurfaceUIElement { fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/compound-elements/drop-list.ts b/projects/common/models/compound-elements/drop-list.ts index 7ebc50b24..dbec05359 100644 --- a/projects/common/models/compound-elements/drop-list.ts +++ b/projects/common/models/compound-elements/drop-list.ts @@ -12,7 +12,7 @@ export class DropListElement extends InputElement implements FontElement, Surfac fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/compound-elements/likert-element.ts b/projects/common/models/compound-elements/likert-element.ts index 67cb0263b..fab02a0f0 100644 --- a/projects/common/models/compound-elements/likert-element.ts +++ b/projects/common/models/compound-elements/likert-element.ts @@ -13,7 +13,7 @@ export class LikertElement extends CompoundElement implements FontElement, Surfa fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/compound-elements/radio-group-images.ts b/projects/common/models/compound-elements/radio-group-images.ts index b2797f80b..68934fed7 100644 --- a/projects/common/models/compound-elements/radio-group-images.ts +++ b/projects/common/models/compound-elements/radio-group-images.ts @@ -7,7 +7,7 @@ export class RadioGroupImagesElement extends InputElement implements FontElement fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/dropdown-element.ts b/projects/common/models/dropdown-element.ts index f8022b38c..3773e738f 100644 --- a/projects/common/models/dropdown-element.ts +++ b/projects/common/models/dropdown-element.ts @@ -8,7 +8,7 @@ export class DropdownElement extends InputElement implements FontElement, Surfac fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/radio-button-group-element.ts b/projects/common/models/radio-button-group-element.ts index 65168a470..b09d2f485 100644 --- a/projects/common/models/radio-button-group-element.ts +++ b/projects/common/models/radio-button-group-element.ts @@ -9,7 +9,7 @@ export class RadioButtonGroupElement extends InputElement implements FontElement fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/text-area-element.ts b/projects/common/models/text-area-element.ts index f7a668bd3..3b28683e9 100644 --- a/projects/common/models/text-area-element.ts +++ b/projects/common/models/text-area-element.ts @@ -9,7 +9,7 @@ export class TextAreaElement extends InputElement implements FontElement, Surfac fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/models/text-field-element.ts b/projects/common/models/text-field-element.ts index a92ace4a3..639db0d8c 100644 --- a/projects/common/models/text-field-element.ts +++ b/projects/common/models/text-field-element.ts @@ -18,7 +18,7 @@ export class TextFieldElement extends InputElement implements FontElement, Surfa fontColor: string = 'black'; font: string = 'Roboto'; - fontSize: number = 18; + fontSize: number = 20; lineHeight: number = 120; bold: boolean = false; italic: boolean = false; diff --git a/projects/common/util/unit-interface-initializer.ts b/projects/common/util/unit-interface-initializer.ts index fdef76376..6314b66c5 100644 --- a/projects/common/util/unit-interface-initializer.ts +++ b/projects/common/util/unit-interface-initializer.ts @@ -5,7 +5,7 @@ export function initFontElement(serializedElement: UIElement): FontElement { return { fontColor: serializedElement.fontColor as string || '#000000', font: serializedElement.font as string || 'Roboto', - fontSize: serializedElement.fontSize as number || 18, + fontSize: serializedElement.fontSize as number || 20, lineHeight: serializedElement.lineHeight as number || 120, bold: serializedElement.bold !== undefined ? serializedElement.bold as boolean : false, italic: serializedElement.italic !== undefined ? serializedElement.italic as boolean : false, diff --git a/projects/editor/src/app/text-editor/font-size-extension.ts b/projects/editor/src/app/text-editor/font-size-extension.ts index 97cdbf274..efe67d187 100644 --- a/projects/editor/src/app/text-editor/font-size-extension.ts +++ b/projects/editor/src/app/text-editor/font-size-extension.ts @@ -13,7 +13,7 @@ export const fontSizeExtension = TextStyle.extend({ addAttributes() { return { fontSize: { - default: '16px', + default: '20px', parseHTML: element => element.style.fontSize, renderHTML: attributes => ({ style: `font-size: ${attributes.fontSize}` diff --git a/projects/editor/src/app/text-editor/orderedList-extension.ts b/projects/editor/src/app/text-editor/orderedList-extension.ts index f9fc60c36..cffc604f3 100644 --- a/projects/editor/src/app/text-editor/orderedList-extension.ts +++ b/projects/editor/src/app/text-editor/orderedList-extension.ts @@ -21,7 +21,7 @@ export const orderedListExtension = OrderedList.extend({ }) }, fontSize: { - default: '16px', + default: '20px', parseHTML: element => element.style.fontSize, renderHTML: attributes => ({ style: `font-size: ${attributes.fontSize}` diff --git a/projects/editor/src/app/text-editor/rich-text-editor.component.ts b/projects/editor/src/app/text-editor/rich-text-editor.component.ts index 78a45f800..dea688f4a 100644 --- a/projects/editor/src/app/text-editor/rich-text-editor.component.ts +++ b/projects/editor/src/app/text-editor/rich-text-editor.component.ts @@ -31,7 +31,7 @@ export class RichTextEditorComponent implements AfterViewInit { selectedFontColor = 'lightgrey'; selectedHighlightColor = 'lightgrey'; - selectedFontSize = '16px'; + selectedFontSize = '20px'; bulletListStyle: string = 'disc'; orderedListStyle: string = 'decimal'; -- GitLab