Skip to content

Commit a08a400

Browse files
authored
Merge pull request #634 from punchcard-cms/greenkeeper-acl-0.4.10
acl@0.4.10 breaks build 🚨
2 parents 9f62670 + 91fa5ba commit a08a400

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
],
4545
"license": "Apache-2.0",
4646
"dependencies": {
47-
"acl": "^0.4.9",
47+
"acl": "^0.4.10",
4848
"bcrypt-nodejs": "0.0.3",
4949
"body-parser": "^1.17.2",
5050
"breakpoint-sass": "^2.7.1",

src/sass/_punchcard.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@import 'toolkit';
55
@import 'breakpoint';
66
@import 'ibm-colors';
7-
@import 'modular-scale';
7+
@import 'modularscale';
88
////////////////////////
99

1010
//////////////////////////////

src/sass/partials/base/_base.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103

104104
&--tr {
105105
&:nth-of-type(even) {
106-
background-color: color('neutral-white', 30);
106+
background-color: color('white');
107107
}
108108
}
109109

@@ -159,15 +159,15 @@
159159
}
160160

161161
&--kbd {
162-
background-color: color('neutral-white', 40);
162+
background-color: color('white');
163163
border: 1px solid color('gray', 10);
164164
border-radius: 3px;
165165
font-size: ms(-1);
166166
padding: .2em .5em;
167167
}
168168

169169
&--code {
170-
background: color('neutral-white', 40);
170+
background: color('white');
171171
direction: ltr;
172172
font-family: setting-get('monospace font');
173173
font-size: ms(-1);

src/sass/partials/components/_forms.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050

5151
&--field-container {
52-
background-color: color('neutral-white', 40);
52+
background-color: color('white');
5353
margin-top: setting-get('rhythm') / .5;
5454
padding: setting-get('rhythm') / .75;
5555
@include breakpoint(setting-get('responsive form')) {
@@ -63,7 +63,7 @@
6363
}
6464

6565
&--publish-container {
66-
background-color: color('neutral-white', 40);
66+
background-color: color('white');
6767
margin-top: setting-get('rhythm') / .5;
6868
order: 0;
6969
padding: setting-get('rhythm') / .75;
@@ -78,7 +78,7 @@
7878
&--publish-fields {
7979

8080
@include breakpoint(setting-get('responsive form')) {
81-
background-color: color('neutral-white', 40);
81+
background-color: color('white');
8282
order: 1;
8383
padding: setting-get('rhythm') / .5;
8484
}
@@ -89,10 +89,10 @@
8989
}
9090

9191
&--legend {
92-
background-color: color('neutral-white', 40);
93-
border: setting-get('input border width') solid color('neutral-white', 40);
92+
background-color: color('white');
93+
border: setting-get('input border width') solid color('white');
9494
border-radius: setting-get('input border radius');
95-
color: color('black');
95+
color: color('black', 100);
9696
font-weight: setting-get('bold font weight');
9797
padding: 0 setting-get('rhythm');
9898
transform: translateX(setting-get('rhythm') / -1);

src/sass/partials/global/_mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
}
4747

4848
@mixin dt {
49-
background-color: color('neutral-white', 40);
49+
background-color: color('white');
5050
font-weight: setting-get('bold font weight');
5151
padding: setting-get('rhythm') / 2 setting-get('rhythm') / .75;
5252

0 commit comments

Comments
 (0)