Skip to content

Commit d76bc09

Browse files
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;
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>

0 commit comments

Comments
 (0)