Merge branch 'master' of https://github.com/ritz078/transform-www into prettier

This commit is contained in:
Ritesh Kumar committed 2017-09-07 17:59:51 +05:30
commit ef5737b626
5 files changed
+33 -27

No files matched your search

+17 -4
View File
@@ -224,6 +224,15 @@ export default class ConversionPanel extends PureComponent {
scrollbarStyle: null
};
// hide success footer bannner after 2 seconds. Let other types be visible until fixed.
clearTimeout(this.footerTimeout);
if (infoType === "success") {
this.footerTimeout = setTimeout(() => this.setState({
info: "",
infoType: ""
}), 2000);
}
return (
<div className="wrapper">
<script src="https://bundle.run/prettier@1.6.1" />
@@ -529,10 +538,14 @@ export default class ConversionPanel extends PureComponent {
</div>
</div>
</div>
<div className={`footer${infoType ? " has-" + infoType : ""}`}>
<span className="info">{info}</span>
</div>
{
infoType !== "" && (
<div className={`footer has-${infoType}`}>
<span className="info">{info}</span>
</div>
)
}
</div>
);
}
}
}
+5 -13
View File
@@ -171,9 +171,8 @@ export default class Layout extends PureComponent {
}
.nav {
padding: 20px 0;
flex: 1;
overflow-y: scroll;
overflow-y: auto;
}
.twitter {
@@ -187,18 +186,12 @@ export default class Layout extends PureComponent {
}
.footer {
height: 70px;
padding: 10px 5px;
text-align: center;
color: #fff;
font-family: "Lato", sans-serif;
}
.footer svg {
height: 36px;
width: 30px;
color: #fff;
}
.badge {
display: inline-block;
font-size: 12px;
@@ -296,9 +289,8 @@ export default class Layout extends PureComponent {
<div className="logo">
<Logo />
</div>
<div className="info">Use Ctrl/Cmd + P for quick search</div>
<div className="nav">
<div className="info">Use Ctrl/Cmd + P for quick search</div>
<Collapse
onChange={this.onChange}
accordion
@@ -333,7 +325,7 @@ export default class Layout extends PureComponent {
</div>
<div className="footer">
<br />Created by{" "}
Created by{" "}
<a
target="_blank"
className="twitter"
@@ -348,4 +340,4 @@ export default class Layout extends PureComponent {
</div>
);
}
}
}
+2 -2
View File
@@ -53,8 +53,8 @@
"stringify-object": "^3.2.0",
"transform-css-to-js": "^0.1.1",
"transform-graphql-type-annotations": "^0.1.1",
"transform-json-types": "^0.2.3",
"transform-svg-to-native": "^0.1.1",
"transform-json-types": "^0.2.6",
"transform-svg-to-native": "^0.1.3",
"unfetch": "^3.0.0",
"xml-js": "^1.4.1"
},
+2 -2
View File
@@ -2,7 +2,7 @@ const x = `{
"hello": [
{
"_id": "5988946e45e52d60b33a25c7",
"latitude": 50.087977,
"type": 50.087977,
"longitude": 72.167197,
"tags": [
"nulla",
@@ -22,7 +22,7 @@ const x = `{
{
"optionalField": "hello",
"_id": "5988946ef6090217857d7b0f",
"latitude": 47.460772,
"type": 47.460772,
"longitude": 85.95137,
"tags": [
"aliqua",
+7 -6
View File
@@ -5418,16 +5418,16 @@ transform-graphql-type-annotations@^0.1.1:
apollo-codegen "0.17.0-alpha.1"
graphql "^0.10.5"
transform-json-types@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/transform-json-types/-/transform-json-types-0.2.3.tgz#04b68084033cd5511c06007cf4c66019868d1321"
transform-json-types@^0.2.6:
version "0.2.6"
resolved "https://registry.yarnpkg.com/transform-json-types/-/transform-json-types-0.2.6.tgz#2a41db319022cd0fbc01516fce9ca6aea6797f90"
dependencies:
lodash "^4.17.4"
sha1 "^1.1.1"
transform-svg-to-native@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/transform-svg-to-native/-/transform-svg-to-native-0.1.1.tgz#6d890603af21b0cca24ebb8e0a3b3f8b5c26a233"
transform-svg-to-native@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/transform-svg-to-native/-/transform-svg-to-native-0.1.3.tgz#53c0b0d57921417b7df6ea4170c6e385c2a39261"
dependencies:
"@tsuyoshiwada/htmltojsx" "^0.0.4"
all-contributors-cli "^4.4.0"
@@ -5440,6 +5440,7 @@ transform-svg-to-native@^0.1.1:
is-capitalized "^1.0.0"
js-beautify "^1.6.14"
lodash "^4.17.4"
prettier "^1.6.1"
prettydiff "^99.0.1"
svgo "^0.7.2"