Skip to content

Commit b1457c9

Browse files
author
Ives van Hoorne
committed
Fix more styling artifacts and update prettier
1 parent ae02974 commit b1457c9

File tree

6 files changed

+29
-81
lines changed

6 files changed

+29
-81
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"opn": "4.0.2",
5353
"path-exists": "3.0.0",
5454
"postcss-loader": "^1.2.1",
55-
"prettier": "^1.3.1",
55+
"prettier": "^1.4.2",
5656
"promise": "7.1.1",
5757
"raw-loader": "^0.5.1",
5858
"react-hot-loader": "^3.0.0-beta.6",
@@ -139,4 +139,4 @@
139139
"\\.css$": "<rootDir>/__mocks__/styleMock.js"
140140
}
141141
}
142-
}
142+
}

src/app/components/sandbox/Preview/Message.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ const Container = styled.div`
2222
position: absolute;
2323
background-color: ${({ color }) => {
2424
if (color === 'error') {
25-
return theme.redBackground;
25+
return theme.redBackground();
2626
}
27-
return theme.primary;
28-
}}
29-
color: ${() => theme.red};
27+
return theme.primary();
28+
}};
29+
color: ${() => theme.red()};
3030
height: 100%;
3131
width: 100%;
3232
padding: 1rem;

src/app/containers/Notifications/Notification.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ const Container = styled.div`
2424
if (props.type === 'error') return theme.red.darken(0.2)();
2525
if (props.type === 'warning') return theme.primary.darken(0.2);
2626
if (props.type === 'success') return theme.green();
27-
return theme.secondary;
28-
}}
29-
27+
return theme.secondary();
28+
}};
29+
3030
background-color: ${theme.background2.darken(0.2)()};
3131
`;
3232

src/app/containers/Notifications/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const NotificationContainer = styled.div`
3737
position: fixed;
3838
left: 24px;
3939
bottom: 0;
40-
zIndex: 41;
40+
z-index: 41;
4141
`;
4242

4343
const mapStateToProps = state => ({

src/app/utils/codemirror/eslint-lint.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ const allRules = {
6363
'react/no-unused-prop-types': require('eslint-plugin-react/lib/rules/no-unused-prop-types'),
6464
'react/no-children-prop': require('eslint-plugin-react/lib/rules/no-children-prop'),
6565
'react/void-dom-elements-no-children': require('eslint-plugin-react/lib/rules/void-dom-elements-no-children'),
66-
'react/no-comment-textnodes': require('eslint-plugin-react/lib/rules/no-comment-textnodes'),
67-
'react/require-extension': require('eslint-plugin-react/lib/rules/require-extension'),
68-
'react/wrap-multilines': require('eslint-plugin-react/lib/rules/wrap-multilines'),
6966
'react/jsx-tag-spacing': require('eslint-plugin-react/lib/rules/jsx-tag-spacing'),
7067
};
7168
/* eslint-enable global-require */

yarn.lock

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,6 @@ [email protected]:
243243
version "0.9.6"
244244
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
245245

246-
247-
version "0.9.8"
248-
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.8.tgz#6cb6a40beba31f49f20928e28439fc14a3dab078"
249-
250246
async-each@^1.0.0:
251247
version "1.0.1"
252248
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -296,7 +292,7 @@ axobject-query@^0.1.0:
296292
dependencies:
297293
ast-types-flow "0.0.7"
298294

299-
babel-code-frame@6.22.0, babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
295+
babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
300296
version "6.22.0"
301297
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
302298
dependencies:
@@ -1252,10 +1248,6 @@ babili-webpack-plugin@^0.1.1:
12521248
babel-preset-babili "^0.1.1"
12531249
webpack-sources "^0.2.3"
12541250

1255-
1256-
version "7.0.0-beta.8"
1257-
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949"
1258-
12591251
babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.17.0:
12601252
version "6.17.0"
12611253
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
@@ -2586,7 +2578,7 @@ estraverse@~4.1.0:
25862578
version "4.1.1"
25872579
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
25882580

2589-
esutils@2.0.2, esutils@^2.0.0, esutils@^2.0.2:
2581+
esutils@^2.0.0, esutils@^2.0.2:
25902582
version "2.0.2"
25912583
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
25922584

@@ -2910,10 +2902,6 @@ flow-bin@^0.47.0:
29102902
version "0.47.0"
29112903
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.47.0.tgz#a2a08ab3e0d1f1cb57d17e27b30b118b62fda367"
29122904

2913-
2914-
version "0.45.0"
2915-
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.45.0.tgz#aa29d4ae27f06aa02817772bba0fcbefef7e62f0"
2916-
29172905
follow-redirects@^1.2.3:
29182906
version "1.2.3"
29192907
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.3.tgz#01abaeca85e3609837d9fcda3167a7e42fdaca21"
@@ -3030,7 +3018,7 @@ get-caller-file@^1.0.1:
30303018
version "1.0.2"
30313019
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
30323020

3033-
get-stdin@5.0.1, get-stdin@^5.0.1:
3021+
get-stdin@^5.0.1:
30343022
version "5.0.1"
30353023
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
30363024

@@ -3085,25 +3073,25 @@ glob2base@^0.0.12:
30853073
dependencies:
30863074
find-index "^0.1.1"
30873075

3088-
glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
3089-
version "7.1.1"
3090-
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
3076+
glob@^4.3.1:
3077+
version "4.5.3"
3078+
resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
30913079
dependencies:
3092-
fs.realpath "^1.0.0"
30933080
inflight "^1.0.4"
30943081
inherits "2"
3095-
minimatch "^3.0.2"
3082+
minimatch "^2.0.1"
30963083
once "^1.3.0"
3097-
path-is-absolute "^1.0.0"
30983084

3099-
glob@^4.3.1:
3100-
version "4.5.3"
3101-
resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
3085+
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
3086+
version "7.1.1"
3087+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
31023088
dependencies:
3089+
fs.realpath "^1.0.0"
31033090
inflight "^1.0.4"
31043091
inherits "2"
3105-
minimatch "^2.0.1"
3092+
minimatch "^3.0.2"
31063093
once "^1.3.0"
3094+
path-is-absolute "^1.0.0"
31073095

31083096
glob@~3.1.21:
31093097
version "3.1.21"
@@ -3518,14 +3506,10 @@ [email protected]:
35183506
version "0.4.13"
35193507
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
35203508

3521-
iconv-lite@^0.4.17:
3509+
iconv-lite@^0.4.17, iconv-lite@~0.4.13:
35223510
version "0.4.17"
35233511
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.17.tgz#4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d"
35243512

3525-
iconv-lite@~0.4.13:
3526-
version "0.4.16"
3527-
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.16.tgz#65de3beeb39e2960d67f049f1634ffcbcde9014b"
3528-
35293513
icss-replace-symbols@^1.0.2:
35303514
version "1.0.2"
35313515
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
@@ -4077,13 +4061,6 @@ jest-jasmine2@^20.0.4:
40774061
once "^1.4.0"
40784062
p-map "^1.1.1"
40794063

4080-
jest-matcher-utils@^19.0.0:
4081-
version "19.0.0"
4082-
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz#5ecd9b63565d2b001f61fbf7ec4c7f537964564d"
4083-
dependencies:
4084-
chalk "^1.1.3"
4085-
pretty-format "^19.0.0"
4086-
40874064
jest-matcher-utils@^20.0.3:
40884065
version "20.0.3"
40894066
resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz#b3a6b8e37ca577803b0832a98b164f44b7815612"
@@ -4173,15 +4150,6 @@ jest-util@^20.0.3:
41734150
leven "^2.1.0"
41744151
mkdirp "^0.5.1"
41754152

4176-
4177-
version "19.0.0"
4178-
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173"
4179-
dependencies:
4180-
chalk "^1.1.1"
4181-
jest-matcher-utils "^19.0.0"
4182-
leven "^2.0.0"
4183-
pretty-format "^19.0.0"
4184-
41854153
jest-validate@^20.0.3:
41864154
version "20.0.3"
41874155
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-20.0.3.tgz#d0cfd1de4f579f298484925c280f8f1d94ec3cab"
@@ -4344,7 +4312,7 @@ lcid@^1.0.0:
43444312
dependencies:
43454313
invert-kv "^1.0.0"
43464314

4347-
leven@^2.0.0, leven@^2.1.0:
4315+
leven@^2.1.0:
43484316
version "2.1.0"
43494317
resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
43504318

@@ -4746,7 +4714,7 @@ [email protected], minimist@~0.0.1:
47464714
version "0.0.8"
47474715
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
47484716

4749-
minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
4717+
minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
47504718
version "1.2.0"
47514719
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
47524720

@@ -5579,20 +5547,9 @@ preserve@^0.2.0:
55795547
version "0.2.0"
55805548
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
55815549

5582-
prettier@^1.3.1:
5583-
version "1.3.1"
5584-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.3.1.tgz#fa0ea84b45ac0ba6de6a1e4cecdcff900d563151"
5585-
dependencies:
5586-
ast-types "0.9.8"
5587-
babel-code-frame "6.22.0"
5588-
babylon "7.0.0-beta.8"
5589-
chalk "1.1.3"
5590-
esutils "2.0.2"
5591-
flow-parser "0.45.0"
5592-
get-stdin "5.0.1"
5593-
glob "7.1.1"
5594-
jest-validate "19.0.0"
5595-
minimist "1.2.0"
5550+
prettier@^1.4.2:
5551+
version "1.4.2"
5552+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.4.2.tgz#bcdd95ed1eca434ac7f98ca26ea4d25a2af6a2ac"
55965553

55975554
pretty-error@^2.0.2:
55985555
version "2.1.0"
@@ -5601,12 +5558,6 @@ pretty-error@^2.0.2:
56015558
renderkid "^2.0.1"
56025559
utila "~0.4"
56035560

5604-
pretty-format@^19.0.0:
5605-
version "19.0.0"
5606-
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-19.0.0.tgz#56530d32acb98a3fa4851c4e2b9d37b420684c84"
5607-
dependencies:
5608-
ansi-styles "^3.0.0"
5609-
56105561
pretty-format@^20.0.3:
56115562
version "20.0.3"
56125563
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-20.0.3.tgz#020e350a560a1fe1a98dc3beb6ccffb386de8b14"

0 commit comments

Comments
 (0)