diff options
author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-21 00:59:21 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-21 00:59:21 +0800 |
commit | 1079d57f8cd0513e9571457b00eb3e9b44c26215 (patch) | |
tree | 929ddf8387cecc78ef26dbb85461fe5e0d925d8a /ui/app/css | |
parent | 4af1003b0efa8329718f5a95826976a54194d49b (diff) | |
parent | d9160ac6da48bfead4cf47a5d9dc142432c52e0c (diff) | |
download | tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.gz tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.bz2 tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.lz tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.xz tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.zst tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.zip |
Merge pull request #3489 from MetaMask/retry-tx-refractor
Retry tx refractor
Diffstat (limited to 'ui/app/css')
-rw-r--r-- | ui/app/css/itcss/components/send.scss | 21 | ||||
-rw-r--r-- | ui/app/css/itcss/components/transaction-list.scss | 51 | ||||
-rw-r--r-- | ui/app/css/itcss/settings/variables.scss | 1 |
3 files changed, 73 insertions, 0 deletions
diff --git a/ui/app/css/itcss/components/send.scss b/ui/app/css/itcss/components/send.scss index 89739171d..bdea1b008 100644 --- a/ui/app/css/itcss/components/send.scss +++ b/ui/app/css/itcss/components/send.scss @@ -660,6 +660,7 @@ &__gas-fee-display { width: 100%; + position: relative; .currency-display--message { padding: 8px 38px 8px 10px; @@ -891,3 +892,23 @@ } } } + +.sliders-icon-container { + display: flex; + align-items: center; + justify-content: center; + height: 24px; + width: 24px; + border: 1px solid $curious-blue; + border-radius: 4px; + background-color: $white; + position: absolute; + right: 15px; + top: 14px; + cursor: pointer; + font-size: 1em; +} + +.sliders-icon { + color: $curious-blue; +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/transaction-list.scss b/ui/app/css/itcss/components/transaction-list.scss index 2c28a2a27..c13f24953 100644 --- a/ui/app/css/itcss/components/transaction-list.scss +++ b/ui/app/css/itcss/components/transaction-list.scss @@ -126,6 +126,53 @@ } } +.tx-list-item-retry-container { + background: #d1edff; + width: 100%; + border-radius: 4px; + font-size: 0.8em; + display: flex; + justify-content: center; + margin-left: 44px; + width: calc(100% - 44px); + + @media screen and (min-width: 576px) and (max-width: 679px) { + flex-flow: column; + align-items: center; + } + + @media screen and (min-width: 380px) and (max-width: 575px) { + flex-flow: row; + } + + @media screen and (max-width: 379px) { + flex-flow: column; + align-items: center; + } +} + +.tx-list-item-retry-copy { + font-family: Roboto; +} + +.tx-list-item-retry-link { + text-decoration: underline; + margin-left: 6px; + cursor: pointer; + + @media screen and (min-width: 576px) and (max-width: 679px) { + margin-left: 0px; + } + + @media screen and (min-width: 380px) and (max-width: 575px) { + margin-left: 6px; + } + + @media screen and (max-width: 379px) { + margin-left: 0px; + } +} + .tx-list-date { color: $dusty-gray; font-size: 12px; @@ -190,6 +237,10 @@ .tx-list-status--failed { color: $monzo; } + + .tx-list-status--dropped { + opacity: 0.5; + } } .tx-list-item { diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss index d96c1ae43..640fd95b8 100644 --- a/ui/app/css/itcss/settings/variables.scss +++ b/ui/app/css/itcss/settings/variables.scss @@ -46,6 +46,7 @@ $manatee: #93949d; $spindle: #c7ddec; $mid-gray: #5b5d67; $cape-cod: #38393a; +$onahau: #d1edff; $java: #29b6af; $wild-strawberry: #ff4a8d; $cornflower-blue: #7057ff; |