Skip to content

Commit d76bc09

Browse files
BlariBlari
committed
Dashboard: table -> change buttons to badges, fix justify content in widgets, add more space between elements, upd badges, fix border color in table,
Package: add/fix links; Update gray button; Alerts: change content position; Fixed colors; Form elements: fix several ui bugs; Gallery: fix page; TimeLine: fix image;
1 parent 2817eee commit d76bc09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+256
-229
lines changed

‎changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## [5.2.6]
4+
### Changed
5+
6+
Dashboard: table -> change buttons to badges, fix justify content in widgets, add more space between elements, upd badges, fix border color in table,
7+
Package: add/fix links;
8+
Update gray button;
9+
Alerts: change content position;
10+
Fixed colors;
11+
Form elements: fix several ui bugs;
12+
Gallery: fix page;
13+
TimeLine: fix image;
14+
315
## [5.2.5]
416

517
### Changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sing-app",
3-
"version": "5.2.5",
3+
"version": "5.2.6",
44
"description": "Sing Dashboard App with Angular 7.0 Final Release support by Flatlogic",
55
"scripts": {
66
"install": "napa",

‎src/app/layout/layout.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<router-outlet></router-outlet>
3030
</div>
3131
<footer class="content-footer">
32-
2019 &copy; Sing App Angular - Angular Admin Dashboard Template Made by <a href="https://flatlogic.com" target="_blank">Flatlogic</a>
32+
2020 &copy; Sing App Angular - Angular Admin Dashboard Template Made by <a href="https://flatlogic.com" target="_blank">Flatlogic</a>
3333
</footer>
3434
</main>
3535
</div>

‎src/app/pages/analytics/analytics.template.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h6>{{analyticsService.visits.sign_out_pct}}%</h6>
3333
</div>
3434
<div class="mt">
3535
<h6>{{analyticsService.visits.rate_pct}}%</h6>
36-
<p class="text-muted mb-0 mr">
36+
<p class="text-muted mb-0">
3737
<small>Rate</small>
3838
</p>
3939
</div>
@@ -182,9 +182,9 @@ <h5>Support <span class='fw-semi-bold'>Requests</span></h5>
182182
<td>{{row.date}}</td>
183183
<td>{{row.city}}</td>
184184
<td>
185-
<button class="btn p-1 px-3 btn-xs btn-{{row.status === 'Pending' ? 'success' : row.status === 'Declined' ? 'danger' : 'info'}}">
185+
<span class="badge badge-{{row.status === 'Pending' ? 'success' : row.status === 'Declined' ? 'danger' : 'info'}}">
186186
{{row.status}}
187-
</button>
187+
</span>
188188
</td>
189189
</tr>
190190
</tbody>

‎src/app/pages/core/colors/colors.template.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,28 @@ <h5>
118118
Semantically distinguishable beauty.
119119
</p>
120120
<p>
121-
<button class="btn btn-default width-100 mb-xs" role="button">
121+
<button class="btn btn-default width-100 mb-3 mr-3" role="button">
122122
Defaullt
123123
</button>
124-
<button class="btn btn-primary width-100 mb-xs" role="button">
124+
<button class="btn btn-primary width-100 mb-3 mr-3" role="button">
125125
Primary
126126
</button>
127-
<button class="btn btn-info width-100 mb-xs" role="button">
127+
<button class="btn btn-info width-100 mb-3 mr-3" role="button">
128128
Info
129129
</button>
130-
<button class="btn btn-success width-100 mb-xs" role="button">
130+
<button class="btn btn-success width-100 mb-3 mr-3" role="button">
131131
Success
132132
</button>
133-
<button class="btn btn-warning width-100 mb-xs" role="button">
133+
<button class="btn btn-warning width-100 mb-3 mr-3" role="button">
134134
Warning
135135
</button>
136-
<button class="btn btn-danger width-100 mb-xs" role="button">
136+
<button class="btn btn-danger width-100 mb-3 mr-3" role="button">
137137
Danger
138138
</button>
139-
<button class="btn btn-gray width-100 mb-xs" role="button">
139+
<button class="btn btn-gray width-100 mb-3 mr-3" role="button">
140140
Gray
141141
</button>
142-
<button class="btn btn-inverse width-100 mb-xs" role="button">
142+
<button class="btn btn-inverse width-100 mb-3 mr-3" role="button">
143143
Inverse
144144
</button>
145145
</p>

‎src/app/pages/ecommerce/product-detail/components/bag/bag.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="btn-toolbar bag">
2-
<button class="btn btn-lg btn-inverse btn-add">
2+
<button class="btn btn-lg btn-inverse btn-add mr-2">
33
add to bag
44
<img src="assets/img/bag.svg" alt="bag" />
55
</button>

‎src/app/pages/ecommerce/product-detail/components/selects/selects.style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
}
1616

