Skip to content

Commit 003435a

Browse files
committed
Navbar: fix adaptive, broken links, add padding;
Helper: fix icons and colors; Dashboard: change icon arrow color; Table: fix button margin, add colors to badges; Notifications: fix error notification; Typography: fix mobile view; Charts: fix several colors;
1 parent 17bf2d9 commit 003435a

File tree

13 files changed

+117
-96
lines changed

13 files changed

+117
-96
lines changed

changelog.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
# Changelog
2-
## [v2.1.1]
2+
## [v2.1.2]
3+
4+
Navbar: fix adaptive, broken links, add padding;
5+
Helper: fix icons and colors;
6+
Dashboard: change icon arrow color;
7+
Table: fix button margin, add colors to badges;
8+
Notifications: fix error notification;
9+
Typography: fix mobile view;
10+
Charts: fix several colors;
11+
upd dependencies.
312

413
### Updated
514

15+
## [v2.1.1]
16+
### Updated
17+
618
- Update dependency
719
- Fix animation class
820
- Fix Echart Donut Chart in charts page
921

1022
## [v2.1.0]
11-
1223
### Updated
1324

1425
- New Design
1526

1627
## [v2.0.0]
17-
1828
### Updated
1929

2030
- Remove All Jquery

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sing-app-vue",
3-
"version": "4.5.0",
3+
"version": "2.1.3",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve --port 3000",
@@ -9,27 +9,27 @@
99
"start": "node server.js"
1010
},
1111
"dependencies": {
12-
"animate.css": "^4.1.0",
13-
"apexcharts": "^3.19.3",
12+
"animate.css": "^4.1.1",
13+
"apexcharts": "^3.22.0",
1414
"awesome-bootstrap-checkbox": "^1.0.1",
15-
"bootstrap": "^4.5.0",
16-
"bootstrap-vue": "2.15.0",
15+
"bootstrap": "^4.5.3",
16+
"bootstrap-vue": "2.18.1",
1717
"css-loader": "^1.0.1",
18-
"echarts": "^4.8.0",
18+
"echarts": "^4.9.0",
1919
"expose-loader": "^0.7.5",
2020
"font-awesome": "4.7.0",
2121
"glyphicons-halflings": "^1.9.1",
22-
"highcharts": "^7.2.1",
22+
"highcharts": "^7.2.2",
2323
"highcharts-vue": "^1.3.5",
2424
"imports-loader": "^0.8.0",
2525
"line-awesome": "1.3.0",
2626
"node-sass": "^4.14.1",
2727
"rickshaw": "1.7.1",
2828
"sass-loader": "^7.3.1",
29-
"vue": "^2.6.11",
29+
"vue": "^2.6.12",
3030
"vue-apexcharts": "^1.6.0",
3131
"vue-echarts": "^4.1.0",
32-
"vue-router": "^3.3.4",
32+
"vue-router": "^3.4.8",
3333
"vue-toasted": "^1.1.28",
3434
"vue-touch": "2.0.0-beta.4",
3535
"vue2-google-maps": "^0.10.7",
@@ -42,7 +42,7 @@
4242
"@vue/cli-plugin-babel": "^3.12.0",
4343
"@vue/cli-plugin-eslint": "^3.12.0",
4444
"@vue/cli-service": "^3.12.0",
45-
"vue-template-compiler": "^2.6.10"
45+
"vue-template-compiler": "^2.6.12"
4646
},
4747
"eslintConfig": {
4848
"root": true,

src/components/Header/Header.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</b-form-group>
3333
</b-form>
3434
</b-nav>
35-
<a class="navbarBrand d-md-none">
35+
<a class="navbarBrand d-md-none">
3636
<i class="fa fa-circle text-primary mr-n-sm" />
3737
<i class="fa fa-circle text-danger" />
3838
&nbsp;
@@ -43,15 +43,15 @@
4343
</a>
4444
<b-nav class="ml-auto">
4545
<b-nav-item-dropdown
46-
class="notificationsMenu d-md-down-none mr-2"
46+
class="notificationsMenu d-sm-down-none mr-2"
4747
menu-class="notificationsWrapper py-0 animate__animated animate__animated-fast animate__fadeIn"
4848
right>
4949
<template slot="button-content">
5050
<span class="avatar rounded-circle thumb-sm float-left mr-2">
5151
<img class="rounded-circle" src="../../assets/people/a5.jpg" alt="..." />
5252
</span>
5353
<span class="small">Philip Smith</span>
54-
<span class="ml-1 circle bg-primary text-white fw-bold">13</span>
54+
<span class="ml-1 mr-2 circle bg-primary text-white fw-bold">13</span>
5555
</template>
5656
<Notifications />
5757
</b-nav-item-dropdown>

src/components/Helper/Helper.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,8 @@
9090
transform: rotate(-360deg);
9191
}
9292
}
93+
94+
.btn i.glyphicon-headphones {
95+
top: 0;
96+
}
9397
}

src/components/Helper/Helper.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<a href="https://flatlogic.com/templates/sing-app-vue"
1414
target="_blank"
1515
role="button"
16-
class="btn btn-info btn-rounded-f btn-block fs-mini text-white">
16+
class="btn btn-success btn-rounded-f btn-block fs-mini text-white">
1717
Purchase
1818
</a>
1919
<a href="http://demo.flatlogic.com/sing-app-vue/#/documentation/"

src/pages/Charts/mock.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ export const chartData = {
377377
}
378378
}
379379
},
380-
colors: [success, primary, info],
380+
colors: [success, warning, info],
381381

