From fe30f3f5e1ff2cee3dec2ffd50adb116b5ffc845 Mon Sep 17 00:00:00 2001 From: greenkeeperio-bot Date: Wed, 11 Jan 2017 02:14:39 -0600 Subject: [PATCH 1/7] chore(package): update acl to version 0.4.10 https://greenkeeper.io/ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89914ef..7400466 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ ], "license": "Apache-2.0", "dependencies": { - "acl": "^0.4.9", + "acl": "^0.4.10", "bcrypt-nodejs": "0.0.3", "body-parser": "^1.15.2", "breakpoint-sass": "^2.7.1", From 39a46b91d88612e5634915976ff9d325c058a292 Mon Sep 17 00:00:00 2001 From: Scott Nath Date: Tue, 11 Jul 2017 13:49:19 -0400 Subject: [PATCH 2/7] :bug: compensates for an intermittent fixtures bug --- tests/apis.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/apis.js b/tests/apis.js index 8059faf..f346a4c 100644 --- a/tests/apis.js +++ b/tests/apis.js @@ -308,12 +308,18 @@ test.serial('Utils: Format Results - with follow', t => { }); test.serial('Utils: Format Results - depth with follow', t => { - const testable = utils.testables(live, allTypes); + let testable = utils.testables(live, allTypes); const query = { follow: 'true', depth: 2, // depth gets subtracted during attributes, to see depth the format function needs at least depth: two }; + // fixes a bug where sometimes testable.model.attributes is null + if (!testable.model || !testable.model.attributes) { + const refixtures = utils.generate(generated, lang); + testable = utils.testables(refixtures.live, refixtures.types.full); + } + const formatted = apiUtils.format([testable.expected], testable.model.attributes, allTypes, query); return formatted.then(result => { From a1f5c6ccf65b90100c5f420da6b47dce4c845201 Mon Sep 17 00:00:00 2001 From: Scott Nath Date: Tue, 11 Jul 2017 14:03:07 -0400 Subject: [PATCH 3/7] :crystal_ball: finding utils bug --- tests/apis.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/apis.js b/tests/apis.js index f346a4c..b92d6ad 100644 --- a/tests/apis.js +++ b/tests/apis.js @@ -315,10 +315,7 @@ test.serial('Utils: Format Results - depth with follow', t => { }; // fixes a bug where sometimes testable.model.attributes is null - if (!testable.model || !testable.model.attributes) { - const refixtures = utils.generate(generated, lang); - testable = utils.testables(refixtures.live, refixtures.types.full); - } + console.log(JSON.stringify(testable, null, 2)); const formatted = apiUtils.format([testable.expected], testable.model.attributes, allTypes, query); From 413c16dc6a63c2052bc3e2aa4ba89cf37802be57 Mon Sep 17 00:00:00 2001 From: Scott Nath Date: Tue, 11 Jul 2017 15:08:22 -0400 Subject: [PATCH 4/7] :crystal_ball: finding utils bug --- tests/apis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/apis.js b/tests/apis.js index b92d6ad..ae8549f 100644 --- a/tests/apis.js +++ b/tests/apis.js @@ -308,7 +308,7 @@ test.serial('Utils: Format Results - with follow', t => { }); test.serial('Utils: Format Results - depth with follow', t => { - let testable = utils.testables(live, allTypes); + const testable = utils.testables(live, allTypes); const query = { follow: 'true', depth: 2, // depth gets subtracted during attributes, to see depth the format function needs at least depth: two From 098486363677caf5603e5aa0bf1ac7afa05d8d92 Mon Sep 17 00:00:00 2001 From: Scott Nath Date: Wed, 12 Jul 2017 10:04:03 -0400 Subject: [PATCH 5/7] :bug: modularscale and ibm colors --- src/sass/_punchcard.scss | 2 +- src/sass/partials/global/_mixins.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sass/_punchcard.scss b/src/sass/_punchcard.scss index e1f37e5..d26fe4d 100644 --- a/src/sass/_punchcard.scss +++ b/src/sass/_punchcard.scss @@ -4,7 +4,7 @@ @import 'toolkit'; @import 'breakpoint'; @import 'ibm-colors'; -@import 'modular-scale'; +@import 'modularscale'; //////////////////////// ////////////////////////////// diff --git a/src/sass/partials/global/_mixins.scss b/src/sass/partials/global/_mixins.scss index 072e948..215a4ad 100644 --- a/src/sass/partials/global/_mixins.scss +++ b/src/sass/partials/global/_mixins.scss @@ -46,7 +46,7 @@ } @mixin dt { - background-color: color('neutral-white', 40); + background-color: color('neutral-white'); font-weight: setting-get('bold font weight'); padding: setting-get('rhythm') / 2 setting-get('rhythm') / .75; From 48b8147e4b14e1e65e1f1e11d042083b7cd75508 Mon Sep 17 00:00:00 2001 From: Scott Nath Date: Wed, 12 Jul 2017 10:23:30 -0400 Subject: [PATCH 6/7] :bug: ibm colors bad update --- src/sass/partials/base/_base.scss | 6 +++--- src/sass/partials/components/_forms.scss | 12 ++++++------ src/sass/partials/global/_mixins.scss | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sass/partials/base/_base.scss b/src/sass/partials/base/_base.scss index 772efbc..d8b3079 100644 --- a/src/sass/partials/base/_base.scss +++ b/src/sass/partials/base/_base.scss @@ -103,7 +103,7 @@ &--tr { &:nth-of-type(even) { - background-color: color('neutral-white', 30); + background-color: color('white'); } } @@ -159,7 +159,7 @@ } &--kbd { - background-color: color('neutral-white', 40); + background-color: color('white'); border: 1px solid color('gray', 10); border-radius: 3px; font-size: ms(-1); @@ -167,7 +167,7 @@ } &--code { - background: color('neutral-white', 40); + background: color('white'); direction: ltr; font-family: setting-get('monospace font'); font-size: ms(-1); diff --git a/src/sass/partials/components/_forms.scss b/src/sass/partials/components/_forms.scss index 0c5ed5d..2f594a6 100644 --- a/src/sass/partials/components/_forms.scss +++ b/src/sass/partials/components/_forms.scss @@ -49,7 +49,7 @@ } &--field-container { - background-color: color('neutral-white', 40); + background-color: color('white'); margin-top: setting-get('rhythm') / .5; padding: setting-get('rhythm') / .75; @include breakpoint(setting-get('responsive form')) { @@ -63,7 +63,7 @@ } &--publish-container { - background-color: color('neutral-white', 40); + background-color: color('white'); margin-top: setting-get('rhythm') / .5; order: 0; padding: setting-get('rhythm') / .75; @@ -78,7 +78,7 @@ &--publish-fields { @include breakpoint(setting-get('responsive form')) { - background-color: color('neutral-white', 40); + background-color: color('white'); order: 1; padding: setting-get('rhythm') / .5; } @@ -89,10 +89,10 @@ } &--legend { - background-color: color('neutral-white', 40); - border: setting-get('input border width') solid color('neutral-white', 40); + background-color: color('white'); + border: setting-get('input border width') solid color('white'); border-radius: setting-get('input border radius'); - color: color('black'); + color: color('black', 100); font-weight: setting-get('bold font weight'); padding: 0 setting-get('rhythm'); transform: translateX(setting-get('rhythm') / -1); diff --git a/src/sass/partials/global/_mixins.scss b/src/sass/partials/global/_mixins.scss index 215a4ad..4021a73 100644 --- a/src/sass/partials/global/_mixins.scss +++ b/src/sass/partials/global/_mixins.scss @@ -46,7 +46,7 @@ } @mixin dt { - background-color: color('neutral-white'); + background-color: color('white'); font-weight: setting-get('bold font weight'); padding: setting-get('rhythm') / 2 setting-get('rhythm') / .75; From 91fa5ba48d5bb64ede7c9333880f8440896bca91 Mon Sep 17 00:00:00 2001 From: Scott Nath Date: Wed, 12 Jul 2017 10:36:49 -0400 Subject: [PATCH 7/7] :crystal_ball: remove console.log --- tests/apis.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/apis.js b/tests/apis.js index ae8549f..8059faf 100644 --- a/tests/apis.js +++ b/tests/apis.js @@ -314,9 +314,6 @@ test.serial('Utils: Format Results - depth with follow', t => { depth: 2, // depth gets subtracted during attributes, to see depth the format function needs at least depth: two }; - // fixes a bug where sometimes testable.model.attributes is null - console.log(JSON.stringify(testable, null, 2)); - const formatted = apiUtils.format([testable.expected], testable.model.attributes, allTypes, query); return formatted.then(result => {