Skip to content
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

UI improvements #46

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+160 −49
Open

UI improvements #46

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
579089e
change tabs style to have same view in all platforms.
amijafari Apr 14, 2017
e23a51e
show login error messages to user
amijafari Apr 14, 2017
35da1ac
some ui/css improvement
amijafari Apr 14, 2017
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
Prev Previous commit
some ui/css improvement
@amijafari
amijafari committed Apr 14, 2017
commit 35da1ac1d2294f9548376030a4c2d4ba1a6d16e9
46 changes: 44 additions & 2 deletions clients/ionic/bestoon/scss/ionic.app.scss
View file
Original file line number Diff line number Diff line change
@@ -27,10 +27,52 @@ $ionicons-font-path: "../lib/ionic/fonts" !default;
font-weight: normal;
}
$font-family-base: 'Vazir' !default;

// Include all of Ionic
@import "www/lib/ionic/scss/ionic";
ion-content {
direction: rtl;
margin-right: 10px;
margin-left: 10px;
}

.tab-item .tab-title {
font-family: $font-family-base;
}

.item-complex .item-content {
padding-right: 16px;
}

.item-input {
padding-right: 16px;
padding-left: 16px;
}

.item {
border-left-width: 0;
border-right-width: 0;
}

.full-width-header {
margin-bottom: 0;
padding: 10px;
}

.balanced {
background: #33cd5f;
color: #fff;
}

.assertive {
background: #ef473a;
color: #fff;
}

h3, .h3 {
font-size: 21px;
}

.item .badge.badge-left {
right: auto;
left: 16px;
}

37 changes: 34 additions & 3 deletions clients/ionic/bestoon/www/css/ionic.app.css
View file
Original file line number Diff line number Diff line change
@@ -9823,6 +9823,37 @@ a.button {
transition-duration: 0s; }

ion-content {
direction: rtl;
margin-right: 10px;
margin-left: 10px; }
direction: rtl; }

.tab-item .tab-title {
font-family: "Vazir"; }

.item-complex .item-content {
padding-right: 16px; }

.item-input {
padding-right: 16px;
padding-left: 16px; }

.item {
border-left-width: 0;
border-right-width: 0; }

.full-width-header {
margin-bottom: 0;
padding: 10px; }

.balanced {
background: #33cd5f;
color: #fff; }

.assertive {
background: #ef473a;
color: #fff; }

h3, .h3 {
font-size: 21px; }

.item .badge.badge-left {
right: auto;
left: 16px; }
2 changes: 1 addition & 1 deletion clients/ionic/bestoon/www/css/ionic.app.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion clients/ionic/bestoon/www/css/style.css
View file
Original file line number Diff line number Diff line change
@@ -25,4 +25,4 @@
ion-content {
direction: rtl;
font-family: "Vazir";
}
}
40 changes: 24 additions & 16 deletions clients/ionic/bestoon/www/templates/tab-dash.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
<ion-view view-title="بستون">
<ion-content class="padding">
<ion-content>

<p>
<p class="padding">
برنامه به سرعت در حال توسعه است. هر هفته چیز جدیدی خواهیم داشت.
</P>

<p>
<div class="row header">
<div class="col"></div>
<div class="col">دفعات</div>
<div class="col">جمع</div>
<div class="list">
<div class="item item-divider">
درآمد
</div>
<div class="row header">
<div class="col">درآمد</div>
<div class="col">{{generalstat.income.amount__count}}</div>
<div class="col">{{generalstat.income.amount__sum}}</div>
<div class="item item-icon-left">
{{generalstat.income.amount__sum}} تومان
<a href="#/tab/income">
<span class="badge badge-positive badge-left">
{{generalstat.income.amount__count}}
</span>
</a>
</div>
<div class="row header">
<div class="col">هزینه‌</div>
<div class="col">{{generalstat.expense.amount__count}}</div>
<div class="col">{{generalstat.expense.amount__sum}}</div>

<div class="item item-divider">
هزینه
</div>
<div class="item item-icon-left">
{{generalstat.expense.amount__sum}} تومان
<a href="#/tab/expense">
<span class="badge badge-positive badge-left">
{{generalstat.expense.amount__count}}
</span>
</a>
</div>
</p>
</div>

</ion-content>
</ion-view>
11 changes: 8 additions & 3 deletions clients/ionic/bestoon/www/templates/tab-expense.html
View file
Original file line number Diff line number Diff line change
@@ -16,16 +16,21 @@
<input type="text" placeholder="" ng-model="text">
</label>
</div>
<button class="button button-positive">
<div class="padding-horizontal">
<button class="button button-block button-positive">
ثبت
</button>
</div>
</form>

<h3>تاریخچه</h3>
<h3 class="full-width-header balanced">
تاریخچه
</h3>

<ion-list
show-delete="shouldShowDelete"
can-swipe="listCanSwipe">
<ion-item ng-repeat="expense in expenses" class="item-thumbnail-left">
<ion-item ng-repeat="expense in expenses">

<h2>{{expense.fields.amount}}</h2>
<p>{{expense.fields.text}}</p>
15 changes: 10 additions & 5 deletions clients/ionic/bestoon/www/templates/tab-income.html
View file
Original file line number Diff line number Diff line change
@@ -16,16 +16,21 @@
<input type="text" placeholder="" ng-model="text">
</label>
</div>
<button class="button button-positive">
ثبت
</button>
<div class="padding-horizontal">
<button class="button button-block button-positive">
ثبت
</button>
</div>
</form>

<h3>تاریخچه</h3>
<h3 class="full-width-header balanced">
تاریخچه
</h3>

<ion-list
show-delete="shouldShowDelete"
can-swipe="listCanSwipe">
<ion-item ng-repeat="income in incomes" class="item-thumbnail-left">
<ion-item ng-repeat="income in incomes">

<h2>{{income.fields.amount}}</h2>
<p>{{income.fields.text}}</p>
4 changes: 2 additions & 2 deletions clients/ionic/bestoon/www/templates/tabs.html
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@
</ion-tab>

<!-- Expense Tab -->
<ion-tab title="خرج" icon-off="ion-ios-chatboxes-outline" icon-on="ion-ios-chatboxes" href="#/tab/expense">
<ion-tab title="خرج" icon-off="ion-ios-upload-outline" icon-on="ion-ios-upload" href="#/tab/expense">
<ion-nav-view name="tab-expense"></ion-nav-view>
</ion-tab>

<!-- Income Tab -->
<ion-tab title="درآمد" icon-off="ion-ios-gear-outline" icon-on="ion-ios-gear" href="#/tab/income">
<ion-tab title="درآمد" icon-off="ion-ios-download-outline" icon-on="ion-ios-download" href="#/tab/income">
<ion-nav-view name="tab-income"></ion-nav-view>
</ion-tab>