Skip to content

Commit

Permalink
feat: scss public
Browse files Browse the repository at this point in the history 
Former-commit-id: 41a358b0515ea0806a9cec5aa0eeafa69dbc5803 [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7] [formerly 41a358b0515ea0806a9cec5aa0eeafa69dbc5803 [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7] [formerly 41a358b0515ea0806a9cec5aa0eeafa69dbc5803 [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7] [formerly 2e4519ee057ac6c95e949a646e3c399f8b2f44f7 [formerly 8ba9ec6 [formerly a2e8abc48eb676a12c407d8f5e3f2f6b5151686a]]]]]
Former-commit-id: 0552698
Former-commit-id: 770c576
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
  • Loading branch information
@FairyEver
FairyEver committed Nov 16, 2018
1 parent bfd82a9 commit 7f00053
Show file tree
Hide file tree
Showing 31 changed files with 8 additions and 32 deletions.
1 change: 0 additions & 1 deletion src/assets/style/fixed/base.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// 优化显示

html, body {
margin: 0px;
height: 100%;
Expand Down
1 change: 0 additions & 1 deletion src/assets/style/fixed/element.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// element 样式补丁

.el-card {
&.is-always-shadow {
box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
Expand Down
1 change: 0 additions & 1 deletion src/assets/style/fixed/markdown.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// markdown 样式补丁

.markdown-body {
ul {
list-style: disc;
Expand Down
1 change: 0 additions & 1 deletion src/assets/style/fixed/vue-grid-layout.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// vue-splitpane 样式补丁

.vue-grid-item {
&.vue-grid-placeholder {
border: 1px solid $color-border-1;
Expand Down
3 changes: 0 additions & 3 deletions src/assets/style/fixed/vue-splitpane.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
// vue-splitpane 样式补丁

@import '~@/assets/style/unit/color.scss';

.splitter-pane-resizer {
background-color: $color-border-1 !important;
opacity: 1 !important;
Expand Down
1 change: 0 additions & 1 deletion src/assets/style/theme/register.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '~@/assets/style/public.scss';
@import '~@/assets/style/theme/theme-base.scss';

@import '~@/assets/style/theme/d2/index.scss';
Expand Down
1 change: 0 additions & 1 deletion src/components/d2-container/components/d2-source.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.d2-source {
$borderRadius: 4px;
$paddingLR: 15px;
Expand Down
1 change: 0 additions & 1 deletion src/components/d2-icon-select/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.group {
max-height: 400px;
overflow-x: hidden;
Expand Down
1 change: 0 additions & 1 deletion src/components/d2-markdown/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ export default {
</script>

<style lang="scss">
@import '~@/assets/style/public.scss';
.component-markdown {
.spin-group {
height: 100px;
Expand Down
1 change: 0 additions & 1 deletion src/components/d2-page-cover/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.d2-page-cover {
@extend %full;
@extend %unable-select;
Expand Down
1 change: 0 additions & 1 deletion src/layout/header-aside/components/header-error-log/components/list/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ export default {
</script>

<style lang="scss">
@import '~@/assets/style/public.scss';
.d2-error-log-list__expand-group {
.d2-error-log-list__expand {
padding-left: 20px;
Expand Down
1 change: 0 additions & 1 deletion src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.theme-preview {
height: 50px;
width: 100px;
Expand Down
1 change: 0 additions & 1 deletion src/layout/header-aside/components/panel-search/components/panel-search-item/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.d2-panel-search-item {
height: 64px;
margin: 0px -20px;
Expand Down
1 change: 0 additions & 1 deletion src/layout/header-aside/components/panel-search/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.panel-search {
margin: 20px;
.panel-search__input-group {
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/components/contextmenu/style/pub.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '~@/assets/style/public.scss';
.contextmenu-pad {
height: 300px;
background-color: $color-bg;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/components/countup/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
.group {
display: flex;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/components/icon/icon.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
</template>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.icon-demo {
transition: all .3s;
font-size: 100px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/components/icon/select.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.title-group {
margin-top: 20px;
margin-bottom: 10px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/components/icon/svg.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
</template>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.icon-card {
display: flex;
justify-content: center;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/components/layout/grid.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
.vue-grid-layout {
background-color: $color-bg;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/element/basic-color/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/unit/color.scss';
.color {
border-radius: 4px;
height: 90px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/playground/log/console/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
.page__image-demo {
border-radius: 4px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/playground/store/gray/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
.colorful {
@extend %unable-select;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/playground/store/theme/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
.theme-preview {
height: 50px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/plugins/better-scroll/base.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.demo-bs-wrapper {
height: 200px;
width: 300px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/plugins/better-scroll/to.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.demo-bs-wrapper {
height: 400px;
position: relative;
Expand Down
1 change: 0 additions & 1 deletion src/pages/demo/plugins/mock/components/d2-demo-mock-card.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.col {
padding: 20px;
border-radius: 4px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/error-page-404/page.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</template>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
background: #303133;
background-blend-mode: multiply,multiply;
Expand Down
1 change: 0 additions & 1 deletion src/pages/index/page.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export default {
</script>

<style lang="scss" scoped>
@import '~@/assets/style/public.scss';
.page {
.page__logo {
width: 120px;
Expand Down
1 change: 0 additions & 1 deletion src/pages/login/style.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import '~@/assets/style/public.scss';
.login-page {
background-color: #EDF4FA;
height: 100%;
Expand Down
8 changes: 8 additions & 0 deletions vue.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ module.exports = {
devServer: {
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
chainWebpack: config => {
// 解决 cli3 热更新失效 https://github.com/vuejs/vue-cli/issues/1559
Expand Down

0 comments on commit 7f00053

Please sign in to comment.