Skip to content

Commit 9b7cd5b

Browse files
BlariBlari
committed
- Header: add more space between badge and arrow, clean logo;
- Dashboard: switch button to badge in main table; - Typography: fixed the typos and adaptive; - Notifications: fix error notification and 'close' color; - Update dependencies and changelog.
1 parent f651319 commit 9b7cd5b

File tree

7 files changed

+104
-38
lines changed

7 files changed

+104
-38
lines changed

‎changelog.md

+18-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
# Changelog
2-
## [v2.1.2]
2+
### [v2.1.3]
33

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.
4+
### Updated
5+
- Header: add more space between badge and arrow, clean logo;
6+
- Dashboard: switch button to badge in main table;
7+
- Typography: fixed the typos and adaptive;
8+
- Notifications: fix error notification and 'close' color;
9+
- Update dependencies and changelog.
10+
11+
## [v2.1.2]
1212

1313
### Updated
14+
- Navbar: fix adaptive, broken links, add padding;
15+
- Helper: fix icons and colors;
16+
- Dashboard: change icon arrow color;
17+
- Table: fix button margin, add colors to badges;
18+
- Notifications: fix error notification;
19+
- Typography: fix mobile view;
20+
- Charts: fix several colors;
21+
- Update dependencies.
22+
1423

1524
## [v2.1.1]
1625
### Updated

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
},
1111
"dependencies": {
1212
"animate.css": "^4.1.1",
13-
"apexcharts": "^3.22.0",
13+
"apexcharts": "^3.22.2",
1414
"awesome-bootstrap-checkbox": "^1.0.1",
1515
"bootstrap": "^4.5.3",
16-
"bootstrap-vue": "2.18.1",
16+
"bootstrap-vue": "2.19.0",
1717
"css-loader": "^1.0.1",
1818
"echarts": "^4.9.0",
1919
"expose-loader": "^0.7.5",
@@ -29,7 +29,7 @@
2929
"vue": "^2.6.12",
3030
"vue-apexcharts": "^1.6.0",
3131
"vue-echarts": "^4.1.0",
32-
"vue-router": "^3.4.8",
32+
"vue-router": "^3.4.9",
3333
"vue-toasted": "^1.1.28",
3434
"vue-touch": "2.0.0-beta.4",
3535
"vue2-google-maps": "^0.10.7",

‎src/components/Header/Header.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333
</b-form>
3434
</b-nav>
3535
<a class="navbarBrand d-md-none">
36-
<i class="fa fa-circle text-primary mr-n-sm" />
3736
<i class="fa fa-circle text-danger" />
3837
&nbsp;
3938
sing
4039
&nbsp;
41-
<i class="fa fa-circle text-danger mr-n-sm" />
4240
<i class="fa fa-circle text-primary" />
4341
</a>
4442
<b-nav class="ml-auto">
@@ -51,7 +49,7 @@
5149
<img class="rounded-circle" src="../../assets/people/a5.jpg" alt="..." />
5250
</span>
5351
<span class="small">Philip Smith</span>
54-
<span class="ml-1 mr-2 circle bg-primary text-white fw-bold">13</span>
52+
<span class="ml-1 mr-3 circle bg-primary text-white fw-bold">13</span>
5553
</template>
5654
<Notifications />
5755
</b-nav-item-dropdown>

‎src/pages/Dashboard/Dashboard.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@
143143
<td>{{row.date}}</td>
144144
<td>{{row.city}}</td>
145145
<td>
146-
<b-button
146+
<b-badge
147147
:variant="row.status === 'Pending'
148148
? 'success'
149149
: row.status === 'Declined' ? 'danger' : 'info'"
150-
class="p-1 px-3 btn-xs"
150+
pill
151151
>
152152
{{row.status}}
153-
</b-button>
153+
</b-badge>
154154
</td>
155155
</tr>
156156
</tbody>

‎src/pages/Typography/Typography.vue

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
Typography - <span class="fw-semi-bold">Texts & Display</span>
55
</h1>
66
<b-row>
7-
<b-col xs="12" md="6">
7+
<b-col xs="12" lg="6">
88
<Widget
99
title="<h5>Headings <small class='text-muted'>Default and customized</small></h5>"
1010
customHeader close collapse
1111
>
1212
<h4>Default headings</h4>
1313
<p>Basic headings for everyday use</p>
14-
<div class="widget-padding-md w-100 h-100 text-left border rounded">
14+
<div class="widget-padding-md w-100 h-100 text-left border rounded overflow-hidden">
1515
<b-row>
1616
<b-col sm="6">
1717
<h1>h1. Heading</h1>
@@ -53,7 +53,7 @@
5353
</div>
5454
</Widget>
5555
</b-col>
56-
<b-col xs="12" md="6">
56+
<b-col xs="12" lg="6">
5757
<Widget
5858
title="<h5>Body texts <small className='text-muted'>Variations</small></h5>"
5959
customHeader close collapse
@@ -74,15 +74,15 @@
7474
<div class="widget-padding-md w-100 h-100 text-left border rounded">
7575
<p>Thin (default) font weight</p>
7676
<p class="fw-normal">Normal font weight</p>
77-
<p class="fw-semi-bold">Semi bold to empasize important thing</p>
77+
<p class="fw-semi-bold">Semi bold to emphasize important thing</p>
7878
<p class="fw-bold">Bold font as a high priority</p>
7979
</div>
80-
<h4 class="mt-5">colors</h4>
80+
<h4 class="mt-5">Colors</h4>
8181
<p>Bootstrap state colors can be applied to texts too</p>
8282
<div class="widget-padding-md w-100 h-100 text-left border rounded">
8383
<p class="text-danger">Some danger text</p>
8484
<p class="text-warning">Some warning text</p>
85-
<p class="text-success">Some succes text</p>
85+
<p class="text-success">Some success text</p>
8686
<p class="text-primary">Some primary text</p>
8787
<p class="text-info">Some info text</p>
8888
</div>

‎src/styles/_overrides.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ pre {
714714
}
715715

716716
&.error {
717-
background: theme-color('error');
717+
background: theme-color('danger');
718718
}
719719

720720
&.success {
@@ -730,7 +730,7 @@ pre {
730730
}
731731

732732
.action {
733-
color: $text-color;
733+
color: white;
734734
}
735735
}
736736
}

