From f58376769c74c0e74c1b4858b48c4811d0dc974f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 13 Oct 2020 10:56:38 +0200 Subject: [PATCH] Minor UI fixes. --- backend/i18n/frontend_en.json | 5 +++-- backend/i18n/frontend_it.json | 1 + backend/i18n/frontend_nl.json | 1 + backend/i18n/source/frontend_en.json | 5 +++-- .../schema/fields/forms/field-form-ui.component.html | 10 +++++++--- .../fields/forms/field-form-validation.component.html | 2 +- .../fields/types/string-validation.component.html | 4 +++- frontend/app/theme/_bootstrap-vars.scss | 2 ++ 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index 035f51931..ef0ab7b06 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -663,11 +663,12 @@ "schemas.field.enable": "Enable in UI", "schemas.field.enabledMarker": "Enabled", "schemas.field.halfWidth": "Half Width", + "schemas.field.halfWidthHint": "Shows the field with only the half width when on the edit or create page, when there is enough space.", "schemas.field.hiddenMarker": "Hidden", "schemas.field.hide": "Hide in API", - "schemas.field.hintsHint": "Describe this schema for documentation and user interfaces.", + "schemas.field.hintsHint": "Describe this field for documentation and the UI.", "schemas.field.inlineEditable": "Inline Editable", - "schemas.field.labelHint": "Display name for documentation and user interfaces.", + "schemas.field.labelHint": "Display name for documentation and the UI.", "schemas.field.localizable": "Localizable", "schemas.field.localizableHint": "You can mark the field as localizable. It means that is dependent on the language, for example a city name.", "schemas.field.localizableMarker": "localizable", diff --git a/backend/i18n/frontend_it.json b/backend/i18n/frontend_it.json index 8284cdfea..5f363bfdc 100644 --- a/backend/i18n/frontend_it.json +++ b/backend/i18n/frontend_it.json @@ -663,6 +663,7 @@ "schemas.field.enable": "Abilita nella UI", "schemas.field.enabledMarker": "Abilitato", "schemas.field.halfWidth": "Half Width", + "schemas.field.halfWidthHint": "Shows the field with only the half width when on the edit or create page, when there is enough space.", "schemas.field.hiddenMarker": "Nasconsto", "schemas.field.hide": "Nascondi nelle API", "schemas.field.hintsHint": "Descrivi questo schema per la documentazione e le interfacce utente.", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index 494565614..3ff18cbad 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -663,6 +663,7 @@ "schemas.field.enable": "Inschakelen in gebruikersinterface", "schemas.field.enabledMarker": "Ingeschakeld", "schemas.field.halfWidth": "Half Width", + "schemas.field.halfWidthHint": "Shows the field with only the half width when on the edit or create page, when there is enough space.", "schemas.field.hiddenMarker": "Verborgen", "schemas.field.hide": "Verbergen in API", "schemas.field.hintsHint": "Beschrijf dit schema voor documentatie en gebruikersinterfaces.", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index 035f51931..ef0ab7b06 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -663,11 +663,12 @@ "schemas.field.enable": "Enable in UI", "schemas.field.enabledMarker": "Enabled", "schemas.field.halfWidth": "Half Width", + "schemas.field.halfWidthHint": "Shows the field with only the half width when on the edit or create page, when there is enough space.", "schemas.field.hiddenMarker": "Hidden", "schemas.field.hide": "Hide in API", - "schemas.field.hintsHint": "Describe this schema for documentation and user interfaces.", + "schemas.field.hintsHint": "Describe this field for documentation and the UI.", "schemas.field.inlineEditable": "Inline Editable", - "schemas.field.labelHint": "Display name for documentation and user interfaces.", + "schemas.field.labelHint": "Display name for documentation and the UI.", "schemas.field.localizable": "Localizable", "schemas.field.localizableHint": "You can mark the field as localizable. It means that is dependent on the language, for example a city name.", "schemas.field.localizableMarker": "localizable", diff --git a/frontend/app/features/schemas/pages/schema/fields/forms/field-form-ui.component.html b/frontend/app/features/schemas/pages/schema/fields/forms/field-form-ui.component.html index 9ce287760..e66cf7103 100644 --- a/frontend/app/features/schemas/pages/schema/fields/forms/field-form-ui.component.html +++ b/frontend/app/features/schemas/pages/schema/fields/forms/field-form-ui.component.html @@ -1,5 +1,5 @@
-
+
@@ -43,14 +43,18 @@
-
-
+
+
+ + + {{ 'schemas.field.halfWidthHint' | sqxTranslate }} +
diff --git a/frontend/app/features/schemas/pages/schema/fields/forms/field-form-validation.component.html b/frontend/app/features/schemas/pages/schema/fields/forms/field-form-validation.component.html index f0faa91be..d3a3b57d7 100644 --- a/frontend/app/features/schemas/pages/schema/fields/forms/field-form-validation.component.html +++ b/frontend/app/features/schemas/pages/schema/fields/forms/field-form-validation.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/frontend/app/features/schemas/pages/schema/fields/types/string-validation.component.html b/frontend/app/features/schemas/pages/schema/fields/types/string-validation.component.html index 6148d896b..ae4bc8db4 100644 --- a/frontend/app/features/schemas/pages/schema/fields/types/string-validation.component.html +++ b/frontend/app/features/schemas/pages/schema/fields/types/string-validation.component.html @@ -61,8 +61,10 @@
+ +
-
+
diff --git a/frontend/app/theme/_bootstrap-vars.scss b/frontend/app/theme/_bootstrap-vars.scss index 7ef50b115..c8f0eae58 100644 --- a/frontend/app/theme/_bootstrap-vars.scss +++ b/frontend/app/theme/_bootstrap-vars.scss @@ -10,6 +10,8 @@ $h4-font-size: $font-size-base * 1.1; $h5-font-size: $font-size-base; $h6-font-size: $font-size-base; +$small-font-size: 90%; + $body-bg: $color-background; $border-color: $color-border;