From 9f487e37bf5982d312b7c2a86951b46feaa4eaa1 Mon Sep 17 00:00:00 2001 From: alihaghighatkhah Date: Fri, 19 May 2017 18:32:35 +0200 Subject: [PATCH 1/2] Make tabs more obvoius --- src/components/main/main.less | 24 ++++++++++++++++++++ src/components/main/main.pug | 2 +- src/components/transactions/transactions.pug | 1 - 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/components/main/main.less b/src/components/main/main.less index 4c7e161f2..92a6056a0 100644 --- a/src/components/main/main.less +++ b/src/components/main/main.less @@ -19,3 +19,27 @@ md-menu-item md-checkbox { margin: 0; padding: 8px; } + +md-tabs.main-tabs { + margin: 0 0 -8px 0; + md-tabs-wrapper { + margin: 0 8px; + + &.md-stretch-tabs md-pagination-wrapper { + width: auto; + display: block; + } + md-ink-bar { + bottom: auto; + top: 0; + } + } + .md-tab { + background: #f4f4f4; + box-shadow: inset 0px -1px 1px -1px rgba(0, 0, 0, 0.12); + &.md-active { + background: white; + box-shadow: 0px -2px 1px 0px rgba(0,0,0,0.54); + } + } +} diff --git a/src/components/main/main.pug b/src/components/main/main.pug index f3c312601..092375f58 100644 --- a/src/components/main/main.pug +++ b/src/components/main/main.pug @@ -1,5 +1,5 @@ top -md-tabs(md-stretch-tabs='always') +md-tabs.main-tabs(md-stretch-tabs='always') md-tab(data-ui-sref='main.transactions', md-active='$ctrl.activeTab === "main.transactions"') md-tab-label Transactions md-tab(data-ui-sref='main.voting', md-active='$ctrl.activeTab === "main.voting"') diff --git a/src/components/transactions/transactions.pug b/src/components/transactions/transactions.pug index f45f4ab8e..2db865c83 100644 --- a/src/components/transactions/transactions.pug +++ b/src/components/transactions/transactions.pug @@ -1,7 +1,6 @@ md-card.offline-hide md-card-content md-content(layout='row', layout-align='start center', layout-padding) - span.title.md-title Transactions div(flex) span.empty(ng-show='!$ctrl.transactions.length && $ctrl.loaded') No transactions md-content(layout='column', layout-align='center center') From 53f4041726f5dd08c77a1eed57c0edf16367b1ca Mon Sep 17 00:00:00 2001 From: alihaghighatkhah Date: Fri, 19 May 2017 18:33:25 +0200 Subject: [PATCH 2/2] Add white background to forging component to make it similar to other tabs --- src/components/forging/forging.less | 3 +++ src/components/forging/forging.pug | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/forging/forging.less b/src/components/forging/forging.less index 9f3b09987..45b23bc4f 100644 --- a/src/components/forging/forging.less +++ b/src/components/forging/forging.less @@ -1,4 +1,7 @@ forging { + md-card md-card { + background: #f7f8f9; + } md-card-content { padding: 0 0 5px; } diff --git a/src/components/forging/forging.pug b/src/components/forging/forging.pug index ea333561a..ee496c9a4 100644 --- a/src/components/forging/forging.pug +++ b/src/components/forging/forging.pug @@ -1,4 +1,4 @@ -div.offline-hide +md-card.offline-hide div md-card.loading(ng-show='!$ctrl.delegate') md-progress-linear(md-mode='indeterminate')