Fix main chart color;

Fix widgets padding;
flatlogic · Nov 6, 2020 · 76c8a0e · 76c8a0e
1 parent 273cc02
commit 76c8a0e
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 83 deletions.
diff --git a/docs/css/app.21ad06a3.css → docs/css/app.d4882674.css b/docs/css/app.21ad06a3.css → docs/css/app.d4882674.css
diff --git a/docs/index.html b/docs/index.html
@@ -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>
+<!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>
diff --git a/docs/js/app.0d0eded4.js b/docs/js/app.0d0eded4.js
diff --git a/docs/js/app.0d0eded4.js.map b/docs/js/app.0d0eded4.js.map
diff --git a/docs/js/app.764d371f.js b/docs/js/app.764d371f.js
diff --git a/docs/js/app.764d371f.js.map b/docs/js/app.764d371f.js.map
diff --git a/src/components/Sidebar/Sidebar.vue b/src/components/Sidebar/Sidebar.vue
@@ -17,10 +17,10 @@
           align="center">
           <v-col cols="6">
             <span
-                  style="padding-left: 32px"
-                  class="text-body-1 subheader"
-                  :class="(item.heading && DRAWER_STATE) ? 'show ' : 'hide'">
-                  {{ item.heading }}
+              style="padding-left: 32px"
+              class="text-body-1 subheader"
+              :class="(item.heading && DRAWER_STATE) ? 'show ' : 'hide'">
+              {{ item.heading }}
               </span>
           </v-col>
           <v-col

diff --git a/src/pages/Charts/Charts.vue b/src/pages/Charts/Charts.vue
@@ -18,7 +18,7 @@
       <v-row>
         <v-col cols="12" md="6">
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Apex Line Chart</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -42,7 +42,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col cols="12">
                   <ApexChart
@@ -58,7 +58,7 @@
         </v-col>
         <v-col cols="12" md="6" >
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Apex Heatmap Chart</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -82,7 +82,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col>
                   <ApexChart
@@ -98,7 +98,7 @@
         </v-col>
         <v-col cols="12" md="6" >
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Apex Dashed Line Chart</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -122,7 +122,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0 pb-0">
+            <v-card-text class="pa-6 pt-0 pb-0">
               <v-row no-gutters>
                 <v-col cols="12" class="my-auto">
                   <ApexChart
@@ -138,7 +138,7 @@
         </v-col>
         <v-col cols="12" md="6">
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Apex Pie Chart</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -162,7 +162,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col cols="12" class="pb-7">
                   <ApexChart

diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
@@ -17,7 +17,7 @@
       <v-row>
         <v-col lg=3 sm=6 md=5 cols=12>
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Visits Today</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -39,8 +39,8 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
-              <v-row no-gutters class="pb-6">
+            <v-card-text class="pa-6 pt-0">
+              <v-row no-gutters class="pb-5">
                 <v-col cols="5" class="my-auto">
                   <span class="font-weight-medium card-dark-grey" style="font-size: 24px;">12, 678</span>
                 </v-col>
@@ -54,7 +54,7 @@
                   />
                 </v-col>
               </v-row>
-              <v-row no-gutters class="justify-space-between pb-2">
+              <v-row no-gutters class="justify-space-between pb-3">
                 <v-col cols="5">
                   <div class="card-light-grey">Registrations</div>
                   <div class="text-h6 card-dark-grey font-weight-regular">860</div>
@@ -63,17 +63,17 @@
                   <div class="card-light-grey">Sign Out</div>
                   <div class="text-h6 card-dark-grey font-weight-regular">32</div>
                 </v-col>
