Commit 0dbf439f authored by 李晖's avatar 李晖

node-sass写法升级到sass写法

parent 9a4aaa0b
Pipeline #978 failed with stages
......@@ -3,3 +3,4 @@
/.idea/*
deploy.sh
.hbuilderx/
/package-lock.json
......@@ -18,6 +18,6 @@
</script>
<style lang="scss">
@import "uview-ui/index.scss";
@import "common/demo.scss";
@use "uview-ui/index.scss" as *;
@use "common/demo.scss" as *;
</style>
......@@ -92,14 +92,14 @@ Vue.use(uView);
```css
/* App.vue */
<style lang="scss">
@import "uview-ui/index.scss";
@use "uview-ui/index.scss" as *;
</style>
```
3. `uni.scss`引入全局scss变量文件
```css
/* uni.scss */
@import "uview-ui/theme.scss";
@use "uview-ui/theme.scss" as *;
```
4. `pages.json`配置easycom规则(按需引入)
......
@use "@/uview-ui/theme.scss" as *;
/* #ifndef APP-NVUE */
view,
text {
......
......@@ -50,7 +50,7 @@ export default {
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.nav-wrap {
padding: 15px;
position: relative;
......
......@@ -5,6 +5,12 @@
"versionName" : "1.8.8",
"versionCode" : "100",
"transformPx" : false,
"sass": {
"prependData": "@use '@/uview-ui/libs/css/theme.scss' as *;",
"sassOptions": {
"includePaths": ["node_modules"]
}
},
"app-plus" : {
// APP-VUE分包,可提APP升启动速度,2.7.12开始支持,兼容微信小程序分包方案,默认关闭
"optimization" : {
......
{
"name": "uView",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"vue-i18n": {
"version": "8.20.0",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
"integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
}
}
}
......@@ -85,6 +85,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;@use "@/uview-ui/theme.scss" as *;
</style>
......@@ -92,7 +92,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -98,7 +98,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {
height: 200vh;
}
......
......@@ -104,7 +104,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {
}
......
......@@ -101,7 +101,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo-area {
height: 160px;
display: flex;
......
......@@ -96,7 +96,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {
}
......
......@@ -437,6 +437,7 @@ export default {
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 30rpx;
}
......
......@@ -44,6 +44,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -621,6 +621,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -28,7 +28,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.list-cell {
display: flex;
box-sizing: border-box;
......
......@@ -91,7 +91,8 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
@use "@/uview-ui/theme.scss" as *;
.input {
border: 1px solid $u-light-color;
border-radius: 4px;
......
......@@ -230,7 +230,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 30rpx;
display: block;
......
......@@ -84,6 +84,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.logo {
height: auto;
will-change: transform;
......
......@@ -201,7 +201,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {
//height: 200vh;
height: calc(100% - 44px);
......
......@@ -44,6 +44,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.no-net-tips {
color: $u-tips-color;
font-size: 26rpx;
......
......@@ -60,7 +60,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-content {
padding: 24rpx;
font-size: 32rpx;
......
......@@ -200,6 +200,7 @@ export default {
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.badge-button {
padding: 4rpx 6rpx;
background-color: $u-type-error;
......
......@@ -116,6 +116,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.badge-button {
padding: 4rpx 6rpx;
background-color: $u-type-error;
......
......@@ -140,7 +140,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-config-wrap {
}
......
......@@ -85,7 +85,7 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {
}
</style>
......@@ -102,7 +102,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx 24rpx 24rpx 40rpx;
}
......
......@@ -75,7 +75,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.no-mode-here {
color: $u-tips-color;
font-size: 28rpx;
......
......@@ -52,6 +52,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -93,6 +93,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -81,6 +81,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {
padding-top: 0;
}
......
......@@ -157,5 +157,6 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -77,5 +77,6 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -136,6 +136,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-config-wrap {
padding: 40rpx;
}
......
......@@ -91,6 +91,7 @@ export default {
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-area {
}
</style>
......@@ -62,6 +62,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-area {
}
......
......@@ -73,5 +73,6 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -137,7 +137,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.item {
margin-top: 30px;
}
......
......@@ -183,7 +183,8 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
@use "@/uview-ui/theme.scss" as *;
.input {
border: 1px solid $u-light-color;
border-radius: 4px;
......
......@@ -138,5 +138,6 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -119,5 +119,6 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -59,9 +59,9 @@
}
</script>
<style lang="scss" scoped>
// 通过/deep/样式穿透去控制组件的内容
.wrap /deep/ .u-content {
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
// 通过::v-deep样式穿透去控制组件的内容
.wrap ::v-deep .u-content {
color: #666!important;
}
</style>
......@@ -91,6 +91,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -102,7 +102,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.container {
text-align: left;
font-size: 28rpx;
......
......@@ -66,7 +66,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -62,7 +62,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo-area {
overflow: hidden;
}
......
......@@ -130,7 +130,7 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.item {
display: flex;
padding: 20rpx;
......
......@@ -82,7 +82,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.item {
margin: 30rpx 0;
}
......
......@@ -109,5 +109,6 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -127,6 +127,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-area {
margin: 0 -40rpx;
}
......
......@@ -76,7 +76,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -151,6 +151,7 @@
</script>
<style lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-wrap {
background-color: #FFFFFF;
padding: 40rpx 8rpx;
......@@ -164,7 +165,7 @@
font-size: 28rpx;
}
/deep/ .slot-btn {
::v-deep .slot-btn {
width: 329rpx;
height: 140rpx;
display: flex;
......
......@@ -151,7 +151,7 @@ page {
}
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.demo-warter {
border-radius: 8px;
margin: 5px;
......
......@@ -75,7 +75,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -79,7 +79,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -71,7 +71,8 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
@use "@/uview-ui/theme.scss" as *;
.u-badge-wrap {
width: 60px;
height: 60px;
......
......@@ -110,12 +110,12 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.box {
padding: 30rpx;
}
.box /deep/ button {
.box ::v-deep button {
margin-bottom: 40rpx;
}
</style>
......@@ -91,7 +91,7 @@
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.gab {
background-color: rgb(245, 245, 245);
height: 20rpx;
......
......@@ -38,7 +38,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -117,7 +117,7 @@
}
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
// padding: 24rpx;
}
......
......@@ -299,7 +299,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 18rpx;
}
......
......@@ -94,6 +94,7 @@ export default {
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.count-down-demo {
justify-content: center;
}
......
......@@ -125,7 +125,7 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.count-to-demo {
text-align: center;
}
......
......@@ -56,7 +56,7 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -143,6 +143,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.grid-text {
font-size: 28rpx;
margin-top: 4rpx;
......
......@@ -116,6 +116,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.demo-layout {
height: 70rpx;
border-radius: 8rpx;
......@@ -137,7 +138,7 @@
// H5中,电脑端文档演示时,可能会导致演示块挤出边界,特别处理。
// 真实使用环境不会产生此问题
/* #ifdef H5 */
.u-demo-area /deep/ .u-row {
.u-demo-area ::v-deep .u-row {
display: flex;
flex-wrap: wrap;
}
......
......@@ -49,6 +49,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -91,6 +91,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -74,6 +74,7 @@
</script>
<style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.warp {
display: flex;
align-items: center;
......
......@@ -92,6 +92,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -72,6 +72,6 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -89,7 +89,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -80,7 +80,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-progress-content {
display: flex;
align-items: center;
......
......@@ -66,6 +66,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -83,6 +83,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -63,7 +63,7 @@
} */
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-cell-icon {
width: 36rpx;
......
......@@ -60,7 +60,7 @@
} */
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-cell-icon {
width: 36rpx;
height: 36rpx;
......
......@@ -60,7 +60,7 @@
} */
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-cell-icon {
width: 36rpx;
height: 36rpx;
......
......@@ -49,6 +49,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -57,6 +57,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -69,7 +69,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-button {
margin-top: 50rpx;
margin-bottom: 50rpx;
......
......@@ -32,6 +32,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -69,6 +69,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -75,7 +75,7 @@ export default {
};
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {
min-height: 200vh;
}
......
......@@ -44,6 +44,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -70,7 +70,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo-area {
margin-top: 50rpx;
}
......
......@@ -43,6 +43,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -35,6 +35,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -61,6 +61,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -55,6 +55,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -41,6 +41,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -14,6 +14,6 @@
<script>
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -48,6 +48,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -53,7 +53,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-btn-wrap {
margin-top: 50rpx;
}
......
......@@ -42,6 +42,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -79,7 +79,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -40,7 +40,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap {
padding: 24rpx;
}
......
......@@ -91,6 +91,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
......@@ -53,6 +53,6 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {}
</style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment