Skip to content

Commit bb39bce

Browse files
authored
Merge pull request #1 from ety001/feature_0227
Feature 0227
2 parents ec003b6 + 482fbfd commit bb39bce

11 files changed

Lines changed: 497 additions & 48 deletions

File tree

package-lock.json

Lines changed: 22 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
1515
},
1616
"dependencies": {
17+
"babel-runtime": "^6.26.0",
1718
"stellar-sdk": "^0.7.3",
1819
"vue": "^2.3.3",
1920
"vue-material": "^0.7.4",

src/components/Home.vue

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
<template>
22
<md-layout md-gutter class="main-box">
3+
<md-layout md-flex="100">
4+
<robot-switch></robot-switch>
5+
</md-layout>
6+
37
<md-layout md-flex="40">
48
<wallet-info></wallet-info>
59
</md-layout>
610

711
<md-layout md-flex="60">
812
<robot-exchange-pair></robot-exchange-pair>
913
</md-layout>
14+
15+
<md-layout md-flex="100">
16+
<order-list></order-list>
17+
</md-layout>
18+
1019
</md-layout>
1120
</template>
1221

1322
<script>
1423
import WalletInfo from '@/components/common/WalletInfo';
1524
import RobotExchangePair from '@/components/common/RobotExchangePair';
25+
import OrderList from '@/components/common/OrderList';
26+
import RobotSwitch from '@/components/common/RobotSwitch';
1627
1728
export default {
1829
name: 'home',
@@ -26,12 +37,14 @@ export default {
2637
components: {
2738
'wallet-info': WalletInfo,
2839
'robot-exchange-pair': RobotExchangePair,
40+
'order-list': OrderList,
41+
'robot-switch': RobotSwitch,
2942
},
3043
};
3144
</script>
3245

3346
<!-- Add "scoped" attribute to limit CSS to this component only -->
34-
<style scoped>
47+
<style>
3548
.main-box .md-layout {
3649
margin-top: 20px;
3750
padding: 10px;
@@ -45,4 +58,7 @@ export default {
4558
text-overflow:ellipsis;
4659
white-space: nowrap;
4760
}
61+
.custom-option {
62+
max-width: none !important;
63+
}
4864
</style>

0 commit comments

Comments
 (0)