-                <v-col cols="3" xl="2" offset-sm="1">
-                  <div class="card-light-grey">Rate</div>
-                  <div class=" text-h6 card-dark-grey font-weight-regular">3.25%</div>
+                <v-col cols="4" xl="2">
+                  <div class="text-right card-light-grey">Rate</div>
+                  <div class="text-right text-h6 card-dark-grey font-weight-regular">3.25%</div>
                 </v-col>
               </v-row>
             </v-card-text>
           </v-card>
         </v-col>
         <v-col lg=3 sm=6 md=7 cols=12>
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>App Performance</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -97,8 +97,8 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
-              <v-row no-gutters class="pb-3">
+            <v-card-text class="pa-6 pt-0">
+              <v-row no-gutters class="pb-5">
                 <div class="mr-4">
                   <v-icon color="primary" class="ml-n2"> mdi-circle-medium </v-icon>
                   <span class="card-light-grey">Integration</span>
@@ -118,7 +118,7 @@
                   ></v-progress-linear>
                 </v-col>
               </v-row>
-              <v-row no-gutters class="pb-3">
+              <v-row no-gutters class="pb-1">
                 <v-col>
                   <div class="text-h6 card-light-grey font-weight-regular">SDK</div>
                   <v-progress-linear
@@ -132,8 +132,8 @@
           </v-card>
         </v-col>
         <v-col lg=3 sm=6 md=7 cols=12>
-          <v-card  class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3 pt-lg-3">
+          <v-card class="mx-1 mb-1">
+            <v-card-title class="pa-6 pb-3">
               <p>Server Overview</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -156,38 +156,38 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0 pb-3">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col cols="6" md="5" lg="6" xl="4" class="my-auto">
                   <span>60% / 37°С / 3.3 Ghz</span>
                 </v-col>
                 <v-col cols="6" md="7" lg="6" xl="8">
-                  <ApexChart v-if="apexLoading"  height="40" type="area" :options="mock.apexArea1.options" :series="mock.apexArea1.series"></ApexChart>
+                  <ApexChart v-if="apexLoading"  height="35" type="area" :options="mock.apexArea1.options" :series="mock.apexArea1.series"></ApexChart>
                 </v-col>
               </v-row>
-              <v-row no-gutters class="my-2">
+              <v-row no-gutters class="my-3 my-lg-0">
                 <v-col cols="6" md="5" lg="6" xl="4" class="my-auto">
                   <span>54% / 31°С / 3.3 Ghz</span>
                 </v-col >
                 <v-col cols="6" md="7" lg="6" xl="8">
-                  <ApexChart v-if="apexLoading" height="40" type="area" :options="mock.apexArea2.options" :series="mock.apexArea2.series"></ApexChart>
+                  <ApexChart v-if="apexLoading" height="35" type="area" :options="mock.apexArea2.options" :series="mock.apexArea2.series"></ApexChart>
                 </v-col>
               </v-row>
               <v-row no-gutters>
                 <v-col cols="6" md="5" lg="6" xl="4" class="my-auto">
                   <span>57% / 21°С / 3.3 Ghz</span>
                 </v-col>
                 <v-col cols="6" md="7" lg="6" xl="8">
-                  <ApexChart v-if="apexLoading" height="40" type="area" :options="mock.apexArea3.options" :series="mock.apexArea3.series"></ApexChart>
+                  <ApexChart v-if="apexLoading" height="35" type="area" :options="mock.apexArea3.options" :series="mock.apexArea3.series"></ApexChart>
                 </v-col>
               </v-row>
             </v-card-text>
           </v-card>
         </v-col>
         <v-col lg=3 sm=6 md=5 cols=12>
-          <v-card  class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
-              <p>Revenue Breakdown</p>
+          <v-card class="mx-1 mb-1">
+            <v-card-title class="flex-nowrap pa-6 pb-3">
+              <p class="text-truncate">Revenue Breakdown</p>
               <v-spacer></v-spacer>
               <v-menu>
                 <template v-slot:activator="{ on, attrs }">
@@ -210,24 +210,23 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0 mb-1">
               <v-row no-gutters>
-                <v-col >
+                <v-col cols="12" >
                   <ApexChart
