From ea5a78ae73fc0c3f95341b2beb1c216f5ec8dccd Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 17 Jun 2015 21:38:03 +0100 Subject: [PATCH] Refining styles and adding locale string defs --- app/locales/locale-en.json | 4 +++- .../includes/modules/admin/admin-custom-attributes.jade | 2 +- app/styles/modules/admin/admin-custom-attributes.scss | 2 +- app/styles/modules/common/custom-fields.scss | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index a45f77e3..c684c476 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -448,7 +448,9 @@ "TASK_DESCRIPTION": "Tasks custom fields", "TASK_ADD": "Add a custom field in tasks", "ISSUE_DESCRIPTION": "Issues custom fields", - "ISSUE_ADD": "Add a custom field in issues" + "ISSUE_ADD": "Add a custom field in issues", + "FIELD_TYPE_TEXT": "Text", + "FIELD_TYPE_MULTI": "Multi-line" }, "PROJECT_VALUES": { "PAGE_TITLE": "{{sectionName}} - Project values - {{projectName}}", diff --git a/app/partials/includes/modules/admin/admin-custom-attributes.jade b/app/partials/includes/modules/admin/admin-custom-attributes.jade index f35912cb..94b35d80 100644 --- a/app/partials/includes/modules/admin/admin-custom-attributes.jade +++ b/app/partials/includes/modules/admin/admin-custom-attributes.jade @@ -11,7 +11,7 @@ section.custom-fields-table.basic-table div.custom-description span(translate="COMMON.FIELDS.DESCRIPTION") div.custom-field-type - span(translate="COMMON.FIELDS.FIELD_TYPE") + span(translate="COMMON.FIELDS.TYPE") div.custom-options div.table-body diff --git a/app/styles/modules/admin/admin-custom-attributes.scss b/app/styles/modules/admin/admin-custom-attributes.scss index a507f240..e0fdfff0 100644 --- a/app/styles/modules/admin/admin-custom-attributes.scss +++ b/app/styles/modules/admin/admin-custom-attributes.scss @@ -70,7 +70,7 @@ } .custom-description { @include ellipsis(100%); - flex-basis: 90%; + flex-basis: 50%; flex-grow: 8; } .custom-field-type { diff --git a/app/styles/modules/common/custom-fields.scss b/app/styles/modules/common/custom-fields.scss index 851a1d04..929546ba 100644 --- a/app/styles/modules/common/custom-fields.scss +++ b/app/styles/modules/common/custom-fields.scss @@ -68,11 +68,11 @@ flex: 1; padding: 0 1rem 0 2rem; .read-mode { - white-space: pre + white-space: pre; } } .read-mode { - white-space: pre + white-space: pre; } form { label {