Skip to content

Commit

Permalink
Merge pull request #760 from Conflux-Chain/dev
Browse files Browse the repository at this point in the history
feat: release v2.11.0
  • Loading branch information
0x74616e67 authored May 24, 2022
2 parents 1f7ce47 + b107e42 commit 4d6393a
Show file tree
Hide file tree
Showing 67 changed files with 4,268 additions and 4,150 deletions.
188 changes: 178 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"cross-env": "7.0.2",
"d3-array": "2.8.0",
"d3-scale": "3.2.3",
"echarts": "5.0.2",
"echarts-for-react": "3.0.1",
"eslint-config-prettier": "6.10.1",
"eslint-plugin-prettier": "3.1.2",
"fontfaceobserver": "2.1.0",
"highcharts": "10.0.0",
"highcharts-react-official": "3.1.0",
"husky": "4.2.3",
"i18next": "19.3.4",
"i18next-browser-languagedetector": "4.0.2",
Expand Down Expand Up @@ -66,7 +66,6 @@
"react-scripts": "3.4.3",
"react-test-renderer": "16.13.0",
"react-use": "15.3.4",
"recharts": "2.0.7",
"recoil": "0.0.10",
"sanitize.css": "11.0.0",
"serve": "11.3.0",
Expand Down Expand Up @@ -177,5 +176,10 @@
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"resolutions": {
"@types/react": "16.9.25",
"@types/react-dom": "16.9.3",
"lodash": "4.17.20"
}
}
9 changes: 0 additions & 9 deletions src/app/components/AddressContainer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -479,15 +479,6 @@ const AddressWrapper = styled.div`
display: inline-flex;
/* display: inline-block; */
font-family: ${monospaceFont};
// TODO icon position
//position: relative;
//.icon {
// position: absolute;
// left: -18px;
// top: -2px;
//}
`;

const addressStyle = (props: any) => `
Expand Down
Loading

0 comments on commit 4d6393a

Please sign in to comment.