1717
&:last-child {
18-
width: calc(35% - 7.5px);
19-
margin-left: 7.5px;
18+
width: calc(35% - 16px);
19+
margin-left: 16px;
2020
}
2121
}
2222
}

‎src/app/pages/ecommerce/product-detail/components/slider/slider.style.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
transition: $transition-base;
1313
width: 50px;
1414
height: 50px;
15-
background-color: rgba(0, 0, 0, 0.15);
16-
color: $white;
15+
background-color: transparent;
16+
color: rgba(0, 0, 0, 0.24);
1717
border: none;
1818

1919
&:hover {
@@ -34,7 +34,7 @@
3434
}
3535

3636
.product-card {
37-
padding: 0 5px;
37+
padding: 0 8px;
3838
}
3939

4040
@include media-breakpoint-down(sm) {

‎src/app/pages/ecommerce/product-grid/components/filter/filter.style.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
.filters-group {
66
margin-left: 25px;
7+
display: flex;
8+
align-items: center;
79

810
.btn-group {
911
margin-left: 5px;

‎src/app/pages/ecommerce/product-grid/components/filter/filter.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="filters">
22
<div class="filters-group" *ngFor="let filter of filters.mainFilters">
3-
{{filter.name}}
3+
<p class="mr-3 mb-0">{{filter.name}}</p>
44
<filter-dropdown [dropdown]="filter.items"></filter-dropdown>
55
</div>
66
<div class="filters-group">
7-
{{filters.sortFilter.name}}
7+
<p class="mr-3 mb-0">{{filters.sortFilter.name}}</p>
88
<filter-dropdown [dropdown]="filters.sortFilter.items"></filter-dropdown>
99
</div>
1010
</div>

‎src/app/pages/extra/calendar/calendar.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ <h4>Draggable <span class="fw-semi-bold">Events</span></h4>
2222
Open windows
2323
</div>
2424
<div class='external-event draggable' data-event-class="bg-gray text-white">
25-
<i class="fa fa-circle-o fa-fw text-gray-light ml-xs"></i>
25+
<i class="fa fa-circle fa-fw text-primary ml-xs"></i>
2626
Some stuff
2727
</div>
2828
<div class='external-event draggable' data-event-class="bg-danger text-white">
2929
<i class="fa fa-square fa-fw text-danger ml-xs"></i>
3030
Study UX engineering
3131
</div>
3232
<div class='external-event draggable' data-event-class="bg-gray text-white">
33-
<i class="fa fa-circle-o fa-fw text-gray-light ml-xs"></i>
33+
<i class="fa fa-circle fa-fw text-info ml-xs"></i>
3434
Another stuff
3535
</div>
3636
</div>

‎src/app/pages/extra/invoice/invoice.template.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,17 @@ <h3 class="client-name m-t-1">
125125
<span class="fw-semi-bold">Bob Smith</span>
126126
</p>
127127
<div class="btn-toolbar mt-lg justify-content-end hidden-print">
128-
<button (click)="print()" class="btn btn-inverse">
128+
<button (click)="print()" class="btn btn-inverse mr-3">
129129
<i class="fa fa-print"></i>
130130
&nbsp;&nbsp;
131131
Print
132132
</button>
133133
<button class="btn btn-danger">
134134
Proceed with Payment
135135
&nbsp;
136-
<span class="circle bg-white">
137-
<i class="fa fa-arrow-right text-danger"></i>
138-
</span>
136+
<span class="circle bg-white">
137+
<i class="fa fa-arrow-right text-danger"></i>
138+
</span>
139139
</button>
140140
</div>
141141
</div>

‎src/app/pages/extra/time-line/time-line.template.html

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ <h1 class="page-title">Events - <span class="fw-semi-bold">Feed</span></h1>
99
<span class="date">yesterday</span>
1010
<span class="time">8:03 <span class="fw-semi-bold">pm</span></span>
1111
</time>
12-
<span class="event-icon event-icon-success">
13-
<i class="glyphicon glyphicon-map-marker"></i>
14-
</span>
12+
<span class="event-icon event-icon-success">
13+
<i class="glyphicon glyphicon-map-marker"></i>
14+
</span>
1515
<section class="event">
16-
<span class="thumb-sm avatar pull-left mr-sm">
17-
<img class="rounded-circle" src="assets/img/people/a2.jpg" alt="...">
18-
</span>
16+
<span class="thumb-sm avatar pull-left mr-sm">
17+
<img class="rounded-circle" src="assets/img/people/a2.jpg" alt="...">
18+
</span>
1919
<h4 class="event-heading"><a href="#">Jessica Nilson</a> <small>@jess</small></h4>
2020
<p class="fs-sm text-muted">10:12 am - Publicly near Minsk</p>
2121
<agm-map [latitude]="51" [longitude]="7" class="event-map">
@@ -104,7 +104,7 @@ <h5 class="event-heading"><a href="#">Jessica Smith</a> <small>@jess</small></h5
104104
</p>
105105
<div class="event-image">
106106
<a href="assets/img/pictures/8.jpg" data-ui-jq="magnificPopup" data-ui-options="{type: 'image'}">
107-
<img src="assets/img/pictures/8.jpg">
107+
<img class="img-fluid" src="assets/img/pictures/8.jpg">
108108
</a>
109109
</div>
110110
<footer>
@@ -114,33 +114,32 @@ <h5 class="event-heading"><a href="#">Jessica Smith</a> <small>@jess</small></h5
114114
<li><a href="#"><span class="text-danger"><i class="fa fa-heart-o"></i> Like</span></a></li>
115115
<li><a href="#">Comment</a></li>
116116
</ul>
117-
118-
<span class="thumb thumb-sm pull-right">
119-
<a href="#">
120-
<img class="rounded-circle" src="assets/img/people/a1.jpg">
121-
</a>
122-
</span>
123-
<span class="thumb thumb-sm pull-right">
124-
<a href="#"><img class="rounded-circle" src="assets/img/people/a5.jpg"></a>
125-
</span>
126-
<span class="thumb thumb-sm pull-right">
127-
<a href="#"><img class="rounded-circle" src="assets/img/people/a3.jpg"></a>
128-
</span>
117+
<span class="thumb thumb-sm pull-right">
118+
<a href="#">
119+
<img class="rounded-circle" src="assets/img/people/a1.jpg">
120+
</a>
121+
</span>
122+
<span class="thumb thumb-sm pull-right">
123+
<a href="#"><img class="rounded-circle" src="assets/img/people/a5.jpg"></a>
124+
</span>
125+
<span class="thumb thumb-sm pull-right">
126+
<a href="#"><img class="rounded-circle" src="assets/img/people/a3.jpg"></a>
127+
</span>
129128
</div>
130129
<ul class="post-comments mt-sm">
131130
<li>
132-
<span class="thumb-xs avatar pull-left mr-sm">
133-
<img class="rounded-circle" src="assets/img/people/a1.jpg" alt="...">
134-
</span>
131+
<span class="thumb-xs avatar pull-left mr-sm">
132+
<img class="rounded-circle" src="assets/img/people/a1.jpg" alt="...">
133+
</span>
135134
<div class="comment-body">
136135
<h6 class="author fs-sm fw-semi-bold">Ignacio Abad <small>6 mins ago</small></h6>
137136
<p>Hey, have you heard anything about that?</p>
138137
</div>
139138
</li>
140139
<li>
141-
<span class="thumb-xs avatar pull-left mr-sm">
142-
<img class="rounded-circle" src="assets/img/avatar.png" alt="...">
143-
</span>
140+
<span class="thumb-xs avatar pull-left mr-sm">
141+
<img class="rounded-circle" src="assets/img/avatar.png" alt="...">
142+
</span>
144143
<div class="comment-body">
145144
<input class="form-control form-control-sm" type="text" placeholder="Write your comment...">
146145
</div>
@@ -154,13 +153,13 @@ <h6 class="author fs-sm fw-semi-bold">Ignacio Abad <small>6 mins ago</small></h6
154153
<span class="date">yesterday</span>
155154
<span class="time">9:03 <span class="fw-semi-bold">am</span></span>
156155
</time>
157-
<span class="event-icon">
158-
<img class="rounded-circle" src="assets/img/avatar.png">
159-
</span>
156+
<span class="event-icon">
157+
<img class="rounded-circle" src="assets/img/avatar.png">
158+
</span>
160159
<section class="event">
161-
<span class="thumb-sm avatar pull-left mr-sm">
162-
<img class="rounded-circle" src="assets/img/people/a6.jpg" alt="...">
163-
</span>
160+
<span class="thumb-sm avatar pull-left mr-sm">
161+
<img class="rounded-circle" src="assets/img/people/a6.jpg" alt="...">
162+
</span>
164163
<h5 class="event-heading"><a href="#">Jessica Smith</a> <small>@jess</small></h5>
165164
<p class="fs-sm text-muted">9:03 am - Publicly near Minsk</p>
166165
<h5>New <span class="fw-semi-bold">Project</span> Launch</h5>

‎src/app/pages/forms/elements/elements.style.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
background: rgb(100, 189, 99);
4747
}
4848

49-
50-
51-
5249
/**
5350
* Jasny Bootstrap
5451
* Fileinput.less
@@ -330,11 +327,16 @@ $slider-handle-size: 26px;
330327
* Bootstrap select
331328
*/
332329

330+
331+
333332
.selectpicker.form-control {
334333
height: auto;
335334
}
336335

337336
.bootstrap-select {
337+
.bs-caret {
338+
display: none;
339+
}
338340
.dropdown-toggle {
339341
padding-left: 10px;
340342

0 commit comments

Comments
 (0)