Skip to content

Commit

Permalink
Merge pull request #1 from ety001/feature_0227
Browse files Browse the repository at this point in the history
Feature 0227
  • Loading branch information
ety001 authored Mar 13, 2018
2 parents ec003b6 + 482fbfd commit bb39bce
Show file tree
Hide file tree
Showing 11 changed files with 497 additions and 48 deletions.
31 changes: 22 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
},
"dependencies": {
"babel-runtime": "^6.26.0",
"stellar-sdk": "^0.7.3",
"vue": "^2.3.3",
"vue-material": "^0.7.4",
Expand Down
18 changes: 17 additions & 1 deletion src/components/Home.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
<template>
<md-layout md-gutter class="main-box">
<md-layout md-flex="100">
<robot-switch></robot-switch>
</md-layout>

<md-layout md-flex="40">
<wallet-info></wallet-info>
</md-layout>

<md-layout md-flex="60">
<robot-exchange-pair></robot-exchange-pair>
</md-layout>

<md-layout md-flex="100">
<order-list></order-list>
</md-layout>

</md-layout>
</template>

<script>
import WalletInfo from '@/components/common/WalletInfo';
import RobotExchangePair from '@/components/common/RobotExchangePair';
import OrderList from '@/components/common/OrderList';
import RobotSwitch from '@/components/common/RobotSwitch';
export default {
name: 'home',
Expand All @@ -26,12 +37,14 @@ export default {
components: {
'wallet-info': WalletInfo,
'robot-exchange-pair': RobotExchangePair,
'order-list': OrderList,
'robot-switch': RobotSwitch,
},
};
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped>
<style>
.main-box .md-layout {
margin-top: 20px;
padding: 10px;
Expand All @@ -45,4 +58,7 @@ export default {
text-overflow:ellipsis;
white-space: nowrap;
}
.custom-option {
max-width: none !important;
}
</style>
Loading

0 comments on commit bb39bce

Please sign in to comment.