diff --git a/vue/src/asset/style/variables.scss b/vue/src/asset/style/variables.scss index 98f5b2d..4e2e964 100644 --- a/vue/src/asset/style/variables.scss +++ b/vue/src/asset/style/variables.scss @@ -1,30 +1,9 @@ -//material design的基础颜色 -$--color-red: #F44336; -$--color-pink: #E91E63; -$--color-purple: #9C27B0; -$--color-deep-purple: #673AB7; -$--color-indigo: #3F51B5; -$--color-blue: #2196F3; -$--color-light-blue: #03A9F4; -$--color-cyan: #00BCD4; -$--color-teal: #009688; -$--color-green: #4CAF50; -$--color-light-green: #8BC34A; -$--color-lime: #CDDC39; -$--color-yellow: #FFEB3B; -$--color-amber: #FFC107; -$--color-orange: #FF9800; -$--color-deep-orange: #FF5722; -$--color-brown: #795548; -$--color-gray: #9E9E9E; -$--color-blue-gray: #607D8B; - //覆盖element颜色 $--color-primary: #1890ff; $--color-success: #21BA45; -$--color-warning: $--color-deep-orange; -$--color-danger: $--color-red; -$--color-info: $--color-teal; +$--color-warning: #FF5722; +$--color-danger: #F44336; +$--color-info: #009688; @mixin clearfix { &::after { diff --git a/vue/src/layout/component/TagsView/style.scss b/vue/src/layout/component/TagsView/style.scss index 45feef9..8f3f2de 100644 --- a/vue/src/layout/component/TagsView/style.scss +++ b/vue/src/layout/component/TagsView/style.scss @@ -17,7 +17,7 @@ cursor: pointer; height: 32px; line-height: 35px; - color: $--color-gray; + color: #909399; background: #fff; border-radius: 3px; padding: 0 12px; diff --git a/vue/src/view/example/component/skeletonPage.vue b/vue/src/view/example/component/skeletonPage.vue index 6c691f7..358c0da 100644 --- a/vue/src/view/example/component/skeletonPage.vue +++ b/vue/src/view/example/component/skeletonPage.vue @@ -27,7 +27,9 @@ import {skeletonAnimations, skeletonTypes} from '@/component/Skeleton/constant' export default { name: "skeletonExample", + components: {QSkeleton}, + data() { return { skeletonTypes, @@ -49,7 +51,7 @@ export default { } .bg-info { - background-color: $--color-teal; + background-color: $--color-info; } .bg-warning { diff --git a/vue/src/view/example/test/develop/component/ImageCompressTest.vue b/vue/src/view/example/test/develop/component/ImageCompressTest.vue index 15fb662..fbf2d1b 100644 --- a/vue/src/view/example/test/develop/component/ImageCompressTest.vue +++ b/vue/src/view/example/test/develop/component/ImageCompressTest.vue @@ -174,8 +174,6 @@ export default {