From b7a3ae54d43da842072c3042b3b4d21054aeb7fe Mon Sep 17 00:00:00 2001 From: dev0tion Date: Fri, 19 May 2017 22:49:06 +0200 Subject: [PATCH] Add pre alpha styling --- Breeze.UI/src/app/login/login.component.html | 5 ++- .../src/app/setup/create/create.component.css | 3 ++ .../app/setup/create/create.component.html | 12 +++---- .../app/setup/recover/recover.component.css | 3 ++ .../app/setup/recover/recover.component.html | 10 +++--- Breeze.UI/src/app/setup/setup.component.css | 4 +++ Breeze.UI/src/app/setup/setup.component.html | 18 ++++++----- .../wallet/dashboard/dashboard.component.css | 3 +- .../wallet/dashboard/dashboard.component.html | 20 ++++++------ .../app/wallet/history/history.component.css | 24 ++++++++++++++ .../app/wallet/history/history.component.html | 4 +-- .../src/app/wallet/menu/menu.component.css | 3 +- .../app/wallet/receive/receive.component.html | 2 +- Breeze.UI/src/styles.css | 31 ++++++++++++++----- 14 files changed, 94 insertions(+), 48 deletions(-) diff --git a/Breeze.UI/src/app/login/login.component.html b/Breeze.UI/src/app/login/login.component.html index a60c843..965adf8 100644 --- a/Breeze.UI/src/app/login/login.component.html +++ b/Breeze.UI/src/app/login/login.component.html @@ -1,4 +1,4 @@ -
+

Welcome to Breeze

@@ -13,9 +13,8 @@

Welcome to Breeze

-

Please enter your password to decrypt your wallet

- +
{{formErrors.password}}
diff --git a/Breeze.UI/src/app/setup/create/create.component.css b/Breeze.UI/src/app/setup/create/create.component.css index e69de29..a73e1db 100644 --- a/Breeze.UI/src/app/setup/create/create.component.css +++ b/Breeze.UI/src/app/setup/create/create.component.css @@ -0,0 +1,3 @@ +#mnemonic { + margin-top: 30px; +} diff --git a/Breeze.UI/src/app/setup/create/create.component.html b/Breeze.UI/src/app/setup/create/create.component.html index b2c052d..b59187e 100644 --- a/Breeze.UI/src/app/setup/create/create.component.html +++ b/Breeze.UI/src/app/setup/create/create.component.html @@ -1,7 +1,7 @@ -
+
-

Please create a new wallet.

+

Please create a new wallet

@@ -25,20 +25,16 @@

Please create a new wallet.

+
-
+
-
-
- -
-
diff --git a/Breeze.UI/src/app/setup/recover/recover.component.css b/Breeze.UI/src/app/setup/recover/recover.component.css index e69de29..48c5fdf 100644 --- a/Breeze.UI/src/app/setup/recover/recover.component.css +++ b/Breeze.UI/src/app/setup/recover/recover.component.css @@ -0,0 +1,3 @@ +#buttons { + margin-top: 30px; +} diff --git a/Breeze.UI/src/app/setup/recover/recover.component.html b/Breeze.UI/src/app/setup/recover/recover.component.html index 42f8d96..9ea80d2 100644 --- a/Breeze.UI/src/app/setup/recover/recover.component.html +++ b/Breeze.UI/src/app/setup/recover/recover.component.html @@ -1,4 +1,4 @@ -
+

Recover your wallet

@@ -38,11 +38,9 @@

Recover your wallet

-
- -
-
- +
+ +
diff --git a/Breeze.UI/src/app/setup/setup.component.css b/Breeze.UI/src/app/setup/setup.component.css index e69de29..77713c4 100644 --- a/Breeze.UI/src/app/setup/setup.component.css +++ b/Breeze.UI/src/app/setup/setup.component.css @@ -0,0 +1,4 @@ +#backButton { + margin-top: 50px; + margin-bottom: 100px; +} diff --git a/Breeze.UI/src/app/setup/setup.component.html b/Breeze.UI/src/app/setup/setup.component.html index cf8ff79..958e013 100644 --- a/Breeze.UI/src/app/setup/setup.component.html +++ b/Breeze.UI/src/app/setup/setup.component.html @@ -1,29 +1,33 @@ -
+
-

Welcome to Breeze.

+

Welcome to Breeze

If you haven't used Breeze before, please create a new wallet. +
+

-

+

Users who have previously used Breeze, can choose to recover their wallet. +
+

