Skip to content

Commit 76c8a0e

Browse files
BlariBlari
committed
Fix main chart color;
Fix widgets padding;
1 parent 273cc02 commit 76c8a0e

File tree

14 files changed

+78
-83
lines changed

14 files changed

+78
-83
lines changed

‎docs/css/app.21ad06a3.css renamed to ‎docs/css/app.d4882674.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/material-vue/favicon.ico"><title>Material Vue.js Dashboard - Free & Open Source Vue.js Admin Template</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/material-vue/css/app.21ad06a3.css" rel="preload" as="style"><link href="/material-vue/css/chunk-vendors.50d17b18.css" rel="preload" as="style"><link href="/material-vue/js/app.764d371f.js" rel="preload" as="script"><link href="/material-vue/js/chunk-vendors.b5270213.js" rel="preload" as="script"><link href="/material-vue/css/chunk-vendors.50d17b18.css" rel="stylesheet"><link href="/material-vue/css/app.21ad06a3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-material-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/material-vue/js/chunk-vendors.b5270213.js"></script><script src="/material-vue/js/app.764d371f.js"></script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/material-vue/favicon.ico"><title>Material Vue.js Dashboard - Free & Open Source Vue.js Admin Template</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/material-vue/css/app.d4882674.css" rel="preload" as="style"><link href="/material-vue/css/chunk-vendors.50d17b18.css" rel="preload" as="style"><link href="/material-vue/js/app.0d0eded4.js" rel="preload" as="script"><link href="/material-vue/js/chunk-vendors.b5270213.js" rel="preload" as="script"><link href="/material-vue/css/chunk-vendors.50d17b18.css" rel="stylesheet"><link href="/material-vue/css/app.d4882674.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-material-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/material-vue/js/chunk-vendors.b5270213.js"></script><script src="/material-vue/js/app.0d0eded4.js"></script></body></html>

‎docs/js/app.0d0eded4.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.0d0eded4.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/js/app.764d371f.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/js/app.764d371f.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/components/Sidebar/Sidebar.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
align="center">
1818
<v-col cols="6">
1919
<span
20-
style="padding-left: 32px"
21-
class="text-body-1 subheader"
22-
:class="(item.heading && DRAWER_STATE) ? 'show ' : 'hide'">
23-
{{ item.heading }}
20+
style="padding-left: 32px"
21+
class="text-body-1 subheader"
22+
:class="(item.heading && DRAWER_STATE) ? 'show ' : 'hide'">
23+
{{ item.heading }}
2424
</span>
2525
</v-col>
2626
<v-col

‎src/pages/Charts/Charts.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<v-row>
1919
<v-col cols="12" md="6">
2020
<v-card class="mx-1 mb-1">
21-
<v-card-title class="pa-5 pb-3">
21+
<v-card-title class="pa-6 pb-3">
2222
<p>Apex Line Chart</p>
2323
<v-spacer></v-spacer>
2424
<v-menu>
@@ -42,7 +42,7 @@
4242
</v-list>
4343
</v-menu>
4444
</v-card-title>
45-
<v-card-text class="pa-5 pt-0">
45+
<v-card-text class="pa-6 pt-0">
4646
<v-row no-gutters>
4747
<v-col cols="12">
4848
<ApexChart
@@ -58,7 +58,7 @@
5858
</v-col>
5959
<v-col cols="12" md="6" >
6060
<v-card class="mx-1 mb-1">
61-
<v-card-title class="pa-5 pb-3">
61+
<v-card-title class="pa-6 pb-3">
6262
<p>Apex Heatmap Chart</p>
6363
<v-spacer></v-spacer>
6464
<v-menu>
@@ -82,7 +82,7 @@
8282
</v-list>
8383
</v-menu>
8484
</v-card-title>
85-
<v-card-text class="pa-5 pt-0">
85+
<v-card-text class="pa-6 pt-0">
8686
<v-row no-gutters>
8787
<v-col>
8888
<ApexChart
@@ -98,7 +98,7 @@
9898
</v-col>
9999
<v-col cols="12" md="6" >
100100
<v-card class="mx-1 mb-1">
101-
<v-card-title class="pa-5 pb-3">
101+
<v-card-title class="pa-6 pb-3">
102102
<p>Apex Dashed Line Chart</p>
103103
<v-spacer></v-spacer>
104104
<v-menu>
@@ -122,7 +122,7 @@
122122
</v-list>
123123
</v-menu>
124124
</v-card-title>
125-
<v-card-text class="pa-5 pt-0 pb-0">
125+
<v-card-text class="pa-6 pt-0 pb-0">
126126
<v-row no-gutters>
127127
<v-col cols="12" class="my-auto">
128128
<ApexChart
@@ -138,7 +138,7 @@
138138
</v-col>
139139
<v-col cols="12" md="6">
140140
<v-card class="mx-1 mb-1">
141-
<v-card-title class="pa-5 pb-3">
141+
<v-card-title class="pa-6 pb-3">
142142
<p>Apex Pie Chart</p>
143143
<v-spacer></v-spacer>
144144
<v-menu>
@@ -162,7 +162,7 @@
162162
</v-list>
163163
</v-menu>
164164
</v-card-title>
165-
<v-card-text class="pa-5 pt-0">
165+
<v-card-text class="pa-6 pt-0">
166166
<v-row no-gutters>
167167
<v-col cols="12" class="pb-7">
168168
<ApexChart

