Merge branch 'master' into FLUID-6333

fluid-project · Sep 13, 2018 · 11fb6dd · 11fb6dd
2 parents 7404c62 + 4a66b15
commit 11fb6dd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -455,7 +455,8 @@ module.exports = function (grunt) {
             "distributions" + ( target ? ":" + target : "" ),
             "cleanForDist",
             "verifyDistJS",
-            "verifyDistCSS"
+            "verifyDistCSS",
+            "buildStylus" // put back stylus files needed for development
         ];
         grunt.task.run(tasks);
     });

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "repository": "git://github.com/fluid-project/infusion.git",
     "main": "./src/module/fluid.js",
     "scripts": {
-        "postinstall": "npm run buildStylus",
+        "prepare": "npm run buildStylus",
         "prepublishOnly": "npm run buildDists",
         "pretest": "node node_modules/rimraf/bin.js reports/* coverage/*",
         "test": "npm run test:browser && npm run test:node",

diff --git a/provisioning/vars.yml b/provisioning/vars.yml
@@ -6,8 +6,6 @@ nodejs_app_name: infusion
 
 nodejs_branch: lts
 
-nodejs_npm_version: 3.10.10
-
 nodejs_app_npm_packages:
   - testem
   - istanbul

diff --git a/src/components/overviewPanel/css/OverviewPanel.css b/src/components/overviewPanel/css/OverviewPanel.css
@@ -69,6 +69,7 @@
     color: #ccc;
     padding: 0.5em 0.5em 0.5em 3em;
     height: 5.5em;
+    width: calc(100% - 3.5em);
     position: absolute;
     top: 0;
     left: 0;

diff --git a/src/framework/preferences/js/LetterSpaceSchemas.js b/src/framework/preferences/js/LetterSpaceSchemas.js
@@ -69,7 +69,7 @@ var fluid_3_0_0 = fluid_3_0_0 || {};
             "fluid.prefs.letterSpace": {
                 "type": "number",
                 "default": 1,
-                "minimum": 1,
+                "minimum": 0.9,
                 "maximum": 2,
                 "divisibleBy": 0.1
             }

diff --git a/src/framework/preferences/js/StarterSchemas.js b/src/framework/preferences/js/StarterSchemas.js
@@ -153,7 +153,7 @@ var fluid_3_0_0 = fluid_3_0_0 || {};
             "fluid.prefs.textSize": {
                 "type": "number",
                 "default": 1,
-                "minimum": 1,
+                "minimum": 0.5,
                 "maximum": 2,
                 "divisibleBy": 0.1
             }
@@ -166,7 +166,7 @@ var fluid_3_0_0 = fluid_3_0_0 || {};
             "fluid.prefs.lineSpace": {
                 "type": "number",
                 "default": 1,
-                "minimum": 1,
+                "minimum": 0.7,
                 "maximum": 2,
                 "divisibleBy": 0.1
             }