diff --git a/src/definition/index.js b/src/definition/index.js index 45437c3..9003467 100644 --- a/src/definition/index.js +++ b/src/definition/index.js @@ -1,6 +1,6 @@ import pagination from './pagination'; import header from './header'; -import formatted from './formatted'; +import tableFormat from './table-format'; import conceptSemaphores from './concept-semaphores'; import metricSemaphores from './metric-semaphores'; @@ -21,7 +21,7 @@ const definition = { settings: { items: { ConceptSemaphores: conceptSemaphores, - Formatted: formatted, + Formatted: tableFormat, Header: header, MetricSemaphores: metricSemaphores, Pagination: pagination diff --git a/src/definition/formatted.js b/src/definition/table-format.js similarity index 87% rename from src/definition/formatted.js rename to src/definition/table-format.js index ce210c5..7fbb71f 100644 --- a/src/definition/formatted.js +++ b/src/definition/table-format.js @@ -1,4 +1,4 @@ -const formatted = { +const tableFormat = { type: 'items', label: 'Table Format', items: { @@ -35,10 +35,10 @@ const formatted = { color: '#fff', index: 1 }, - dualOutput: true, label: 'Even row background color', ref: 'rowEvenBGColor', - type: 'object' + type: 'object', + dualOutput: true }, rowOddBGColor: { component: 'color-picker', @@ -46,10 +46,10 @@ const formatted = { color: '#b6d7ea', index: 4 }, - dualOutput: true, label: 'Odd row background color', ref: 'rowOddBGColor', - type: 'object' + type: 'object', + dualOutput: true }, BodyTextColor: { ref: 'BodyTextColorSchema', @@ -110,35 +110,35 @@ const formatted = { label: 'FontFamily', options: [ { - value: 'QlikView Sans', + value: 'QlikView Sans, -apple-system, sans-serif', label: 'QlikView Sans' }, { - value: 'Arial', + value: 'Arial, -apple-system, sans-serif', label: 'Arial' }, { - value: 'Calibri', + value: 'Calibri, -apple-system, sans-serif', label: 'Calibri' }, { - value: 'Comic Sans MS', + value: 'Comic Sans MS, -apple-system, sans-serif', label: 'Comic Sans MS' }, { - value: 'MS Sans Serif', + value: 'MS Sans Serif, -apple-system, sans-serif', label: 'MS Sans Serif' }, { - value: 'Tahoma', + value: 'Tahoma, -apple-system, sans-serif', label: 'Tahoma' }, { - value: 'Verdana', + value: 'Verdana, -apple-system, sans-serif', label: 'Verdana' } ], - defaultValue: 'QlikView Sans' + defaultValue: 'QlikView Sans, -apple-system, sans-serif' }, DataFontSize: { ref: 'lettersize', @@ -230,4 +230,4 @@ const formatted = { } }; -export default formatted; +export default tableFormat; diff --git a/src/main.less b/src/main.less index c950edb..2a9bfe2 100644 --- a/src/main.less +++ b/src/main.less @@ -56,6 +56,7 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-family: inherit; } }