certusone
/
oyster
mirror of https://github.com/certusone/oyster.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: fix repay + dark theme

This commit is contained in:
bartosz-lipinski 2021-01-25 22:17:39 -06:00
parent 135e61982f
commit b19c7dd501
21 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/App.less
View File

@ -358,6 +358,14 @@ em {
}
}
.ant-pro-sider {
background: transparent !important;
.ant-menu {
background: transparent !important;
}
}
.dashboard-amount-quote-stat {
font-size: 10px;
font-style: normal;

4
src/ant-custom.less
View File

@ -1,5 +1,5 @@
@import '~antd/es/style/themes/default.less';
// @import '~antd/es/style/themes/dark.less';
@import '~antd/es/style/themes/dark.less';
@import "~antd/dist/antd.dark.less";
@primary-color: #ff00a8;
@popover-background: #1a2029;

2
src/components/BorrowInput/index.tsx
View File

@ -175,6 +175,7 @@ export const BorrowInput = (props: {
justifyContent: "space-around",
}}
>
<div className="borrow-input-title">{LABELS.BORROW_QUESTION}</div>
<div
style={{
display: "flex",
@ -203,6 +204,7 @@ export const BorrowInput = (props: {
flexDirection: "row",
justifyContent: "space-evenly",
alignItems: "center",
marginBottom: 20
}}
>
<CollateralInput

5
src/components/BorrowInput/style.less
View File

@ -1,5 +1,8 @@
@import "~antd/dist/antd.dark.less";
.borrow-input-title {
font-size: 1.05rem;
margin-top: 15px;
margin-bottom: 5px;
margin-bottom: 15px;
color: @text-color-secondary;
}

5
src/components/DepositInput/style.less
View File

@ -1,3 +1,8 @@
@import "~antd/dist/antd.dark.less";
.deposit-input-title {
font-size: 1.05rem;
margin-top: 15px;
margin-bottom: 15px;
color: @text-color-secondary;
}

2
src/components/Layout/index.tsx
View File

@ -37,7 +37,7 @@ export const AppLayout = React.memo((props: any) => {
[...Object.keys(paths)].find((key) => location.pathname.startsWith(key)) ||
"";
const defaultKey = paths[current] || "1";
const theme = "light";
const theme = "dark";
return (
<div className="App">

5
src/components/LiquidateInput/style.less
View File

@ -1,3 +1,8 @@
@import "~antd/dist/antd.dark.less";
.liquidate-input-title {
font-size: 1.05rem;
margin-top: 15px;
margin-bottom: 15px;
color: @text-color-secondary;
}

6
src/components/RepayInput/index.tsx
View File

@ -132,7 +132,7 @@ export const RepayInput = (props: {
useEffect(() => {
if (collateralReserve && lastTyped === "repay") {
const collateralInQuote = obligation.info.collateralInQuote;
const collateral = collateralInQuote * collateralPrice;
const collateral = collateralInQuote / collateralPrice;
if (value) {
const borrowRatio = (parseFloat(value) / borrowAmount) * 100;
const collateralAmount = (borrowRatio * collateral) / 100;
@ -153,7 +153,7 @@ export const RepayInput = (props: {
useEffect(() => {
if (collateralReserve && lastTyped === "collateral") {
const collateralInQuote = obligation.info.collateralInQuote;
const collateral = collateralInQuote * collateralPrice;
const collateral = collateralInQuote / collateralPrice;
if (collateralValue) {
const collateralRatio =
(parseFloat(collateralValue) / collateral) * 100;
@ -193,6 +193,7 @@ export const RepayInput = (props: {
justifyContent: "space-around",
}}
>
<div className="repay-input-title">{LABELS.REPAY_QUESTION}</div>
<div
style={{
display: "flex",
@ -220,6 +221,7 @@ export const RepayInput = (props: {
flexDirection: "row",
justifyContent: "space-evenly",
alignItems: "center",
marginBottom: 20
}}
>
<CollateralInput

7
src/components/RepayInput/style.less
View File

@ -1,3 +1,8 @@
.borrow-input-title {
@import "~antd/dist/antd.dark.less";
.repay-input-title {
font-size: 1.05rem;
margin-top: 15px;
margin-bottom: 15px;
color: @text-color-secondary;
}

5
src/components/WithdrawInput/style.less
View File

@ -1,3 +1,8 @@
@import "~antd/dist/antd.dark.less";
.withdraw-input-title {
font-size: 1.05rem;
margin-top: 15px;
margin-bottom: 15px;
color: @text-color-secondary;
}

4
src/views/borrow/itemStyle.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.borrow-item {
display: flex;
@ -16,7 +16,7 @@
flex: 80px
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.borrow-header {

2
src/views/borrowReserve/index.tsx
View File

@ -55,7 +55,7 @@ export const BorrowReserveView = () => {
<Statistic
title={LABELS.BORROWING_POWER_VALUE}
value={borrowingPower}
valueStyle={{ color: "#3f8600" }}
valueStyle={{ color: "#3fBB00" }}
precision={2}
prefix="$"
/>

4
src/views/dashboard/style.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.dashboard-item {
display: flex;
@ -21,7 +21,7 @@
flex: 200px
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.dashboard-title {

4
src/views/deposit/view/itemStyle.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.deposit-item {
display: flex;
@ -16,7 +16,7 @@
flex: 80px
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.deposit-header {

2
src/views/home/index.tsx
View File

@ -95,7 +95,7 @@ export const HomeView = () => {
title="Current market size"
value={totals.marketSize}
precision={2}
valueStyle={{ color: "#3f8600" }}
valueStyle={{ color: "#3fBB00" }}
prefix="$"
/>
</Card>

4
src/views/home/itemStyle.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.home-item {
display: flex;
@ -16,7 +16,7 @@
flex: 80px
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.home-header {

2
src/views/liquidate/index.tsx
View File

@ -56,7 +56,7 @@ export const LiquidateView = () => {
title="Value at risk"
value={valueAtRisk}
precision={2}
valueStyle={{ color: "#3f8600" }}
valueStyle={{ color: "#3fBB00" }}
prefix="$"
/>
</Card>

4
src/views/liquidate/style.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.liquidate-item {
display: flex;
@ -16,7 +16,7 @@
flex: 80px
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.liquidate-header {

4
src/views/margin/itemStyle.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.choose-margin-item {
display: flex;
@ -16,7 +16,7 @@
flex: 80px;
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.choose-margin-header {

4
src/views/margin/style.less
View File

@ -1,4 +1,4 @@
@import '~antd/es/style/themes/default.less';
@import '~antd/es/style/themes/dark.less';
.trading-item {
display: flex;
justify-content: space-between;
@ -19,7 +19,7 @@
flex: 300px;
}
border-bottom: 1px solid #eee;
border-bottom: 1px solid @border-color-split;
}
.trading-header {

2
src/views/repayReserve/index.tsx
View File

@ -69,7 +69,7 @@ export const RepayReserveView = () => {
<Statistic
title={LABELS.BORROWING_POWER_VALUE}
value={borrowingPower}
valueStyle={{ color: "#3f8600" }}
valueStyle={{ color: "#3fBB00" }}
precision={2}
prefix="$"
/>