From 05d4fc7dce96fced67d7ed17a631f6eac5557fa4 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Mon, 3 Oct 2016 14:24:51 -0400 Subject: [PATCH] refactor(main): begin extracting styles from main.scss --- public/views/modals/coinbase-tx-details.html | 2 +- public/views/modals/customAmount.html | 2 +- public/views/modals/wallets.html | 2 +- public/views/preferencesCoinbase.html | 4 +- src/sass/main.scss | 90 +------------------- src/sass/views/integrations/coinbase.scss | 10 +++ src/sass/views/starting.scss | 21 +++++ src/sass/views/views.scss | 24 ++++++ 8 files changed, 62 insertions(+), 93 deletions(-) create mode 100644 src/sass/views/integrations/coinbase.scss create mode 100644 src/sass/views/starting.scss create mode 100644 src/sass/views/views.scss diff --git a/public/views/modals/coinbase-tx-details.html b/public/views/modals/coinbase-tx-details.html index 3a08946ac..181312a7f 100644 --- a/public/views/modals/coinbase-tx-details.html +++ b/public/views/modals/coinbase-tx-details.html @@ -10,7 +10,7 @@ -
+
bought diff --git a/public/views/modals/customAmount.html b/public/views/modals/customAmount.html index 755b38b1f..d0641f755 100644 --- a/public/views/modals/customAmount.html +++ b/public/views/modals/customAmount.html @@ -9,7 +9,7 @@ -
+

QR Code

    diff --git a/public/views/modals/wallets.html b/public/views/modals/wallets.html index c8c65543c..618835246 100644 --- a/public/views/modals/wallets.html +++ b/public/views/modals/wallets.html @@ -13,7 +13,7 @@ -
    +
    {{error}}
    diff --git a/public/views/preferencesCoinbase.html b/public/views/preferencesCoinbase.html index 55fc293a2..fee9ab66f 100644 --- a/public/views/preferencesCoinbase.html +++ b/public/views/preferencesCoinbase.html @@ -4,7 +4,7 @@ ng-init="titleSection='Preferences'; goBackToState = 'coinbase'; noColor = true">
    -
    +

      Account

      @@ -33,7 +33,7 @@ -

      User Information

      +

      User Information

    • ID diff --git a/src/sass/main.scss b/src/sass/main.scss index c41b47da3..c561a153f 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -1,44 +1,3 @@ -/* - * - * Copay main CSS - * - */ - body { - font-family: 'roboto-regular'; -} - -h3.title { - margin-left: 10px !important; -} - -.walletHome h4.title { - padding: 0px 0 10px 15px; - margin: 5px 0 5px 0; - font-size: 16px; -} - -.bitpay_card select { - margin: 5px 0 5px 0; - padding: 0 20px; - font-size: 16px; - width: auto; - border: none; -} - -.bitpay_card select:focus { - background-color: transparent; -} - -.preferences ul, .modal-content ul { - font-size: 14px; - background: white; -} - -.preferences ul li { - padding: 16px 10px 16px 16px; - border-bottom: 1px solid #E9E9EC; -} - .addressbook-input, .disabled-input { display: block; margin-bottom: 1.5rem; @@ -602,54 +561,9 @@ input[type=number] { } } -/* Starting */ - -#starting { - background: rgba(30, 49, 134, 1); - background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(100%, rgba(17, 27, 73, 1))); - background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); - color: #fff; - height: 100%; - .scroll-content { - display: table !important; - width: 100% !important; - height: 100% !important; - } - .scroll { - display: table-cell; - vertical-align: middle; - text-align: center; - } -} - @import "fonts"; @import "ionic"; @import "common"; @import "forms"; -@import 'mixins/mixins'; -@import 'views/tabs'; -@import "views/add"; -@import "views/amount"; -@import "views/confirm"; -@import "views/tab-home"; -@import "views/tab-receive"; -@import "views/tab-scan"; -@import "views/tab-send"; -@import "views/tab-settings"; -@import "views/walletDetails"; -@import "views/advancedSettings"; -@import "views/bitpayCard"; -@import "views/address-book"; -@import "views/wallet-backup-phrase"; -@import "views/address-book"; -@import 'views/onboarding/onboarding'; -@import "views/includes/walletActivity"; -@import "views/includes/wallets"; -@import "views/includes/modals/modals"; -@import "views/includes/tx-details"; -@import "views/includes/txp-details"; -@import "views/includes/tx-status"; +@import "mixins/mixins"; +@import "views/views"; diff --git a/src/sass/views/integrations/coinbase.scss b/src/sass/views/integrations/coinbase.scss new file mode 100644 index 000000000..40eabb4cf --- /dev/null +++ b/src/sass/views/integrations/coinbase.scss @@ -0,0 +1,10 @@ +.coinbase-preferences { + ul { + font-size: 14px; + background: white; + li { + padding: 16px 10px 16px 16px; + border-bottom: 1px solid #E9E9EC; + } + } +} diff --git a/src/sass/views/starting.scss b/src/sass/views/starting.scss new file mode 100644 index 000000000..8ea228e79 --- /dev/null +++ b/src/sass/views/starting.scss @@ -0,0 +1,21 @@ +#starting { + background: rgba(30, 49, 134, 1); + background: -moz-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(30, 49, 134, 1)), color-stop(100%, rgba(17, 27, 73, 1))); + background: -webkit-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: -o-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: -ms-linear-gradient(top, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + background: linear-gradient(to bottom, rgba(30, 49, 134, 1) 0%, rgba(17, 27, 73, 1) 100%); + color: #fff; + height: 100%; + .scroll-content { + display: table !important; + width: 100% !important; + height: 100% !important; + } + .scroll { + display: table-cell; + vertical-align: middle; + text-align: center; + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss new file mode 100644 index 000000000..eede32a5f --- /dev/null +++ b/src/sass/views/views.scss @@ -0,0 +1,24 @@ +@import "tabs"; +@import "add"; +@import "amount"; +@import "confirm"; +@import "starting"; +@import "tab-home"; +@import "tab-receive"; +@import "tab-scan"; +@import "tab-send"; +@import "tab-settings"; +@import "walletDetails"; +@import "advancedSettings"; +@import "bitpayCard"; +@import "address-book"; +@import "wallet-backup-phrase"; +@import "address-book"; +@import "onboarding/onboarding"; +@import "includes/walletActivity"; +@import "includes/wallets"; +@import "includes/modals/modals"; +@import "includes/tx-details"; +@import "includes/txp-details"; +@import "includes/tx-status"; +@import "integrations/coinbase.scss";