Skip to content

Commit

Permalink
Merge branch 'master' into remove-remark-autofix
Browse files Browse the repository at this point in the history
  • Loading branch information
Hypnosphi authored Oct 4, 2017
2 parents d77479c + df5465a commit 5530584
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 18 deletions.
2 changes: 1 addition & 1 deletion addons/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"global": "^4.3.2",
"graphiql": "^0.11.5",
"graphql": "^0.11.6",
"graphql": "^0.11.7",
"prop-types": "^15.6.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"devDependencies": {
"@types/node": "^7.0.12",
"@types/react": "^16.0.8",
"@types/react": "^16.0.9",
"git-url-parse": "^6.2.2",
"raw-loader": "^0.5.1",
"react": "^16.0.0",
Expand Down
2 changes: 1 addition & 1 deletion app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"react-native-compat": "^1.0.0",
"shelljs": "^0.7.8",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"url-loader": "^0.6.2",
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
Expand Down
4 changes: 2 additions & 2 deletions app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
"postcss-loader": "^2.0.6",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-modal": "^2.3.2",
"react-modal": "^2.3.3",
"redux": "^3.7.2",
"request": "^2.83.0",
"serve-favicon": "^2.4.5",
"shelljs": "^0.7.8",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"webpack": "^3.6.0",
Expand Down
6 changes: 3 additions & 3 deletions app/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@
"qs": "^6.5.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-modal": "^2.3.2",
"react-modal": "^2.3.3",
"redux": "^3.7.2",
"request": "^2.83.0",
"serve-favicon": "^2.4.5",
"shelljs": "^0.7.8",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"vue": "^2.4.2",
"vue-hot-reload-api": "^2.1.0",
"vue-hot-reload-api": "^2.1.1",
"vue-loader": "^12.2.1",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.4.2",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"react-icons": "^2.2.5",
"react-inspector": "^2.2.0",
"react-komposer": "^2.0.0",
"react-modal": "^2.3.2",
"react-modal": "^2.3.3",
"react-split-pane": "^0.1.65",
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"
Expand Down
5 changes: 3 additions & 2 deletions lib/ui/src/modules/ui/components/left_panel/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const wrapperStyle = {
background: '#F7F7F7',
marginBottom: 10,
display: 'flex',
height: 27,
};

const headingStyle = {
Expand All @@ -16,8 +15,9 @@ const headingStyle = {
fontSize: '12px',
fontWeight: 'bolder',
color: '#828282',
textAlign: 'center',
cursor: 'pointer',
padding: 0,
padding: '5px',
margin: 0,
overflow: 'hidden',
};
Expand All @@ -37,6 +37,7 @@ const shortcutIconStyle = {
backgroundColor: 'inherit',
outline: 0,
width: 30,
flexShrink: 0,
};

const linkStyle = {
Expand Down
33 changes: 26 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
version "15.6.4"
resolved "https://registry.yarnpkg.com/@types/react/-/react-15.6.4.tgz#3bb57bd43183a05919ceb025a264287348f47e9d"

"@types/react@^16.0.8":
version "16.0.8"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.8.tgz#5a553a89dceddf73b9f9a2231501f322b3b97da6"
"@types/react@^16.0.9":
version "16.0.9"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.9.tgz#2ad952abbb22617620927694f9a4bce292d7fb2b"

JSONStream@^1.0.4:
version "1.3.1"
Expand Down Expand Up @@ -5332,9 +5332,9 @@ graphql@^0.10.1:
dependencies:
iterall "^1.1.0"

graphql@^0.11.6:
version "0.11.6"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.6.tgz#f0146b5dc1480fda579c21bb6238970fd5cf5aa3"
graphql@^0.11.7:
version "0.11.7"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.11.7.tgz#e5abaa9cb7b7cccb84e9f0836bf4370d268750c6"
dependencies:
iterall "1.1.3"

Expand Down Expand Up @@ -7780,7 +7780,7 @@ mime@1.3.x:
version "1.3.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"

mime@1.4.1, mime@^1.2.11, mime@^1.3.4:
mime@1.4.1, mime@^1.2.11, mime@^1.3.4, mime@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"

Expand Down Expand Up @@ -9410,6 +9410,13 @@ react-modal@^2.3.2:
prop-types "^15.5.10"
react-dom-factories "^1.0.0"

react-modal@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.3.3.tgz#bf4d100bbc426549b943e4294f7e9ea88e56e1a5"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"

react-native-compat@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/react-native-compat/-/react-native-compat-1.0.0.tgz#491dbd8a0105ac061b8d0d926463ce6a3dff33bc"
Expand Down Expand Up @@ -11780,6 +11787,14 @@ url-loader@0.5.9, url-loader@^0.5.9:
loader-utils "^1.0.2"
mime "1.3.x"

url-loader@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
dependencies:
loader-utils "^1.0.2"
mime "^1.4.1"
schema-utils "^0.3.0"

url-parse-lax@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
Expand Down Expand Up @@ -11953,6 +11968,10 @@ vue-hot-reload-api@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.0.tgz#9ca58a6e0df9078554ce1708688b6578754d86de"

vue-hot-reload-api@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.1.1.tgz#1ba6712166182fd651753804b9d8d8d02d855579"

vue-loader@^12.2.1:
version "12.2.2"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-12.2.2.tgz#2b3a764f27018f975bc78cb8b1f55137548ee2d7"
Expand Down

0 comments on commit 5530584

Please sign in to comment.