diff --git a/src/app/app.config.ts b/src/app/app.config.ts index fb0800330..8a29002df 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -236,4 +236,4 @@ export interface CustomEditorialConvention { }; } -export type TextFlow = 'prose' | 'prose_strict' | 'verses'; +export type TextFlow = 'prose' | 'prose_mixed' | 'verses'; diff --git a/src/app/components/verse-prose-select/verse-prose-select.component.ts b/src/app/components/verse-prose-select/verse-prose-select.component.ts index 1fcac2ed7..a1d7ebd36 100644 --- a/src/app/components/verse-prose-select/verse-prose-select.component.ts +++ b/src/app/components/verse-prose-select/verse-prose-select.component.ts @@ -12,7 +12,7 @@ export class VerseProseSelectComponent { @Output() textModeSelectionChange: EventEmitter = new EventEmitter(); - public textFlowTypes: TextFlow[] = ['prose_strict', 'prose', 'verses']; + public textFlowTypes: TextFlow[] = ['prose', 'prose_mixed', 'verses']; public selectedType: TextFlow = 'prose'; diff --git a/src/app/components/verse/verse.component.html b/src/app/components/verse/verse.component.html index f7ca56cf1..78f5aaa7d 100644 --- a/src/app/components/verse/verse.component.html +++ b/src/app/components/verse/verse.component.html @@ -1,6 +1,6 @@ - {{data.n}} + {{data.n}} diff --git a/src/app/components/verse/verse.component.scss b/src/app/components/verse/verse.component.scss index dc6d50d22..fc1ac74e8 100644 --- a/src/app/components/verse/verse.component.scss +++ b/src/app/components/verse/verse.component.scss @@ -12,9 +12,6 @@ height: 16px; color: get-color(versesColor); font-size: 0.7em; - border: 1px solid #000000b5; - border-radius: 8px; - padding-bottom: 1rem; &:before { content: ''; width: 100%; @@ -41,4 +38,10 @@ } } } + .verse-baloon { + border: 1px solid #000000b5; + border-radius: 8px; + padding-bottom: 1rem; + padding-right: 0.1rem; + } } diff --git a/src/app/components/verse/verse.component.ts b/src/app/components/verse/verse.component.ts index 1228e790e..e9e92b9ff 100644 --- a/src/app/components/verse/verse.component.ts +++ b/src/app/components/verse/verse.component.ts @@ -45,8 +45,12 @@ export class VerseComponent { return !isNaN(num) && num % this.verseNumberPrinter !== 0; } + get baloon() { + return this.textFlow !== 'verses'; + } + get plainTextFlow() { - return this.textFlow === 'prose_strict'; + return this.textFlow === 'prose'; } constructor( diff --git a/src/assets/config/custom-styles.css b/src/assets/config/custom-styles.css index c7a165345..efa0aad6e 100644 --- a/src/assets/config/custom-styles.css +++ b/src/assets/config/custom-styles.css @@ -32,10 +32,6 @@ vertical-align: text-bottom; } -evt-verse { - display: block; -} - evt-page :not(evt-apparatus-entry-detail) .head { font-weight: bold; display: inline-block; diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 4550b41a8..9670994aa 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -51,9 +51,9 @@ "omitted": "omitted", "prose": "Prose", "verses": "Verses", - "option_prose": "Prose with verse numbers", + "option_prose": "Prose", + "option_prose_mixed": "Prose with verse numbers", "option_verses": "Verses", - "option_prose_strict": "Prose", "page": "Page {{value}}", "front": "Front", "mainText": "Main text", diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json index a2b1f7c36..259a50e42 100644 --- a/src/assets/i18n/it.json +++ b/src/assets/i18n/it.json @@ -50,9 +50,9 @@ "omitted": "omissione", "prose": "Prosa", "verses": "Versi", - "option_prose": "Prose with verse numbers", + "option_prose": "Prose", + "option_prose_mixed": "Prose with verse numbers", "option_verses": "Verses", - "option_prose_strict": "Prose", "page": "Pagina {{value}}", "front": "Front", "mainText": "Testo principale",