‎src/pages/Dashboard/Dashboard.vue

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<v-row>
1818
<v-col lg=3 sm=6 md=5 cols=12>
1919
<v-card class="mx-1 mb-1">
20-
<v-card-title class="pa-5 pb-3">
20+
<v-card-title class="pa-6 pb-3">
2121
<p>Visits Today</p>
2222
<v-spacer></v-spacer>
2323
<v-menu>
@@ -39,8 +39,8 @@
3939
</v-list>
4040
</v-menu>
4141
</v-card-title>
42-
<v-card-text class="pa-5 pt-0">
43-
<v-row no-gutters class="pb-6">
42+
<v-card-text class="pa-6 pt-0">
43+
<v-row no-gutters class="pb-5">
4444
<v-col cols="5" class="my-auto">
4545
<span class="font-weight-medium card-dark-grey" style="font-size: 24px;">12, 678</span>
4646
</v-col>
@@ -54,7 +54,7 @@
5454
/>
5555
</v-col>
5656
</v-row>
57-
<v-row no-gutters class="justify-space-between pb-2">
57+
<v-row no-gutters class="justify-space-between pb-3">
5858
<v-col cols="5">
5959
<div class="card-light-grey">Registrations</div>
6060
<div class="text-h6 card-dark-grey font-weight-regular">860</div>
@@ -63,17 +63,17 @@
6363
<div class="card-light-grey">Sign Out</div>
6464
<div class="text-h6 card-dark-grey font-weight-regular">32</div>
6565
</v-col>
66-
<v-col cols="3" xl="2" offset-sm="1">
67-
<div class="card-light-grey">Rate</div>
68-
<div class=" text-h6 card-dark-grey font-weight-regular">3.25%</div>
66+
<v-col cols="4" xl="2">
67+
<div class="text-right card-light-grey">Rate</div>
68+
<div class="text-right text-h6 card-dark-grey font-weight-regular">3.25%</div>
6969
</v-col>
7070
</v-row>
7171
</v-card-text>
7272
</v-card>
7373
</v-col>
7474
<v-col lg=3 sm=6 md=7 cols=12>
7575
<v-card class="mx-1 mb-1">
76-
<v-card-title class="pa-5 pb-3">
76+
<v-card-title class="pa-6 pb-3">
7777
<p>App Performance</p>
7878
<v-spacer></v-spacer>
7979
<v-menu>
@@ -97,8 +97,8 @@
9797
</v-list>
9898
</v-menu>
9999
</v-card-title>
100-
<v-card-text class="pa-5 pt-0">
101-
<v-row no-gutters class="pb-3">
100+
<v-card-text class="pa-6 pt-0">
101+
<v-row no-gutters class="pb-5">
102102
<div class="mr-4">
103103
<v-icon color="primary" class="ml-n2"> mdi-circle-medium </v-icon>
104104
<span class="card-light-grey">Integration</span>
@@ -118,7 +118,7 @@
118118
></v-progress-linear>
119119
</v-col>
120120
</v-row>
121-
<v-row no-gutters class="pb-3">
121+
<v-row no-gutters class="pb-1">
122122
<v-col>
123123
<div class="text-h6 card-light-grey font-weight-regular">SDK</div>
124124
<v-progress-linear
@@ -132,8 +132,8 @@
132132
</v-card>
133133
</v-col>
134134
<v-col lg=3 sm=6 md=7 cols=12>
135-
<v-card class="mx-1 mb-1">
136-
<v-card-title class="pa-5 pb-3 pt-lg-3">
135+
<v-card class="mx-1 mb-1">
136+
<v-card-title class="pa-6 pb-3">
137137
<p>Server Overview</p>
138138
<v-spacer></v-spacer>
139139
<v-menu>
@@ -156,38 +156,38 @@
156156
</v-list>
157157
</v-menu>
158158
</v-card-title>
159-
<v-card-text class="pa-5 pt-0 pb-3">
159+
<v-card-text class="pa-6 pt-0">
160160
<v-row no-gutters>
161161
<v-col cols="6" md="5" lg="6" xl="4" class="my-auto">
162162
<span>60% / 37°С / 3.3 Ghz</span>
163163
</v-col>
164164
<v-col cols="6" md="7" lg="6" xl="8">
165-
<ApexChart v-if="apexLoading" height="40" type="area" :options="mock.apexArea1.options" :series="mock.apexArea1.series"></ApexChart>
165+
<ApexChart v-if="apexLoading" height="35" type="area" :options="mock.apexArea1.options" :series="mock.apexArea1.series"></ApexChart>
166166
</v-col>
167167
</v-row>
168-
<v-row no-gutters class="my-2">
168+
<v-row no-gutters class="my-3 my-lg-0">
169169
<v-col cols="6" md="5" lg="6" xl="4" class="my-auto">
170170
<span>54% / 31°С / 3.3 Ghz</span>
171171
</v-col >
172172
<v-col cols="6" md="7" lg="6" xl="8">
173-
<ApexChart v-if="apexLoading" height="40" type="area" :options="mock.apexArea2.options" :series="mock.apexArea2.series"></ApexChart>
173+
<ApexChart v-if="apexLoading" height="35" type="area" :options="mock.apexArea2.options" :series="mock.apexArea2.series"></ApexChart>
174174
</v-col>
175175
</v-row>
176176
<v-row no-gutters>
177177
<v-col cols="6" md="5" lg="6" xl="4" class="my-auto">
178178
<span>57% / 21°С / 3.3 Ghz</span>
179179
</v-col>
180180
<v-col cols="6" md="7" lg="6" xl="8">
181-
<ApexChart v-if="apexLoading" height="40" type="area" :options="mock.apexArea3.options" :series="mock.apexArea3.series"></ApexChart>
181+
<ApexChart v-if="apexLoading" height="35" type="area" :options="mock.apexArea3.options" :series="mock.apexArea3.series"></ApexChart>
182182
</v-col>
183183
</v-row>
184184
</v-card-text>
185185
</v-card>
186186
</v-col>
187187
<v-col lg=3 sm=6 md=5 cols=12>
188-
<v-card class="mx-1 mb-1">
189-
<v-card-title class="pa-5 pb-3">
190-
<p>Revenue Breakdown</p>
188+
<v-card class="mx-1 mb-1">
189+
<v-card-title class="flex-nowrap pa-6 pb-3">
190+
<p class="text-truncate">Revenue Breakdown</p>
191191
<v-spacer></v-spacer>
192192
<v-menu>
193193
<template v-slot:activator="{ on, attrs }">
@@ -210,24 +210,23 @@
210210
</v-list>
211211
</v-menu>
212212
</v-card-title>
213-
<v-card-text class="pa-5 pt-0">
213+
<v-card-text class="pa-6 pt-0 mb-1">
214214
<v-row no-gutters>
215-
<v-col >
215+
<v-col cols="12" >
216216
<ApexChart
217-
v-if="apexLoading"
218-
height="122"
219-
type="donut"
220-
class="mt-1"
221-
:options="mock.apexPie.options"
222-
:series="generatePieSeries()"></ApexChart>
217+
height="124"
218+
type="donut"
219+
class="mt-1"
220+
:options="mock.apexPie.options"
221+
:series="generatePieSeries()"></ApexChart>
223222
</v-col>
224223
</v-row>
225224
</v-card-text>
226225
</v-card>
227226
</v-col>
228227
<v-col cols=12>
229228
<v-card class="mx-1 mb-1">
230-
<v-card-title class="pa-4 pb-0">
229+
<v-card-title class="pa-6 pb-0">
231230
<v-row no-gutters>
232231
<v-col cols="7" sm="4" md="4" lg="5" class="d-flex align-center">
233232
<p>Daily Line Chart</p>
@@ -257,7 +256,7 @@
257256
</v-col>
258257
</v-row>
259258
</v-card-title>
260-
<v-card-text class="pa-4">
259+
<v-card-text class="pa-6">
261260
<v-row>
262261
<v-col >
263262
<ApexChart
@@ -276,7 +275,7 @@
276275
</v-col>
277276
<v-col lg=4 sm=6 cols=12>
278277
<v-card class="mx-1 mb-1">
279-
<v-card-title class="pa-5 pb-3">
278+
<v-card-title class="pa-6 pb-3">
280279
<p>Light Blue</p>
281280
<v-spacer></v-spacer>
282281
<v-menu>
@@ -300,7 +299,7 @@
300299
</v-list>
301300
</v-menu>
302301
</v-card-title>
303-
<v-card-text class="pa-5 pt-0">
302+
<v-card-text class="pa-6 pt-0">
304303
<v-row no-gutters>
305304
<v-col cols="6" class="my-auto">
306305
<span class="" style="font-size: 42px">199 <span class="caption error--text">-3.7%</span> </span>
@@ -334,7 +333,7 @@
334333
</v-col>
335334
<v-col lg=4 sm=6 cols=12>
336335
<v-card class="mx-1 mb-1">
337-
<v-card-title class="pa-5 pb-3">
336+
<v-card-title class="pa-6 pb-3">
338337
<p>Sing App</p>
339338
<v-spacer></v-spacer>
340339
<v-menu>
@@ -358,7 +357,7 @@
358357
</v-list>
359358
</v-menu>
360359
</v-card-title>
361-
<v-card-text class="pa-5 pt-0">
360+
<v-card-text class="pa-6 pt-0">
362361
<v-row no-gutters>
363362
<v-col cols="7" class="my-auto">
364363
<span class="" style="font-size: 42px">121 <span class="error--text caption">-3.2%</span> </span>
@@ -392,7 +391,7 @@
392391
</v-col>
393392
<v-col lg=4 sm=6 cols=12>
394393
<v-card class="mx-1 mb-1">
395-
<v-card-title class="pa-5 pb-3">
394+
<v-card-title class="pa-6 pb-3">
396395
<p>RNS</p>
397396
<v-spacer></v-spacer>
398397
<v-menu>
@@ -416,7 +415,7 @@
416415
</v-list>
417416
</v-menu>
418417
</v-card-title>
419-
<v-card-text class="pa-5 pt-0">
418+
<v-card-text class="pa-6 pt-0">
420419
<v-row no-gutters>
421420
<v-col cols="7" class="my-auto">
422421
<span class="" style="font-size: 42px">175 <span class="error--text caption">-3.1%</span> </span>
@@ -450,7 +449,7 @@
450449
</v-col>
451450
<v-col cols=12>
452451
<v-card class="support-requests mx-1 mb-1">
453-
<v-card-title class="pa-5 pb-0">
452+
<v-card-title class="pa-6 pb-0">
454453
<p>Support Requests</p>
455454
<v-spacer></v-spacer>
456455
<v-menu>

‎src/pages/Dashboard/mock.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ export default {
118118
colors: [config.light.primary, config.light.secondary, config.light.success, config.light.warning],
119119
labels: ["Group A", "Group B", "Group C", "Group D"],
120120
legend: {
121-
markers: {
122-
width: 18,
123-
height: 10,
124-
radius: 3
125-
}
121+
126122
}
127123
},
128124
series: [400, 300, 300, 200],
@@ -234,7 +230,7 @@ export default {
234230
show: false
235231

236232
},
237-
colors: [config.light.warning, config.light.primary, '#F8F9FA'],
233+
colors: [config.light.warning, config.light.primary, '#f3f5ff'],
238234
yaxis: {
239235
axisBorder: {
240236
show: true,

‎src/pages/Icons/Icons.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
lastReports: [
381381
{title: 'Print PDF', icon: 'mdi-printer'},
382382
{title: 'Download', icon: 'mdi-download'},
383-
{title: 'Sand by mail', icon: 'mdi-email'},
383+
{title: 'Send by mail', icon: 'mdi-email'},
384384
{title: 'Share', icon: 'mdi-share-variant'}
385385
],
386386
}

0 commit comments

Comments
 (0)