From a04ec49a572e7c87e486145b5f91183f846bbd70 Mon Sep 17 00:00:00 2001 From: Brad Decker Date: Wed, 19 Aug 2020 16:02:42 -0500 Subject: [PATCH] remove unnecessary files and scss (#9253) this moves very little code around, to enable deleting files that are no longer used or necessary. There are a few more things to move and delete that will be handled in a seperate PR after this one. --- ui/app/components/app/account-menu/index.scss | 7 + .../add-to-addressbook-modal/index.scss | 15 +- .../app/modals/new-account-modal/index.scss | 15 +- ui/app/css/index.scss | 2 - ui/app/css/itcss/components/footer.scss | 4 - ui/app/css/itcss/components/gas-slider.scss | 0 ui/app/css/itcss/components/index.scss | 3 - ui/app/css/itcss/components/modal.scss | 0 ui/app/css/itcss/components/pages/index.scss | 2 - .../components/pages/permission-approval.scss | 11 - .../itcss/components/pages/reveal-seed.scss | 17 -- ui/app/css/itcss/objects/index.scss | 1 - ui/app/css/itcss/settings/variables.scss | 52 ---- ui/app/css/itcss/tools/utilities.scss | 243 ------------------ ui/app/css/itcss/trumps/index.scss | 61 ----- ui/app/pages/keychains/index.scss | 18 ++ .../settings/contact-list-tab/index.scss | 10 +- 17 files changed, 56 insertions(+), 405 deletions(-) delete mode 100644 ui/app/css/itcss/components/footer.scss delete mode 100644 ui/app/css/itcss/components/gas-slider.scss delete mode 100644 ui/app/css/itcss/components/modal.scss delete mode 100644 ui/app/css/itcss/components/pages/index.scss delete mode 100644 ui/app/css/itcss/components/pages/permission-approval.scss delete mode 100644 ui/app/css/itcss/components/pages/reveal-seed.scss delete mode 100644 ui/app/css/itcss/objects/index.scss delete mode 100644 ui/app/css/itcss/trumps/index.scss diff --git a/ui/app/components/app/account-menu/index.scss b/ui/app/components/app/account-menu/index.scss index 94fb24abe..e7763766f 100644 --- a/ui/app/components/app/account-menu/index.scss +++ b/ui/app/components/app/account-menu/index.scss @@ -138,6 +138,13 @@ } .keyring-label { + z-index: 1; + font-size: 8px; + line-height: 8px; + border-radius: 10px; + padding: 4px; + text-align: center; + height: 15px; margin-top: 5px; margin-right: 10px; background-color: $dusty-gray; diff --git a/ui/app/components/app/modals/add-to-addressbook-modal/index.scss b/ui/app/components/app/modals/add-to-addressbook-modal/index.scss index cb84f30a0..96e04007f 100644 --- a/ui/app/components/app/modals/add-to-addressbook-modal/index.scss +++ b/ui/app/components/app/modals/add-to-addressbook-modal/index.scss @@ -1,6 +1,9 @@ .add-to-address-book-modal { - @extend %col-nowrap; - @extend %modal; + display: flex; + flex-flow: column nowrap; + background-color: $white; + border-radius: 10px; + box-shadow: 0 5px 16px rgba($black, 0.25); &__content { @extend %col-nowrap; @@ -19,8 +22,12 @@ } &__input { - @extend %input; - + background: $white; + border: 1px solid $Grey-100; + box-sizing: border-box; + border-radius: 8px; + padding: 0.625rem 0.75rem; + font-size: 1.25rem; margin-top: 0.75rem; &::placeholder { diff --git a/ui/app/components/app/modals/new-account-modal/index.scss b/ui/app/components/app/modals/new-account-modal/index.scss index bbe440041..3c20a34e5 100644 --- a/ui/app/components/app/modals/new-account-modal/index.scss +++ b/ui/app/components/app/modals/new-account-modal/index.scss @@ -1,6 +1,9 @@ .new-account-modal { - @extend %col-nowrap; - @extend %modal; + display: flex; + flex-flow: column nowrap; + background-color: $white; + border-radius: 10px; + box-shadow: 0 5px 16px rgba($black, 0.25); &__content { @extend %col-nowrap; @@ -30,8 +33,12 @@ } &__input { - @extend %input; - + background: $white; + border: 1px solid $Grey-100; + box-sizing: border-box; + border-radius: 8px; + padding: 0.625rem 0.75rem; + font-size: 1.25rem; margin-top: 0.75rem; &::placeholder { diff --git a/ui/app/css/index.scss b/ui/app/css/index.scss index 164d04b07..50978fbcb 100644 --- a/ui/app/css/index.scss +++ b/ui/app/css/index.scss @@ -22,9 +22,7 @@ */ @import './itcss/settings/index'; @import './itcss/tools/index'; -@import './itcss/objects/index'; @import './itcss/components/index'; -@import './itcss/trumps/index'; /* Third Party Library Styles diff --git a/ui/app/css/itcss/components/footer.scss b/ui/app/css/itcss/components/footer.scss deleted file mode 100644 index 000a53eed..000000000 --- a/ui/app/css/itcss/components/footer.scss +++ /dev/null @@ -1,4 +0,0 @@ -.app-footer { - padding-bottom: 10px; - align-items: center; -} diff --git a/ui/app/css/itcss/components/gas-slider.scss b/ui/app/css/itcss/components/gas-slider.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss index 472739d10..c0bba546a 100644 --- a/ui/app/css/itcss/components/index.scss +++ b/ui/app/css/itcss/components/index.scss @@ -1,9 +1,6 @@ -@import './footer'; @import './network'; @import './newui-sections'; @import './send'; // Tx List and Sections -@import './gas-slider'; @import './simple-dropdown'; -@import './pages/index'; diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/ui/app/css/itcss/components/pages/index.scss b/ui/app/css/itcss/components/pages/index.scss deleted file mode 100644 index e3e333aaf..000000000 --- a/ui/app/css/itcss/components/pages/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import './reveal-seed'; -@import './permission-approval'; diff --git a/ui/app/css/itcss/components/pages/permission-approval.scss b/ui/app/css/itcss/components/pages/permission-approval.scss deleted file mode 100644 index e8e712cbc..000000000 --- a/ui/app/css/itcss/components/pages/permission-approval.scss +++ /dev/null @@ -1,11 +0,0 @@ -.permission_approval_content { - height: auto; - overflow: auto; - padding: 16px; -} - -.permission_approval_origin { - font-weight: 900; - margin-top: 16px; - word-wrap: break-word; -} diff --git a/ui/app/css/itcss/components/pages/reveal-seed.scss b/ui/app/css/itcss/components/pages/reveal-seed.scss deleted file mode 100644 index b8f13af4a..000000000 --- a/ui/app/css/itcss/components/pages/reveal-seed.scss +++ /dev/null @@ -1,17 +0,0 @@ -.reveal-seed { - &__content { - padding: 20px; - } - - &__label { - padding-bottom: 10px; - font-weight: 400; - display: inline-block; - } - - &__error { - color: $crimson; - font-size: 14px; - padding-top: 5px; - } -} diff --git a/ui/app/css/itcss/objects/index.scss b/ui/app/css/itcss/objects/index.scss deleted file mode 100644 index 220775682..000000000 --- a/ui/app/css/itcss/objects/index.scss +++ /dev/null @@ -1 +0,0 @@ -// Objects diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss index 235fc37a2..6f95dc381 100644 --- a/ui/app/css/itcss/settings/variables.scss +++ b/ui/app/css/itcss/settings/variables.scss @@ -21,55 +21,3 @@ white-space: nowrap; overflow: hidden; } - -%modal { - background-color: $white; - border-radius: 10px; - box-shadow: 0 5px 16px rgba($black, 0.25);; -} - -/* - Z Indicies - Current - app - 11 - hex/bn as decimal input - 1 - remove? - dropdown - 11 - loading - 10 - higher? - mascot - 0 - remove? - */ - - -/* - Spacing Variables -*/ -$no-spacing: 0; -$xxs-spacing: 4px; -$xs-spacing: 8px; -$s-spacing: 16px; -$base-spacing: 24px; -$medium-spacing: 32px; -$large-spacing: 40px; -$xlarge-spacing: 48px; -$xxlarge-spacing: 64px; - - -%input { - background: $white; - border: 1px solid $Grey-100; - box-sizing: border-box; - border-radius: 8px; - padding: 0.625rem 0.75rem; - font-size: 1.25rem; -} -// Input mixin - -%input-2 { - border: 2px solid $Grey-200; - border-radius: 6px; - color: $Grey-800; - padding: 0.875rem 1rem; - font-size: 1.125rem; - - &:focus-within { - border-color: $Blue-500; - } -} diff --git a/ui/app/css/itcss/tools/utilities.scss b/ui/app/css/itcss/tools/utilities.scss index aa80ab867..da185ccc9 100644 --- a/ui/app/css/itcss/tools/utilities.scss +++ b/ui/app/css/itcss/tools/utilities.scss @@ -3,115 +3,16 @@ */ /* lib */ - -.full-size { - height: 100%; - width: 100%; -} - -.full-width { - width: 100%; -} - -.full-flex-height { - display: flex; - flex: 1 1 auto; - flex-direction: column; -} - -.full-height { - height: 100%; -} - .flex-column { display: flex; flex-direction: column; } -.space-between { - justify-content: space-between; -} - -.space-around { - justify-content: space-around; -} - -.flex-column-bottom { - display: flex; - flex-direction: column-reverse; -} - .flex-row { display: flex; flex-direction: row; } -.flex-space-between { - justify-content: space-between; -} - -.flex-space-around { - justify-content: space-around; -} - -.flex-right { - display: flex; - flex-direction: row; - justify-content: flex-end; -} - -.flex-left { - display: flex; - flex-direction: row; - justify-content: flex-start; -} - -.flex-fixed { - flex: none; -} - -.flex-basis-auto { - flex-basis: auto; -} - -.flex-grow { - flex: 1 1 auto; -} - -.flex-wrap { - flex-wrap: wrap; -} - -.flex-center { - display: flex; - justify-content: center; - align-items: center; -} - -.flex-justify-center { - justify-content: center; -} - -.flex-align-center { - align-items: center; -} - -.flex-self-end { - align-self: flex-end; -} - -.flex-self-stretch { - align-self: stretch; -} - -.flex-vertical { - flex-direction: column; -} - -.z-bump { - z-index: 1; -} - .pointer { cursor: pointer; } @@ -130,157 +31,13 @@ transform: scale(0.97); } -.cursor-disabled { - cursor: not-allowed; -} - -.margin-bottom-sml { - margin-bottom: 20px; -} - -.margin-bottom-med { - margin-bottom: 40px; -} - -.margin-right-left { - margin: 0 20px; -} - -.bold { - font-weight: 500; -} - -.text-transform-uppercase { - text-transform: uppercase; -} - -.font-small { - font-size: 12px; -} - -.font-medium { - font-size: 1.2em; -} - -hr.horizontal-line { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; -} - -.hover-white:hover { - background: $white; -} - -.red-dot { - background: #e91550; - color: $white; - border-radius: 10px; -} - -.diamond { - transform: rotate(45deg); - background: #038789; -} - -.hollow-diamond { - transform: rotate(45deg); - border: 3px solid #690496; -} - -.golden-square { - background: #ebb33f; -} - -.pending-dot { - background: $red; - left: 14px; - top: 14px; - color: $white; - border-radius: 10px; - height: 20px; - min-width: 20px; - position: relative; - display: flex; - align-items: center; - justify-content: center; - padding: 4px; - z-index: 1; -} - -.keyring-label { - z-index: 1; - font-size: 8px; - line-height: 8px; - background: rgba(255, 255, 255, 0.4); - color: #fff; - border-radius: 10px; - padding: 4px; - text-align: center; - height: 15px; -} - -.tabSection { - min-width: 350px; -} - -.menu-icon { - display: inline-block; - height: 12px; - min-width: 12px; - margin: 13px; -} - -.ether-icon { - background: rgb(0, 163, 68); - border-radius: 20px; -} - -.testnet-icon { - background: #2465e1; -} - .drop-menu-item { display: flex; align-items: center; } -.invisible { - visibility: hidden; -} - -.one-line-concat { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - .critical-error { text-align: center; margin-top: 20px; color: $red; } - -/* - Misc - */ - -// TODO: move into component-level contextual 'active' state -.letter-spacey { - letter-spacing: 0.1em; -} - -.active { - color: #909090; -} - -.check { - margin-left: 7px; - color: #f7861c; - flex: 1 0 auto; - display: flex; - justify-content: flex-end; -} diff --git a/ui/app/css/itcss/trumps/index.scss b/ui/app/css/itcss/trumps/index.scss deleted file mode 100644 index 0c71d04ff..000000000 --- a/ui/app/css/itcss/trumps/index.scss +++ /dev/null @@ -1,61 +0,0 @@ -/* - Trumps - */ - -// Transitions - -/* universal */ -.app-primary .main-enter { - position: absolute; - width: 100%; -} - -/* center position */ -.app-primary.from-right .main-enter-active, -.app-primary.from-left .main-enter-active { - overflow-x: hidden; - transform: translateX(0); - transition: transform 300ms ease-in; -} - -/* exited positions */ -.app-primary.from-left .main-leave-active { - transform: translateX(360px); - transition: transform 300ms ease-in; -} - -.app-primary.from-right .main-leave-active { - transform: translateX(-360px); - transition: transform 300ms ease-in; -} - -.sidebar.from-left { - transform: translateX(-320px); - transition: transform 300ms ease-in; -} - -/* loader transitions */ -.loader-enter, -.loader-leave-active { - opacity: 0; - transition: opacity 150 ease-in; -} - -.loader-enter-active, -.loader-leave { - opacity: 1; - transition: opacity 150 ease-in; -} - -/* entering positions */ -.app-primary.from-right .main-enter:not(.main-enter-active) { - transform: translateX(360px); -} - -.app-primary.from-left .main-enter:not(.main-enter-active) { - transform: translateX(-360px); -} - -i.fa.fa-question-circle.fa-lg.menu-icon { - font-size: 18px; -} diff --git a/ui/app/pages/keychains/index.scss b/ui/app/pages/keychains/index.scss index 54b52981f..96f56692c 100644 --- a/ui/app/pages/keychains/index.scss +++ b/ui/app/pages/keychains/index.scss @@ -190,3 +190,21 @@ line-height: 23px; margin-left: 22px; } + +.reveal-seed { + &__content { + padding: 20px; + } + + &__label { + padding-bottom: 10px; + font-weight: 400; + display: inline-block; + } + + &__error { + color: $crimson; + font-size: 14px; + padding-top: 5px; + } +} diff --git a/ui/app/pages/settings/contact-list-tab/index.scss b/ui/app/pages/settings/contact-list-tab/index.scss index 9c33c3701..a6ec34d44 100644 --- a/ui/app/pages/settings/contact-list-tab/index.scss +++ b/ui/app/pages/settings/contact-list-tab/index.scss @@ -53,7 +53,15 @@ } &__input { - @extend %input-2; + border: 2px solid $Grey-200; + border-radius: 6px; + color: $Grey-800; + padding: 0.875rem 1rem; + font-size: 1.125rem; + + &:focus-within { + border-color: $Blue-500; + } margin-top: 0.25rem;