Skip to content

Tickets #188 & 204 #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Tickets #188 & 204 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
79d0a08
Redesigned the ethereum card according to the recent designs.
skarabocu Jun 7, 2019
665a12b
Update asset-embedded.css
skarabocu Jun 10, 2019
b059e12
Started to the redesign of isolated view.
skarabocu Jun 12, 2019
3681acd
Added the icon.
skarabocu Jun 13, 2019
405491d
Added a dropdown menu for changing the currency.
skarabocu Jun 13, 2019
3c7a47e
Added the scrolling down features and white background for the isolat…
skarabocu Jun 14, 2019
d3048f5
Changed the CSS of the highchart to adapt the new design.
skarabocu Jun 17, 2019
0539d32
Modified the dropdown, so the currency can be changed without a switc…
skarabocu Jun 18, 2019
030da11
A small change for dropdown.
skarabocu Jun 18, 2019
743585e
revert yarn.lock
bagby Jun 19, 2019
89dbe12
Solved the bug with yarn.lock
skarabocu Jun 19, 2019
d66d504
Get rid of a useless console.log
skarabocu Jun 19, 2019
bf36023
Solved linting errors for currencies and selectedSymbol.
skarabocu Jun 19, 2019
a96e94e
Small fix for linting error.
skarabocu Jun 19, 2019
fb80b26
Fix tests
burieberry Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions cards/asset-history/addon/styles/highcharts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
--portfolio-chart-dark: #000;
--portfolio-chart-hover-light: #fafafa;
--portfolio-chart-hover-dark: #4d4c6d;
--portfolio-chart-area: linear-gradient(90deg, rgba(78,78,206,1) 0%, rgba(108,209,179,1) 38%, rgba(74,204,118,1) 100%);

position: relative;
overflow: hidden;
Expand All @@ -26,7 +27,7 @@

.highcharts-root text {
stroke-width: 0;
fill: var(--portfolio-chart-light);
fill: var(--portfolio-chart-dark);
}

.highcharts-strong {
Expand Down Expand Up @@ -69,6 +70,7 @@
.highcharts-tracker-area {
fill: rgba(192, 192, 192, 0.0001);
stroke-width: 0;
stroke: rgba(192, 192, 192, 0.0001);
}

/* Titles */
Expand All @@ -93,19 +95,20 @@
}

.highcharts-axis-title {
fill: var(--portfolio-chart-light);
fill: var(--portfolio-chart-dark);
}

.highcharts-axis-labels {
fill: var(--portfolio-chart-light);
fill: var(--portfolio-chart-dark);
stroke: #000;
cursor: default;
font-size: var(--portfolio-chart-sm-font);
font-weight: bold;
}

.highcharts-grid-line {
fill: none;
stroke: #fff;
stroke: #666666; /*#fff*/
opacity: 0.15;
}
.highcharts-grid-line:first-child,
Expand All @@ -131,7 +134,7 @@
}

.highcharts-minor-grid-line {
stroke: #f2f2f2;
stroke: #666666; /*#f2f2f2*/
}

.highcharts-crosshair-thin {
Expand Down Expand Up @@ -180,7 +183,7 @@
}

.highcharts-tooltip-box .highcharts-label-box {
fill: #f7f7f7;
fill:#f7f7f7;
fill-opacity: 0.85;
}

Expand Down Expand Up @@ -228,8 +231,9 @@ g.highcharts-series,
/* Series options */
/* Default colors */
.highcharts-color-0 {
fill: var(--portfolio-chart-light);
stroke: #fff;
fill: var(--portfolio-chart-dark);
stroke: #666666; /*#fff*/
fillColor: #da1919;
}