-                      v-if="apexLoading"
-                      height="122"
-                      type="donut"
-                      class="mt-1"
-                      :options="mock.apexPie.options"
-                      :series="generatePieSeries()"></ApexChart>
+                    height="124"
+                    type="donut"
+                    class="mt-1"
+                    :options="mock.apexPie.options"
+                    :series="generatePieSeries()"></ApexChart>
                 </v-col>
               </v-row>
             </v-card-text>
           </v-card>
         </v-col>
         <v-col cols=12>
           <v-card class="mx-1 mb-1">
-              <v-card-title class="pa-4 pb-0">
+              <v-card-title class="pa-6 pb-0">
                 <v-row no-gutters>
                   <v-col cols="7" sm="4" md="4" lg="5" class="d-flex align-center">
                     <p>Daily Line Chart</p>
@@ -257,7 +256,7 @@
                   </v-col>
                 </v-row>
               </v-card-title>
-              <v-card-text class="pa-4">
+              <v-card-text class="pa-6">
                 <v-row>
                   <v-col >
                     <ApexChart
@@ -276,7 +275,7 @@
         </v-col>
         <v-col lg=4 sm=6 cols=12>
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Light Blue</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -300,7 +299,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col cols="6" class="my-auto">
                   <span class="" style="font-size: 42px">199 <span class="caption error--text">-3.7%</span> </span>
@@ -334,7 +333,7 @@
         </v-col>
         <v-col lg=4 sm=6 cols=12>
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>Sing App</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -358,7 +357,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col cols="7" class="my-auto">
                   <span class="" style="font-size: 42px">121 <span class="error--text caption">-3.2%</span> </span>
@@ -392,7 +391,7 @@
         </v-col>
         <v-col lg=4 sm=6 cols=12>
           <v-card class="mx-1 mb-1">
-            <v-card-title class="pa-5 pb-3">
+            <v-card-title class="pa-6 pb-3">
               <p>RNS</p>
               <v-spacer></v-spacer>
               <v-menu>
@@ -416,7 +415,7 @@
                 </v-list>
               </v-menu>
             </v-card-title>
-            <v-card-text class="pa-5 pt-0">
+            <v-card-text class="pa-6 pt-0">
               <v-row no-gutters>
                 <v-col cols="7" class="my-auto">
                   <span class="" style="font-size: 42px">175 <span class="error--text caption">-3.1%</span> </span>
@@ -450,7 +449,7 @@
         </v-col>
         <v-col cols=12>
           <v-card class="support-requests mx-1 mb-1">
-            <v-card-title class="pa-5 pb-0">
+            <v-card-title class="pa-6 pb-0">
               <p>Support Requests</p>
               <v-spacer></v-spacer>
               <v-menu>

diff --git a/src/pages/Dashboard/mock.js b/src/pages/Dashboard/mock.js
@@ -118,11 +118,7 @@ export default {
       colors: [config.light.primary, config.light.secondary, config.light.success, config.light.warning],
       labels: ["Group A", "Group B", "Group C", "Group D"],
       legend: {
-        markers: {
-          width: 18,
-          height: 10,
-          radius: 3
-        }
+
       }
     },
     series: [400, 300, 300, 200],
@@ -234,7 +230,7 @@ export default {
         show: false
 
       },
-      colors: [config.light.warning, config.light.primary, '#F8F9FA'],
+      colors: [config.light.warning, config.light.primary, '#f3f5ff'],
       yaxis: {
         axisBorder: {
           show: true,

diff --git a/src/pages/Icons/Icons.vue b/src/pages/Icons/Icons.vue
@@ -380,7 +380,7 @@
         lastReports: [
           {title: 'Print PDF', icon: 'mdi-printer'},
           {title: 'Download', icon: 'mdi-download'},
-          {title: 'Sand by mail', icon: 'mdi-email'},
+          {title: 'Send by mail', icon: 'mdi-email'},
           {title: 'Share', icon: 'mdi-share-variant'}
         ],
       }
Original file line number	Diff line number	Diff line change
		@@ -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>
		<!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>