lisang
/
d2-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: scss public 

Former-commit-id: 41a358b0515ea0806a9cec5aa0eeafa69dbc5803 [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7] [formerly 41a358b0515ea0806a9cec5aa0eeafa69dbc5803 [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7] [formerly 41a358b0515ea0806a9cec5aa0eeafa69dbc5803 [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7] [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7 [formerly 8ba9ec64281660336d5fb304b9a5a64cbb2aa17c [formerly a2e8abc48eb676a12c407d8f5e3f2f6b5151686a]]]]]
Former-commit-id: 05526984ebfd295b5fc6eb9f2204c7785b962ecf
Former-commit-id: 770c57651cba3499bc7bcd3c33cf10becb5f289e
Former-commit-id: bf411035a0a7488a3f329786911deb401b4c5bff [formerly 2b4ca8aa7eccc9fe3da2abdd55b886fdc189df09]
Former-commit-id: 233582f8c356147ddea2f836fcf45fe215f7f79d
Former-commit-id: 1b4ed84ffe61099ac9a2d077851f133d33626df9
Former-commit-id: bf66bb6d5444d94cca4b628cbc7ff407b4c50511
Former-commit-id: 8dff1bb9cd43cdc30d42ec5c4373c25c1cae8214
Former-commit-id: 419216ae2da027e8a0282ca71590bdd2e51a1133
This commit is contained in:
liyang 2018-11-16 22:49:27 +08:00
parent bfd82a995e
commit 7f00053b34
31 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/style/fixed/base.scss
View File