+ +
+
diff --git a/Breeze.UI/src/app/wallet/dashboard/dashboard.component.css b/Breeze.UI/src/app/wallet/dashboard/dashboard.component.css index 0c12c41..22bf493 100644 --- a/Breeze.UI/src/app/wallet/dashboard/dashboard.component.css +++ b/Breeze.UI/src/app/wallet/dashboard/dashboard.component.css @@ -3,8 +3,9 @@ } #dashboard { - padding-top: 50px !important; + /*padding-top: 50px !important;*/ padding-left: 100px !important; + padding-right: 100px !important; border: 2px solid; border-color: #D5E3F0; background-color: #DAE6F2; diff --git a/Breeze.UI/src/app/wallet/dashboard/dashboard.component.html b/Breeze.UI/src/app/wallet/dashboard/dashboard.component.html index e988dd3..873dfc6 100644 --- a/Breeze.UI/src/app/wallet/dashboard/dashboard.component.html +++ b/Breeze.UI/src/app/wallet/dashboard/dashboard.component.html @@ -1,18 +1,18 @@
-
-
-
Active Balance
-
Balance: {{confirmedBalance | coinNotation | coinAbbreviation}}
-
Unconfirmed Balance: {{unconfirmedBalance | coinNotation | coinAbbreviation}}
+
+
+
Active Balance
+
Balance: {{confirmedBalance | coinNotation | coinAbbreviation}}
+
Unconfirmed Balance: {{unconfirmedBalance | coinNotation | coinAbbreviation}}
-
-
Current Value
-
Over 9000
+
+
-
+
- +
diff --git a/Breeze.UI/src/app/wallet/history/history.component.css b/Breeze.UI/src/app/wallet/history/history.component.css index e69de29..74e7095 100644 --- a/Breeze.UI/src/app/wallet/history/history.component.css +++ b/Breeze.UI/src/app/wallet/history/history.component.css @@ -0,0 +1,24 @@ +#transactions { + margin-top: 10px; +} + +.transactionsTable { + border-collapse: separate; + border-spacing: 10px; +} + +.transactionsTable tr { + border: 1px solid #D5E3F0; + text-align: left; + border-spacing: 10px; +} + +.transactionsTable th { + text-align: left; + border-spacing: 10px; +} + +.transactionsTable td { + height: 50px; + vertical-align: center; +} diff --git a/Breeze.UI/src/app/wallet/history/history.component.html b/Breeze.UI/src/app/wallet/history/history.component.html index f50b699..5d45f31 100644 --- a/Breeze.UI/src/app/wallet/history/history.component.html +++ b/Breeze.UI/src/app/wallet/history/history.component.html @@ -1,7 +1,7 @@
-
+
- +
diff --git a/Breeze.UI/src/app/wallet/menu/menu.component.css b/Breeze.UI/src/app/wallet/menu/menu.component.css index 4186361..df1ff43 100644 --- a/Breeze.UI/src/app/wallet/menu/menu.component.css +++ b/Breeze.UI/src/app/wallet/menu/menu.component.css @@ -1,8 +1,7 @@ .navbar { height: 60px; width: 100%; - margin: 0; - padding: 0; + padding-left: 85px; } .nav-link { diff --git a/Breeze.UI/src/app/wallet/receive/receive.component.html b/Breeze.UI/src/app/wallet/receive/receive.component.html index 786dd64..2ed16e0 100644 --- a/Breeze.UI/src/app/wallet/receive/receive.component.html +++ b/Breeze.UI/src/app/wallet/receive/receive.component.html @@ -12,7 +12,7 @@

Receive

-
Type Amount
{{ address }} +
diff --git a/Breeze.UI/src/styles.css b/Breeze.UI/src/styles.css index bbbbe5f..70c32af 100644 --- a/Breeze.UI/src/styles.css +++ b/Breeze.UI/src/styles.css @@ -6,7 +6,29 @@ /* Temporary min td with */ td { - min-width: 150px; + min-width: 100px; +} + +h1 { + padding-top: 15px; + padding-bottom: 15px; + color: #444444; +} + +button { + font-family: "Lato Black"; + color: white; + background-color: #20B9FF; + border-radius: 25px; +} + +label { + color: #666666; +} + +.form-control::-webkit-input-placeholder +{ + color: #BBBBBB; } .content-wrapper { @@ -25,13 +47,6 @@ td { float: none; } -.btn { - font-family: "Lato Black"; - color: white; - background-color: #20B9FF; - border-radius: 25px; -} - .row { padding: 0; margin: 0;