382382
series: [{
383-
name: "Winter 2014-2015",
383+
name: "Winter 2017-2018",
384384
data: [
385385
[Date.UTC(1970, 10, 25), 0],
386386
[Date.UTC(1970, 11, 6), 0.25],
@@ -411,7 +411,7 @@ export const chartData = {
411411
[Date.UTC(1971, 6, 4), 0]
412412
]
413413
}, {
414-
name: "Winter 2015-2016",
414+
name: "Winter 2018-2019",
415415
type: 'areaspline',
416416
data: [
417417
[Date.UTC(1970, 10, 9), 0],
@@ -439,7 +439,7 @@ export const chartData = {
439439
[Date.UTC(1971, 5, 7), 0]
440440
]
441441
}, {
442-
name: "Winter 2016-2017",
442+
name: "Winter 2019-2020",
443443
type: 'areaspline',
444444
data: [
445445
[Date.UTC(1970, 9, 15), 0],

src/pages/Dashboard/Dashboard.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="dashboard-page">
33
<h1 class="page-title">Dashboard</h1>
44
<b-row>
5-
<b-col lg="3" sm="6" xs="12">
5+
<b-col md="6" xl="3" sm="6" xs="12">
66
<div class="pb-xlg h-100">
77
<Widget class="h-100 mb-0" title="Visits Today" close>
88
<div class="d-flex justify-content-between align-items-center mb-lg">
@@ -23,14 +23,14 @@
2323
</Widget>
2424
</div>
2525
</b-col>
26-
<b-col lg="3" sm="6" xs="12">
26+
<b-col md="6" xl="3" sm="6" xs="12">
2727
<div class="pb-xlg h-100">
2828
<Widget class="h-100 mb-0" title="Revenue Breakdown" close>
2929
<highcharts :options="donut"></highcharts>
3030
</Widget>
3131
</div>
3232
</b-col>
33-
<b-col lg="3" sm="6" xs="12">
33+
<b-col md="6" xl="3" sm="6" xs="12">
3434
<div class="pb-xlg h-100">
3535
<Widget class="h-100 mb-0" title="App Perfomance" close>
3636
<p class="text-muted d-flex flex-wrap">
@@ -60,7 +60,7 @@
6060
</Widget>
6161
</div>
6262
</b-col>
63-
<b-col lg="3" sm="6" xs="12">
63+
<b-col md="6" xl="3" sm="6" xs="12">
6464
<div class="pb-xlg h-100">
6565
<Widget class="h-100 mb-0" title="Server Overview" close>
6666
<div class="d-flex align-items-center mb-sm">

src/pages/Dashboard/components/BigStat/BigStat.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="d-flex align-items-start">
2323
<h6>+{{registrations.value}}</h6>
2424
<i
25-
:class="`la la-arrow-right la-lg ml-sm text-${registrations.profit ? 'primary' : 'danger'}
25+
:class="`la la-arrow-right la-lg ml-sm text-${registrations.profit ? 'success' : 'danger'}
2626
rotate-${registrations.profit ? '315' : '45'}`"
2727
/>
2828
</div>
@@ -32,7 +32,7 @@
3232
<div class="d-flex align-items-start">
3333
<h6>{{bounce.value}}%</h6>
3434
<i
35-
:class="`la la-arrow-right la-lg ml-sm text-${bounce.profit ? 'primary' : 'danger'}
35+
:class="`la la-arrow-right la-lg ml-sm text-${bounce.profit ? 'success' : 'danger'}
3636
rotate-${bounce.profit ? '315' : '45'}`"
3737
/>
3838
</div>

src/pages/Notifications/Notifications.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default {
9494
});
9595
},
9696
addErrorNotification() {
97-
this.$toasted.info('Launching thermonuclear war...', {
97+
this.$toasted.error('Launching thermonuclear war...', {
9898
action: [
9999
{
100100
text: 'Cancel',

src/pages/Tables/Basic.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</div>
6565
<div class="clearfix">
6666
<div class="float-right">
67-
<b-button variant="default" class="mr-xs" size="sm">Send to...</b-button>
67+
<b-button variant="default" class="mr-3" size="sm">Send to...</b-button>
6868
<b-dropdown variant="inverse" class="mr-xs" size="sm" text="Clear" right>
6969
<b-dropdown-item>Clear</b-dropdown-item>
7070
<b-dropdown-item>Move ...</b-dropdown-item>
@@ -169,28 +169,28 @@
169169
<td>Mark</td>
170170
<td>Otto</td>
171171
<td><a href="#">[email protected]</a></td>
172-
<td><b-badge variant="gray" class="text-gray" pill>Pending</b-badge></td>
172+
<td><b-badge variant="primary" pill>Pending</b-badge></td>
173173
</tr>
174174
<tr>
175175
<td>2</td>
176176
<td>Jacob</td>
177177
<td>Thornton</td>
178178
<td><a href="#">[email protected]</a></td>
179-
<td><b-badge variant="gray" class="text-gray-light" pill>Unconfirmed</b-badge></td>
179+
<td><b-badge variant="info" pill>Unconfirmed</b-badge></td>
180180
</tr>
181181
<tr>
182182
<td>3</td>
183183
<td>Larry</td>
184184
<td>the Bird</td>
185185
<td><a href="#">[email protected]</a></td>
186-
<td><b-badge variant="gray" class="text-gray" pill>New</b-badge></td>
186+
<td><b-badge variant="success" pill>New</b-badge></td>
187187
</tr>
188188
<tr>
189189
<td>4</td>
190190
<td>Peter</td>
191191
<td>Horadnia</td>
192192
<td><a href="#">[email protected]</a></td>
193-
<td><b-badge variant="gray" class="text-gray-light" pill>Active</b-badge></td>
193+
<td><b-badge variant="warning" pill>Active</b-badge></td>
194194
</tr>
195195
</tbody>
196196
</table>

0 commit comments

Comments
 (0)