@ -1,5 +1,4 @@
// 优化显示 // 优化显示
html, body { html, body {
margin: 0px; margin: 0px;
height: 100%; height: 100%;

1
src/assets/style/fixed/element.scss
View File

@ -1,5 +1,4 @@
// element 样式补丁 // element 样式补丁
.el-card { .el-card {
&.is-always-shadow { &.is-always-shadow {
box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5); box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);

1
src/assets/style/fixed/markdown.scss
View File

@ -1,5 +1,4 @@
// markdown 样式补丁 // markdown 样式补丁
.markdown-body { .markdown-body {
ul { ul {
list-style: disc; list-style: disc;

1
src/assets/style/fixed/vue-grid-layout.scss
View File

@ -1,5 +1,4 @@
// vue-splitpane 样式补丁 // vue-splitpane 样式补丁
.vue-grid-item { .vue-grid-item {
&.vue-grid-placeholder { &.vue-grid-placeholder {
border: 1px solid $color-border-1; border: 1px solid $color-border-1;

3
src/assets/style/fixed/vue-splitpane.scss
View File

@ -1,7 +1,4 @@
// vue-splitpane 样式补丁 // vue-splitpane 样式补丁
@import '~@/assets/style/unit/color.scss';
.splitter-pane-resizer { .splitter-pane-resizer {
background-color: $color-border-1 !important; background-color: $color-border-1 !important;
opacity: 1 !important; opacity: 1 !important;

1
src/assets/style/theme/register.scss
View File

@ -1,4 +1,3 @@
@import '~@/assets/style/public.scss';
@import '~@/assets/style/theme/theme-base.scss'; @import '~@/assets/style/theme/theme-base.scss';
@import '~@/assets/style/theme/d2/index.scss'; @import '~@/assets/style/theme/d2/index.scss';

1
src/components/d2-container/components/d2-source.vue
View File

@ -41,7 +41,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.d2-source { .d2-source {
$borderRadius: 4px; $borderRadius: 4px;
$paddingLR: 15px; $paddingLR: 15px;

1
src/components/d2-icon-select/index.vue
View File

@ -159,7 +159,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.group { .group {
max-height: 400px; max-height: 400px;
overflow-x: hidden; overflow-x: hidden;

1
src/components/d2-markdown/index.vue
View File

@ -83,7 +83,6 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
@import '~@/assets/style/public.scss';
.component-markdown { .component-markdown {
.spin-group { .spin-group {
height: 100px; height: 100px;

1
src/components/d2-page-cover/index.vue
View File

@ -33,7 +33,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.d2-page-cover { .d2-page-cover {
@extend %full; @extend %full;
@extend %unable-select; @extend %unable-select;

1
src/layout/header-aside/components/header-error-log/components/list/index.vue
View File

@ -165,7 +165,6 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
@import '~@/assets/style/public.scss';
.d2-error-log-list__expand-group { .d2-error-log-list__expand-group {
.d2-error-log-list__expand { .d2-error-log-list__expand {
padding-left: 20px; padding-left: 20px;

1
src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
View File

@ -69,7 +69,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.theme-preview { .theme-preview {
height: 50px; height: 50px;
width: 100px; width: 100px;

1
src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue
View File

@ -35,7 +35,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.d2-panel-search-item { .d2-panel-search-item {
height: 64px; height: 64px;
margin: 0px -20px; margin: 0px -20px;

1
src/layout/header-aside/components/panel-search/index.vue
View File

@ -183,7 +183,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.panel-search { .panel-search {
margin: 20px; margin: 20px;
.panel-search__input-group { .panel-search__input-group {

1
src/pages/demo/components/contextmenu/style/pub.scss
View File

@ -1,4 +1,3 @@
@import '~@/assets/style/public.scss';
.contextmenu-pad { .contextmenu-pad {
height: 300px; height: 300px;
background-color: $color-bg; background-color: $color-bg;

1
src/pages/demo/components/countup/index.vue
View File

@ -75,7 +75,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
.group { .group {
display: flex; display: flex;

1
src/pages/demo/components/icon/icon.vue
View File

@ -9,7 +9,6 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.icon-demo { .icon-demo {
transition: all .3s; transition: all .3s;
font-size: 100px; font-size: 100px;

1
src/pages/demo/components/icon/select.vue
View File

@ -38,7 +38,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.title-group { .title-group {
margin-top: 20px; margin-top: 20px;
margin-bottom: 10px; margin-bottom: 10px;

1
src/pages/demo/components/icon/svg.vue
View File

@ -13,7 +13,6 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.icon-card { .icon-card {
display: flex; display: flex;
justify-content: center; justify-content: center;

1
src/pages/demo/components/layout/grid.vue
View File

@ -98,7 +98,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
.vue-grid-layout { .vue-grid-layout {
background-color: $color-bg; background-color: $color-bg;

1
src/pages/demo/element/basic-color/index.vue
View File

@ -92,7 +92,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/unit/color.scss';
.color { .color {
border-radius: 4px; border-radius: 4px;
height: 90px; height: 90px;

1
src/pages/demo/playground/log/console/index.vue
View File

@ -57,7 +57,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
.page__image-demo { .page__image-demo {
border-radius: 4px; border-radius: 4px;

1
src/pages/demo/playground/store/gray/index.vue
View File

@ -67,7 +67,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
.colorful { .colorful {
@extend %unable-select; @extend %unable-select;

1
src/pages/demo/playground/store/theme/index.vue
View File

@ -59,7 +59,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
.theme-preview { .theme-preview {
height: 50px; height: 50px;

1
src/pages/demo/plugins/better-scroll/base.vue
View File

@ -43,7 +43,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.demo-bs-wrapper { .demo-bs-wrapper {
height: 200px; height: 200px;
width: 300px; width: 300px;

1
src/pages/demo/plugins/better-scroll/to.vue
View File

@ -87,7 +87,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.demo-bs-wrapper { .demo-bs-wrapper {
height: 400px; height: 400px;
position: relative; position: relative;

1
src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
View File

@ -45,7 +45,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.col { .col {
padding: 20px; padding: 20px;
border-radius: 4px; border-radius: 4px;

1
src/pages/error-page-404/page.vue
View File

@ -8,7 +8,6 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
background: #303133; background: #303133;
background-blend-mode: multiply,multiply; background-blend-mode: multiply,multiply;

1
src/pages/index/page.vue
View File

@ -59,7 +59,6 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page { .page {
.page__logo { .page__logo {
width: 120px; width: 120px;

1
src/pages/login/style.scss
View File

@ -1,4 +1,3 @@
@import '~@/assets/style/public.scss';
.login-page { .login-page {
background-color: #EDF4FA; background-color: #EDF4FA;
height: 100%; height: 100%;

8
vue.config.js
View File

@ -10,6 +10,14 @@ module.exports = {
devServer: { devServer: {
publicPath: baseUrl // 和 baseUrl 保持一致 publicPath: baseUrl // 和 baseUrl 保持一致
}, },
css: {
loaderOptions: {
// 设置 scss 公用变量文件
sass: {
data: `@import '~@/assets/style/public.scss';`
}
}
},
// 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js // 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js
chainWebpack: config => { chainWebpack: config => {
// 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559 // 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559