.highcharts-color-1 {
Expand Down Expand Up @@ -284,7 +288,7 @@ g.highcharts-series,

.highcharts-markers {
stroke-width: 1px;
stroke: #ffffff;
stroke: #666666; /*#ffffff*/
}

.highcharts-point {
Expand Down Expand Up @@ -325,7 +329,7 @@ g.highcharts-series,
}

.highcharts-column-series rect.highcharts-point {
stroke: #ffffff;
stroke: #666666; /*#ffffff*/
}

.highcharts-column-series .highcharts-point {
Expand All @@ -339,7 +343,7 @@ g.highcharts-series,

.highcharts-pie-series .highcharts-point {
stroke-linejoin: round;
stroke: #ffffff;
stroke: #666666; /*#ffffff*/
}

.highcharts-pie-series .highcharts-point-hover {
Expand All @@ -349,7 +353,7 @@ g.highcharts-series,

.highcharts-funnel-series .highcharts-point {
stroke-linejoin: round;
stroke: #ffffff;
stroke: #666666; /*#ffffff*/
}

.highcharts-funnel-series .highcharts-point-hover {
Expand All @@ -364,7 +368,7 @@ g.highcharts-series,

.highcharts-pyramid-series .highcharts-point {
stroke-linejoin: round;
stroke: #ffffff;
stroke: #666666; /*#ffffff*/
}

.highcharts-pyramid-series .highcharts-point-hover {
Expand Down Expand Up @@ -592,6 +596,7 @@ g.highcharts-series,

.highcharts-navigator-series .highcharts-area {
fill-opacity: 0.05;
fill: var(--portfolio-chart-area);
}

.highcharts-navigator-xaxis .highcharts-axis-line {
Expand All @@ -604,7 +609,7 @@ g.highcharts-series,
}

.highcharts-navigator-xaxis.highcharts-axis-labels {
fill: #999999;
fill: #000; /*#999999*/
}

.highcharts-navigator-yaxis .highcharts-grid-line {
Expand Down Expand Up @@ -647,25 +652,25 @@ g.highcharts-series,
}

.highcharts-button text {
fill: var(--portfolio-chart-light);
fill: var(--portfolio-chart-dark);
font-weight: bold;
}

.highcharts-button-hover {
transition: fill 0ms;
fill: var(--portfolio-chart-hover-light);
stroke: #cccccc;
fill: var(--portfolio-chart-hover-dark);
stroke: #000;
cursor: pointer;
}

.highcharts-button-hover text {
fill: var(--portfolio-chart-hover-dark);
fill: var(--portfolio-chart-hover-light);
font-weight: bold;
}

.highcharts-button-pressed {
fill: var(--portfolio-chart-light);
stroke: #cccccc;
stroke: #000;
}

.highcharts-button-pressed text {
Expand All @@ -674,7 +679,7 @@ g.highcharts-series,
}

.highcharts-button-disabled text {
fill: var(--portfolio-chart-light);
fill: var(--portfolio-chart-dark);
opacity: 0.3;
cursor: not-allowed;
}
Expand Down
10 changes: 10 additions & 0 deletions cards/asset/addon/components/isolated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import { task } from 'ember-concurrency';

export default LiveIsolatedCard.extend(AssetBaseMixin, CurrencyParamsMixin, {
layout,
currencies: Object.freeze([{name: 'View details as USD', currency: 'USD'},
{name: 'View details as EUR', currency: 'EUR'},
{name: 'View details as BTC', currency: 'BTC'}]),
cardstackData: service(),
fastboot: injectOptional.service(),

Expand All @@ -31,6 +34,7 @@ export default LiveIsolatedCard.extend(AssetBaseMixin, CurrencyParamsMixin, {
} else {
this.fetchWallet.perform();
}
this.set('selectedSymbol', {name: 'View details as USD', currency: 'USD'})
},

fetchWallet: task(function * () {
Expand All @@ -49,4 +53,10 @@ export default LiveIsolatedCard.extend(AssetBaseMixin, CurrencyParamsMixin, {
this.set('wallet', wallet);
}
}).drop(),
setCurrencyDropDown(selectedSymbol){
this.set('selectedSymbol', selectedSymbol);
this.setCurrency(selectedSymbol.currency);
}
});


6 changes: 6 additions & 0 deletions cards/asset/addon/mixins/asset-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@ export default Mixin.create({

return moment.unix(timestamp).format('MMM D,YYYY')
}),
twoLineAddress: computed('content.formattedAddress', function() {
let address = this.get('content.formattedAddress');
if (!address) { return; }

return `${address.slice(0,address.length/2)}\n${address.slice(-address.length/2)}`;
}),
});
52 changes: 43 additions & 9 deletions cards/asset/addon/styles/asset-embedded.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
background: var(--portfolio-bitcoin-gradient);
}
.asset-embedded--ether {
background: var(--portfolio-ether-gradient);
background: var(--portfolio-grey-ether-gradient);
}
.asset-embedded--litecoin {
background: var(--portfolio-litecoin-gradient);
Expand All @@ -26,13 +26,13 @@
.asset-embedded__link {
display: block;
text-decoration: none;
color: var(--portfolio-white);
color: var(--portfolio-black);
font-size: var(--portfolio-sm-font);
letter-spacing: 0.2px;
}

.asset-embedded__wrapper {
padding: 20px;
padding: 5px;
}

.asset-embedded__header {
Expand All @@ -41,45 +41,74 @@
justify-content: space-between;
align-items: center;
padding-bottom: 20px;
padding-top: 20px;
}

.asset-embedded__title-row {
display: flex;
flex-flow: row nowrap;
justify-content: flex-start;
align-items: center;
align-items: flex-start;
align-self: strech;
flex-grow: 10;
}

.asset-embedded__title {
margin: 0;
font-size: var(--portfolio-med-font);
font-size: var(--portfolio-xs-font);
font-weight: bold;
letter-spacing: 0.2px;
line-height: 1.1;
line-height: 1.5;
text-transform: uppercase;
margin-right: 20px;
align-self: center-start;
}

.asset-embedded__logo {
margin-right: 10px;
margin-right: 5px;
}

.asset-embedded__address {
color: var(--portfolio-muted-gray);
font-size: var(--portfolio-xs-font);
font-weight: 600;
letter-spacing: 0.1px;
line-height: 1.5;
flex-shrink: 3;
max-width: 150px;
word-wrap: break-word;
margin: 0;
margin-left: auto;
}

/* Balance summary */
.asset-embedded__balance {
font-weight: bold;
letter-spacing: 0.3px;
line-height: 1.5;
text-align: right;
margin-left: 20px;
}
.asset-embedded__balance > .asset-embedded__balance-title {
color: var(--portfolio-muted-gray);
font-size: var(--portfolio-xs-font);
font-weight: 600;
letter-spacing: 0.3px;
line-height: 1.5;
text-align: left;
}

.asset-embedded__balance-main {
padding-bottom: 10px;
font-size: 36px;
line-height: 1;
text-align: left;
}
.asset-embedded__balance-main > span {
font-size: var(--portfolio-sm-font);
}
.asset-embedded__balance-fiat {
font-size: var(--portfolio-sm-font);
text-align: left;
font-weight: 600;
}

.asset-embedded__details {
Expand All @@ -99,3 +128,8 @@
letter-spacing: 0.1px;
line-height: 1.5;
}

.asset-embedded__balance-threedots {
color: var(--portfolio-muted-gray);
text-align: right;
}
Loading