From f963beaf9ab95245ffe980a6094a2e0ffe1b8737 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 30 Sep 2016 15:01:56 -0400 Subject: [PATCH 1/2] added settings icons --- public/img/icon-about.svg | 21 +++++++++++++++++++++ public/img/icon-address-book.svg | 20 ++++++++++++++++++++ public/img/icon-alternative-currency.svg | 22 ++++++++++++++++++++++ public/img/icon-excahnge.svg | 19 +++++++++++++++++++ public/img/icon-language.svg | 16 ++++++++++++++++ public/img/icon-network.svg | 21 +++++++++++++++++++++ public/img/icon-notifications.svg | 18 ++++++++++++++++++ public/img/icon-send-feedback.svg | 16 ++++++++++++++++ public/img/icon-unit.svg | 14 ++++++++++++++ public/img/transaction-ico-down.svg | 14 ++++++++++++++ public/img/transaction-ico-up.svg | 14 ++++++++++++++ 11 files changed, 195 insertions(+) create mode 100644 public/img/icon-about.svg create mode 100644 public/img/icon-address-book.svg create mode 100644 public/img/icon-alternative-currency.svg create mode 100644 public/img/icon-excahnge.svg create mode 100644 public/img/icon-language.svg create mode 100644 public/img/icon-network.svg create mode 100644 public/img/icon-notifications.svg create mode 100644 public/img/icon-send-feedback.svg create mode 100644 public/img/icon-unit.svg create mode 100644 public/img/transaction-ico-down.svg create mode 100644 public/img/transaction-ico-up.svg diff --git a/public/img/icon-about.svg b/public/img/icon-about.svg new file mode 100644 index 000000000..a646153ca --- /dev/null +++ b/public/img/icon-about.svg @@ -0,0 +1,21 @@ + + + + 56CDED2F-4C6C-4463-A1F8-2D5CA198DC77 + Created with sketchtool. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-address-book.svg b/public/img/icon-address-book.svg new file mode 100644 index 000000000..b9a5ff0d6 --- /dev/null +++ b/public/img/icon-address-book.svg @@ -0,0 +1,20 @@ + + + + 497EDE1E-1EB6-4FBF-8440-97D248EFDC4C + Created with sketchtool. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-alternative-currency.svg b/public/img/icon-alternative-currency.svg new file mode 100644 index 000000000..e882f2780 --- /dev/null +++ b/public/img/icon-alternative-currency.svg @@ -0,0 +1,22 @@ + + + + 3A719124-019D-470F-908A-5D61F117A295 + Created with sketchtool. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-excahnge.svg b/public/img/icon-excahnge.svg new file mode 100644 index 000000000..2eec6cdac --- /dev/null +++ b/public/img/icon-excahnge.svg @@ -0,0 +1,19 @@ + + + + CEACEB0C-360F-42C8-8D65-89BE2C0C9E86 + Created with sketchtool. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-language.svg b/public/img/icon-language.svg new file mode 100644 index 000000000..15adeb549 --- /dev/null +++ b/public/img/icon-language.svg @@ -0,0 +1,16 @@ + + + + 7368D005-CAC7-454B-8CF2-4315F4016920 + Created with sketchtool. + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-network.svg b/public/img/icon-network.svg new file mode 100644 index 000000000..fca2a763b --- /dev/null +++ b/public/img/icon-network.svg @@ -0,0 +1,21 @@ + + + + D1663024-9AD7-491F-B0E0-B718DFFAA258 + Created with sketchtool. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-notifications.svg b/public/img/icon-notifications.svg new file mode 100644 index 000000000..2da739440 --- /dev/null +++ b/public/img/icon-notifications.svg @@ -0,0 +1,18 @@ + + + + A3CC6A90-742E-4634-91DC-28F2146B6659 + Created with sketchtool. + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-send-feedback.svg b/public/img/icon-send-feedback.svg new file mode 100644 index 000000000..3223c60bb --- /dev/null +++ b/public/img/icon-send-feedback.svg @@ -0,0 +1,16 @@ + + + + C327FD1B-B044-4367-BB49-9491E30599E8 + Created with sketchtool. + + + + + + + + + + + \ No newline at end of file diff --git a/public/img/icon-unit.svg b/public/img/icon-unit.svg new file mode 100644 index 000000000..1990672ac --- /dev/null +++ b/public/img/icon-unit.svg @@ -0,0 +1,14 @@ + + + + 82D53068-08F3-45B0-B4C5-01E08714A956 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/public/img/transaction-ico-down.svg b/public/img/transaction-ico-down.svg new file mode 100644 index 000000000..6222b9c3d --- /dev/null +++ b/public/img/transaction-ico-down.svg @@ -0,0 +1,14 @@ + + + + 78FB16E7-9CC3-4CDA-A486-CB4310074D47 + Created with sketchtool. + + + + + + + + + \ No newline at end of file diff --git a/public/img/transaction-ico-up.svg b/public/img/transaction-ico-up.svg new file mode 100644 index 000000000..e62cbe558 --- /dev/null +++ b/public/img/transaction-ico-up.svg @@ -0,0 +1,14 @@ + + + + 63F37BA0-E6F5-4C27-A289-41CF276928B5 + Created with sketchtool. + + + + + + + + + \ No newline at end of file From 1eac88d5da6d36de03aceadcdcce476a70597f17 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Fri, 30 Sep 2016 15:20:39 -0400 Subject: [PATCH 2/2] incorporated icons and styles into tab-settings view --- public/views/tab-settings.html | 28 +++++++++++++++++++++------- src/sass/views/tab-settings.scss | 8 ++++++++ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index 0231d8d99..05001a152 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -7,7 +7,9 @@
- + + + Address Book @@ -15,13 +17,17 @@
Preferences
- + + + Notifications - + + + Language {{currentLanguageName|translate}} @@ -30,7 +36,9 @@ - + + + Unit {{unitName}} @@ -39,7 +47,9 @@ - + + + Alternative Currency {{selectedAlternative.name}} @@ -48,7 +58,9 @@ - + + + Bitcoin Network Fee Policy {{feeOpts[currentFeeLevel]|translate}} @@ -79,7 +91,9 @@
- + + + About {{appName}} diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index 2726b7f16..a8c6a6357 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -12,6 +12,14 @@ border-top: none; padding-top: 1.5rem; padding-bottom: 1.5rem; + .big-icon-svg { + & > .bg{ + width:20px; + height:20px; + border-radius: 0; + box-shadow: none; + } + } &:before { display: block; position: absolute;