Merge branch 'release/1.2.5-beta'

qcif · Aug 6, 2020 · 11f9622 · 11f9622
2 parents a174518 + dc0770d
commit 11f9622
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "DataCurator",
-  "version": "1.2.4-beta",
+  "version": "1.2.5-beta",
   "author": " <matt@redboxresearchdata.com.au>",
   "description": "Data Curator is a simple desktop CSV editor to help describe, validate and share usable open data",
   "license": "MIT",

diff --git a/src/renderer/mixins/PreferencesTooltip.vue b/src/renderer/mixins/PreferencesTooltip.vue
@@ -11,6 +11,10 @@ export default {
     'tooltipPreferencesContributors': {
       components: { externalLink },
       template: `<div id="tooltip-preferences-contributors">Each <externalLink text="Contributor" url="http://frictionlessdata.io/specs/data-package/#contributors"/> must have a title and may contain path, email, role and organization</div>`
+    },
+    'tooltipPreferencesCustoms': {
+      components: { externalLink },
+      template: `<div id="tooltip-preferences-customs">Custom properties enable setting custom metadata key/value pairs. Each custom property can be configured for one or all of Package, Table and/or Column Properties. Once created, a custom property will be available from its selected property's panel in order to set a value.</div>`
     }
   },
   extends: Tooltip

diff --git a/src/renderer/partials/Preferences.vue b/src/renderer/partials/Preferences.vue
@@ -72,7 +72,9 @@ export default {
         },
         {
           label: 'Custom Properties',
-          key: 'customs'
+          key: 'customs',
+          tooltipId: 'tooltip-preferences-customs',
+          tooltipView: 'tooltipPreferencesCustoms'
         }]
     }
   },

diff --git a/static/css/customs.styl b/static/css/customs.styl
@@ -17,20 +17,23 @@
           width 100%
           padding-left 10px !important
         .input-group-addon
-          width: 30%
+          width 30%
           max-width 200px
           overflow-x scroll
+        .input-group-addon::-webkit-scrollbar
+          display none
         .custom-types
-          display: flex
+          display flex
           flex-direction row
           align-items stretch
           .checkbox-inline
-            margin: 0px 0px 0px 0px
-            display: flex
+            margin 0px 0px 0px 0px
+            display flex
             flex-direction row
             justify-content space-between
             input
               margin-left 0px
+              width 15px
             span
               margin 0px 5px 0px 20px
     .inputs-container.preferences