‎yarn.lock

+71-12
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@
124124
dependencies:
125125
"@babel/types" "^7.8.3"
126126

127+
"@babel/helper-module-imports@^7.10.4":
128+
version "7.12.5"
129+
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
130+
integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
131+
dependencies:
132+
"@babel/types" "^7.12.5"
133+
127134
"@babel/helper-module-transforms@^7.8.3":
128135
version "7.8.6"
129136
resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz#6a13b5eecadc35692047073a64e42977b97654a4"
@@ -184,6 +191,11 @@
184191
dependencies:
185192
"@babel/types" "^7.8.3"
186193

194+
"@babel/helper-validator-identifier@^7.10.4":
195+
version "7.10.4"
196+
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
197+
integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
198+
187199
"@babel/helper-wrap-function@^7.8.3":
188200
version "7.8.3"
189201
resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -607,6 +619,15 @@
607619
globals "^11.1.0"
608620
lodash "^4.17.13"
609621

622+
"@babel/types@^7.12.5":
623+
version "7.12.6"
624+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
625+
integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
626+
dependencies:
627+
"@babel/helper-validator-identifier" "^7.10.4"
628+
lodash "^4.17.19"
629+
to-fast-properties "^2.0.0"
630+
610631
"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
611632
version "7.8.7"
612633
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
@@ -670,6 +691,23 @@
670691
consola "^2.15.0"
671692
node-fetch "^2.6.1"
672693

694+
"@rollup/plugin-babel@^5.2.1":
695+
version "5.2.1"
696+
resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz#20fc8f8864dc0eaa1c5578408459606808f72924"
697+
integrity sha512-Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A==
698+
dependencies:
699+
"@babel/helper-module-imports" "^7.10.4"
700+
"@rollup/pluginutils" "^3.1.0"
701+
702+
"@rollup/pluginutils@^3.1.0":
703+
version "3.1.0"
704+
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
705+
integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
706+
dependencies:
707+
"@types/estree" "0.0.39"
708+
estree-walker "^1.0.1"
709+
picomatch "^2.2.2"
710+
673711
"@soda/friendly-errors-webpack-plugin@^1.7.1":
674712
version "1.7.1"
675713
resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz#706f64bcb4a8b9642b48ae3ace444c70334d615d"
@@ -682,6 +720,11 @@
682720
version "1.1.1"
683721
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
684722

