diff --git a/src/components/MDinput/index.vue b/src/components/MDinput/index.vue index 731311f7..f93ae258 100644 --- a/src/components/MDinput/index.vue +++ b/src/components/MDinput/index.vue @@ -164,6 +164,7 @@ export default { .material-input__icon { position: absolute; left: 0; + line-height: $font-size-base; color: $color-blue; top: $spacer; width: $index-has-icon; diff --git a/src/router/index.js b/src/router/index.js index 67a87197..52011bd6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -95,18 +95,17 @@ export const asyncRouterMap = [ icon: 'component' }, children: [ - { path: 'index', component: _import('components/index'), name: 'componentIndex', meta: { title: 'componentIndex' }}, - { path: 'tinymce', component: _import('components/tinymce'), name: 'tinymce', meta: { title: 'tinymce' }}, - { path: 'markdown', component: _import('components/markdown'), name: 'markdown', meta: { title: 'markdown' }}, - { path: 'json-editor', component: _import('components/jsonEditor'), name: 'jsonEditor', meta: { title: 'jsonEditor' }}, - { path: 'dnd-list', component: _import('components/dndList'), name: 'dndList', meta: { title: 'dndList' }}, - { path: 'splitpane', component: _import('components/splitpane'), name: 'splitpane', meta: { title: 'splitPane' }}, - { path: 'avatar-upload', component: _import('components/avatarUpload'), name: 'avatarUpload', meta: { title: 'avatarUpload' }}, - { path: 'dropzone', component: _import('components/dropzone'), name: 'dropzone', meta: { title: 'dropzone' }}, - { path: 'sticky', component: _import('components/sticky'), name: 'sticky', meta: { title: 'sticky' }}, - { path: 'count-to', component: _import('components/countTo'), name: 'countTo', meta: { title: 'countTo' }}, - { path: 'mixin', component: _import('components/mixin'), name: 'componentMixin', meta: { title: 'componentMixin' }}, - { path: 'back-to-top', component: _import('components/backToTop'), name: 'backToTop', meta: { title: 'backToTop' }} + { path: 'tinymce', component: _import('components-demo/tinymce'), name: 'tinymce', meta: { title: 'tinymce' }}, + { path: 'markdown', component: _import('components-demo/markdown'), name: 'markdown', meta: { title: 'markdown' }}, + { path: 'json-editor', component: _import('components-demo/jsonEditor'), name: 'jsonEditor', meta: { title: 'jsonEditor' }}, + { path: 'dnd-list', component: _import('components-demo/dndList'), name: 'dndList', meta: { title: 'dndList' }}, + { path: 'splitpane', component: _import('components-demo/splitpane'), name: 'splitpane', meta: { title: 'splitPane' }}, + { path: 'avatar-upload', component: _import('components-demo/avatarUpload'), name: 'avatarUpload', meta: { title: 'avatarUpload' }}, + { path: 'dropzone', component: _import('components-demo/dropzone'), name: 'dropzone', meta: { title: 'dropzone' }}, + { path: 'sticky', component: _import('components-demo/sticky'), name: 'sticky', meta: { title: 'sticky' }}, + { path: 'count-to', component: _import('components-demo/countTo'), name: 'countTo', meta: { title: 'countTo' }}, + { path: 'mixin', component: _import('components-demo/mixin'), name: 'componentMixin', meta: { title: 'componentMixin' }}, + { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop', meta: { title: 'backToTop' }} ] }, @@ -235,7 +234,7 @@ export const asyncRouterMap = [ { path: '/i18n', component: Layout, - children: [{ path: 'index', component: _import('i18n/index'), name: 'i18n', meta: { title: 'i18n', icon: 'international' }}] + children: [{ path: 'index', component: _import('i18n-demo/index'), name: 'i18n', meta: { title: 'i18n', icon: 'international' }}] }, { path: '*', redirect: '/404', hidden: true } diff --git a/src/views/components/avatarUpload.vue b/src/views/components-demo/avatarUpload.vue similarity index 100% rename from src/views/components/avatarUpload.vue rename to src/views/components-demo/avatarUpload.vue diff --git a/src/views/components/backToTop.vue b/src/views/components-demo/backToTop.vue similarity index 100% rename from src/views/components/backToTop.vue rename to src/views/components-demo/backToTop.vue diff --git a/src/views/components/countTo.vue b/src/views/components-demo/countTo.vue similarity index 100% rename from src/views/components/countTo.vue rename to src/views/components-demo/countTo.vue diff --git a/src/views/components/dndList.vue b/src/views/components-demo/dndList.vue similarity index 100% rename from src/views/components/dndList.vue rename to src/views/components-demo/dndList.vue diff --git a/src/views/components/dropzone.vue b/src/views/components-demo/dropzone.vue similarity index 100% rename from src/views/components/dropzone.vue rename to src/views/components-demo/dropzone.vue diff --git a/src/views/components/jsonEditor.vue b/src/views/components-demo/jsonEditor.vue similarity index 100% rename from src/views/components/jsonEditor.vue rename to src/views/components-demo/jsonEditor.vue diff --git a/src/views/components/markdown.vue b/src/views/components-demo/markdown.vue similarity index 100% rename from src/views/components/markdown.vue rename to src/views/components-demo/markdown.vue diff --git a/src/views/components-demo/mixin.vue b/src/views/components-demo/mixin.vue new file mode 100644 index 00000000..32d164f9 --- /dev/null +++ b/src/views/components-demo/mixin.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/components/splitpane.vue b/src/views/components-demo/splitpane.vue similarity index 100% rename from src/views/components/splitpane.vue rename to src/views/components-demo/splitpane.vue diff --git a/src/views/components/sticky.vue b/src/views/components-demo/sticky.vue similarity index 100% rename from src/views/components/sticky.vue rename to src/views/components-demo/sticky.vue diff --git a/src/views/components/tinymce.vue b/src/views/components-demo/tinymce.vue similarity index 100% rename from src/views/components/tinymce.vue rename to src/views/components-demo/tinymce.vue diff --git a/src/views/components/index.vue b/src/views/components/index.vue deleted file mode 100644 index 661c4835..00000000 --- a/src/views/components/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/views/components/mixin.vue b/src/views/components/mixin.vue deleted file mode 100644 index 5f450c91..00000000 --- a/src/views/components/mixin.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - diff --git a/src/views/dashboard/admin/components/BoxCard.vue b/src/views/dashboard/admin/components/BoxCard.vue index 20557c1c..3e92e9e8 100644 --- a/src/views/dashboard/admin/components/BoxCard.vue +++ b/src/views/dashboard/admin/components/BoxCard.vue @@ -6,7 +6,7 @@
-
+
Vue
@@ -18,6 +18,10 @@ Css
+
+ ESlint + +
@@ -53,13 +57,7 @@ export default { } return statusMap[status] } - }, - created() { - - }, - methods: { } - } @@ -86,7 +84,7 @@ export default { } .mallki-text { position: absolute; - top: -10px; + top: 0px; right: 0px; font-size: 20px; font-weight: bold; @@ -102,6 +100,9 @@ export default { background-color: #fff; margin: auto; box-shadow: none!important; + /deep/ .pan-info{ + box-shadow: none!important; + } } .progress-item { margin-bottom: 10px; diff --git a/src/views/dashboard/admin/components/PieChart.vue b/src/views/dashboard/admin/components/PieChart.vue index 426653b2..3146bbfd 100644 --- a/src/views/dashboard/admin/components/PieChart.vue +++ b/src/views/dashboard/admin/components/PieChart.vue @@ -54,9 +54,9 @@ export default { formatter: '{a}
{b} : {c} ({d}%)' }, legend: { - x: 'center', - y: 'bottom', - data: ['industries', 'technology', 'forex', 'gold', 'forecasts', 'markets'] + left: 'center', + bottom: '10', + data: ['industries', 'technology', 'forex', 'gold', 'forecasts'] }, calculable: true, series: [ @@ -71,8 +71,7 @@ export default { { value: 240, name: 'technology' }, { value: 149, name: 'forex' }, { value: 100, name: 'gold' }, - { value: 59, name: 'forecasts' }, - { value: 49, name: 'markets' } + { value: 59, name: 'forecasts' } ], animationEasing: 'cubicInOut', animationDuration: 2600 diff --git a/src/views/dashboard/admin/components/RaddarChart.vue b/src/views/dashboard/admin/components/RaddarChart.vue index 703ee41c..017b9748 100644 --- a/src/views/dashboard/admin/components/RaddarChart.vue +++ b/src/views/dashboard/admin/components/RaddarChart.vue @@ -58,8 +58,8 @@ export default { } }, radar: { - radius: '70%', - center: ['50%', '44%'], + radius: '66%', + center: ['50%', '42%'], splitNumber: 8, splitArea: { areaStyle: { @@ -81,8 +81,8 @@ export default { ] }, legend: { - left: 0, - bottom: 0, + left: 'center', + bottom: '10', data: ['Allocated Budget', 'Expected Spending', 'Actual Spending'] }, series: [{ diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue index 032b8a38..ac146d7a 100644 --- a/src/views/dashboard/admin/index.vue +++ b/src/views/dashboard/admin/index.vue @@ -1,29 +1,10 @@ - - -