Skip to content

Commit

Permalink
Update components with Tally Wallet. (#17)
Browse files Browse the repository at this point in the history
* Update components with Tally Wallet.

* Pull latest components and fix missing arrow.
  • Loading branch information
torreyatcitty authored Feb 25, 2022
1 parent d07e883 commit a11f542
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"chalk": "^4.0.0",
"clean-webpack-plugin": "^3.0.0",
"cli-table": "0.3.1",
"compound-components": "https://github.com/compound-finance/compound-components.git#f5d57eb681a93c4a093aa684a2ee4140e2736279",
"compound-components": "https://github.com/compound-finance/compound-components.git#75fa6c7a1515722ee788a585836ccc7407dd7598",
"compound-config": "https://github.com/compound-finance/compound-config.git#b6cbc8bbfb8df201dc9e3e5860ae68dea84c4c9b",
"connect-history-api-fallback": "^1.5.0",
"core-js": "3",
Expand Down
12 changes: 12 additions & 0 deletions src/scss/components/_arrow.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.arrow {
width: 14px;
height: 12px;
background-repeat: no-repeat;
background-size: cover;
background-image: url(/images/icn-build-arrows-green.svg);
margin-right: 8px;
margin-left: 8px;
&.borrow {
background-image: url(/images/icn-build-arrows-purple.svg);
}
}
15 changes: 1 addition & 14 deletions src/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
@import './typography';
@import './material-components';

@import './components/arrow';
@import './components/claim-comp-modal';
@import './components/proposal-action-modal';
@import './components/collateral-toggle';
Expand Down Expand Up @@ -775,20 +776,6 @@ body {
}
}

//TODO: should really have an arrow component for this I thing
.arrow {
width: 14px;
height: 12px;
background-repeat: no-repeat;
background-size: cover;
background-image: url(/images/icn-build-arrows-green.svg);
margin-right: 8px;
margin-left: 8px;
&.borrow {
background-image: url(/images/icn-build-arrows-purple.svg);
}
}

.submit-button {
width: 25.5rem - ($gov-column-gutter * 2);
position: absolute;
Expand Down
5 changes: 5 additions & 0 deletions src/strings/strings.en.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
"ledger_live": "Ledger Live",
"select": "Select",
"none": "None",
"tally": "Tally",
"unlock_tally_wallet": "Unlock Tally Wallet",
"click_tally_extension": "Tip: If you would prefer to use Tally instead, please download Tally or ensure it is set to default",
"decline_unlock_tally_wallet": "We have detected that you have MetaMask installed.",


"queued_transactions": "Queued Transactions",
"executed_transactions": "Executed Transactions",
Expand Down
5 changes: 5 additions & 0 deletions src/strings/strings.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
"ledger_live": "Ledger Live",
"select": "Seleccionar",
"none": "Ninguna",
"tally": "Cuenta",
"unlock_tally_wallet": "Desbloquear billetera Tally",
"click_tally_extension": "Sugerencia: si prefiere usar Tally en su lugar, descargue Tally o asegúrese de que esté configurado de forma predeterminada",
"decline_unlock_tally_wallet": "Hemos detectado que tienes MetaMask instalado.",


"queued_transactions": "Transacciones en cola",
"executed_transactions": "Transacciones ejecutadas",
Expand Down
5 changes: 5 additions & 0 deletions src/strings/strings.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
"ledger_live": "Ledger Live",
"select": "Sélectionner",
"none": "Aucun",
"tally": "Pointage",
"unlock_tally_wallet": "Déverrouiller le portefeuille Tally",
"click_tally_extension": "Conseil : Si vous préférez utiliser Tally à la place, veuillez télécharger Tally ou assurez-vous qu'il est défini par défaut",
"decline_unlock_tally_wallet": "Nous avons détecté que vous avez installé MetaMask.",


"queued_transactions": "Transactions en file d'attente",
"executed_transactions": "Transactions exécutées",
Expand Down
5 changes: 5 additions & 0 deletions src/strings/strings.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
"ledger_live": "Ledger Live",
"select": "선택",
"none": "없음",
"tally": "계정",
"unlock_tally_wallet": "탈리 지갑 잠금 해제",
"click_tally_extension": "팁: Tally를 대신 사용하려면 Tally를 다운로드하거나 기본값으로 설정되어 있는지 확인하십시오.",
"decline_unlock_tally_wallet": "MetaMask가 설치되어 있음을 감지했습니다.",


"queued_transactions": "대기 중인 트랜잭션",
"executed_transactions": "실행된 트랜잭션",
Expand Down
5 changes: 5 additions & 0 deletions src/strings/strings.zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@
"ledger_live": "Ledger Live",
"select": "选择",
"none": "没有",
"tally": "相符",
"unlock_tally_wallet": "解锁 Tally 钱包",
"click_tally_extension": "提示:如果您更喜欢使用 Tally,请下载 Tally 或确保将其设置为默认值",
"decline_unlock_tally_wallet": "我们检测到您安装了 MetaMask。",


"queued_transactions": "排队的交易",
"executed_transactions": "已执行交易",
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3366,9 +3366,9 @@ component-emitter@^1.2.1:
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==

"compound-components@https://github.com/compound-finance/compound-components.git#f5d57eb681a93c4a093aa684a2ee4140e2736279":
"compound-components@https://github.com/compound-finance/compound-components.git#8f975b3baf904eb9069e3ff5638d21bd37e060c4":
version "1.0.0"
resolved "https://github.com/compound-finance/compound-components.git#f5d57eb681a93c4a093aa684a2ee4140e2736279"
resolved "https://github.com/compound-finance/compound-components.git#8f975b3baf904eb9069e3ff5638d21bd37e060c4"
dependencies:
"@babel/core" "^7.0.0"
"@babel/preset-env" "^7.0.0"
Expand Down

0 comments on commit a11f542

Please sign in to comment.