723+
"@types/[email protected]":
724+
version "0.0.39"
725+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
726+
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
727+
685728
"@types/events@*":
686729
version "3.0.0"
687730
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -1197,11 +1240,12 @@ anymatch@^2.0.0:
11971240
micromatch "^3.1.4"
11981241
normalize-path "^2.1.1"
11991242

1200-
apexcharts@^3.22.0:
1201-
version "3.22.0"
1202-
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.22.0.tgz#df6f1030d0d5bba605069907102d2c261afe97cb"
1203-
integrity sha512-DDh2eXnAEA8GoKU/hdicOaS2jzGehXwv8Bj1djYYudkeQzEdglFoWsVyIxff+Ds7+aUtVAJzd/9ythZuyyIbXQ==
1243+
apexcharts@^3.22.2:
1244+
version "3.22.2"
1245+
resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.22.2.tgz#7656a54e4a69479e0737c05defcd542c8cc162c5"
1246+
integrity sha512-pR+cmApk7dhfYILBpe8RVb+FdLfVCt/RDWvAJO1F5feeSQ8lKDgFkRuVu9KOeEarHVXjUpnhLqHNMx7YaprK8A==
12041247
dependencies:
1248+
"@rollup/plugin-babel" "^5.2.1"
12051249
svg.draggable.js "^2.2.2"
12061250
svg.easing.js "^2.0.0"
12071251
svg.filter.js "^2.0.2"
@@ -1499,10 +1543,10 @@ boolbase@^1.0.0, boolbase@~1.0.0:
14991543
version "1.0.0"
15001544
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
15011545

1502-
bootstrap-vue@2.18.1:
1503-
version "2.18.1"
1504-
resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.18.1.tgz#4378d26b713d4255b45b42b3f852f6fa0a11d400"
1505-
integrity sha512-oYKAhEnNuCxtF4gxsdLzijhQpFk7UYPvzhwZvUbnPbZ1eWu2dsc3+fRkY9PMowt5OJRtuVb7ov3lpsI2fraYsA==
1546+
bootstrap-vue@2.19.0:
1547+
version "2.19.0"
1548+
resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.19.0.tgz#5019df48251e552a5c34da57fc97dabebd53b02f"
1549+
integrity sha512-IjAXUSrRU5Qu9x3uwUcoj6LtysKbCVeWoJOsODyI/WokStUr95M+tTIajXUjIrB/Nsk0fS+RNvZnm2sWeNFrhg==
15061550
dependencies:
15071551
"@nuxt/opencollective" "^0.3.2"
15081552
bootstrap ">=4.5.3 <5.0.0"
@@ -2909,6 +2953,11 @@ estree-walker@^0.6.1:
29092953
version "0.6.1"
29102954
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
29112955

2956+
estree-walker@^1.0.1:
2957+
version "1.0.1"
2958+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
2959+
integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
2960+
29122961
esutils@^2.0.2:
29132962
version "2.0.3"
29142963
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -4471,6 +4520,11 @@ lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.1
44714520
version "4.17.15"
44724521
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
44734522

4523+
lodash@^4.17.19:
4524+
version "4.17.20"
4525+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
4526+
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
4527+
44744528
log-symbols@^2.2.0:
44754529
version "2.2.0"
44764530
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -5413,6 +5467,11 @@ performance-now@^2.1.0:
54135467
version "2.1.0"
54145468
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
54155469

5470+
picomatch@^2.2.2:
5471+
version "2.2.2"
5472+
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
5473+
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
5474+
54165475
pify@^2.0.0:
54175476
version "2.3.0"
54185477
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -7427,10 +7486,10 @@ vue-loader@^15.7.0:
74277486
vue-hot-reload-api "^2.3.0"
74287487
vue-style-loader "^4.1.0"
74297488

7430-
vue-router@^3.4.8:
7431-
version "3.4.8"
7432-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.8.tgz#2c06261d35d8075893470352d42d70b6287b8194"
7433-
integrity sha512-3BsR84AqarcmweXjItxw3jwQsiYNssYg090yi4rlzTnCJxmHtkyCvhNz9Z7qRSOkmiV485KkUCReTp5AjNY4wg==
7489+
vue-router@^3.4.9:
7490+
version "3.4.9"
7491+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
7492+
integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
74347493

74357494
vue-style-loader@^4.1.0:
74367495
version "4.1.2"

0 commit comments

Comments
 (0)