Merge pull request #634 from punchcard-cms/greenkeeper-acl-0.4.10

[email protected] breaks build 🚨
punchcard-cms · Jul 12, 2017 · a08a400 · a08a400
2 parents 9f62670 + 91fa5ba
commit a08a400
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "acl": "^0.4.9",
+    "acl": "^0.4.10",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.17.2",
     "breakpoint-sass": "^2.7.1",

diff --git 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/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,15 +159,15 @@
   }
 
   &--kbd {
-    background-color: color('neutral-white', 40);
+    background-color: color('white');
     border: 1px solid color('gray', 10);
     border-radius: 3px;
     font-size: ms(-1);
     padding: .2em .5em;
   }
 
   &--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
@@ -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
@@ -46,7 +46,7 @@
 }
 
 @mixin dt {
-  background-color: color('neutral-white', 40);
+  background-color: color('white');
   font-weight: setting-get('bold font weight');
   padding: setting-get('rhythm') / 2 setting-get('rhythm') / .75;