Skip to content

Commit

Permalink
移除node-sass
Browse files Browse the repository at this point in the history
  • Loading branch information
edenleung committed Mar 18, 2021
1 parent bfb458d commit d6c704d
Show file tree
Hide file tree
Showing 7 changed files with 173 additions and 486 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"md5": "^2.2.1",
"mockjs2": "1.0.8",
"moment": "^2.24.0",
"node-sass": "^4.13.0",
"nprogress": "^0.2.0",
"sass-loader": "^8.0.0",
"store": "^2.0.12",
Expand Down Expand Up @@ -64,6 +63,7 @@
"less-loader": "^5.0.0",
"opencollective": "^1.0.3",
"opencollective-postinstall": "^2.0.2",
"sass": "^1.32.8",
"vue-svg-icon-loader": "^2.1.1",
"vue-template-compiler": "^2.6.10",
"webpack-theme-color-replacer": "^1.3.12"
Expand Down
92 changes: 40 additions & 52 deletions src/views/account/settings/BaseSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<span>头像</span>
</dir>
<div class="account-settings-info-view-avatar">
<a-avatar :src="avatar" style="width: 144px;height:144px" />
<a-avatar :src="avatar" style="width: 144pxheight:144px" />
</div>
<a-upload
name="file"
Expand Down Expand Up @@ -117,57 +117,45 @@ export default {
}
</script>

<style lang="scss" scoped>
.account-settings-info-view {
display: flex;
padding-top: 12px;
}
.account-settings-info-view- {
&button_view {
width: 144px;
text-align: center;
}
&avatar_title {
height: 22px;
margin-bottom: 8px;
color: rgba(0,0,0,.85);
font-size: 14px;
padding-left: 0;
margin-top: 0;
line-height: 22px;
}
&left {
min-width: 224px;
max-width: 448px;
}
&right {
flex: 1 1;
padding-left: 104px;
}
&avatar {
width: 144px;
height: 144px;
margin-bottom: 12px;
overflow: hidden;
img {
width: 100%;
}
}
}
<style lang="sass" scoped>
.account-settings-info-view
display: flex
padding-top: 12px
.account-settings-info-view-
&button_view
width: 144px
text-align: center
&avatar_title
height: 22px
margin-bottom: 8px
color: rgba(0,0,0,.85)
font-size: 14px
padding-left: 0
margin-top: 0
line-height: 22px
&left
min-width: 224px
max-width: 448px
&right
flex: 1 1
padding-left: 104px
&avatar
width: 144px
height: 144px
margin-bottom: 12px
overflow: hidden
img
width: 100%
@media screen and (max-width: 1200px) {
.account-settings-info-view {
flex-direction: column-reverse;
}
.account-settings-info-view-avatar_title {
@media screen and (max-width: 1200px)
.account-settings-info-view
flex-direction: column-reverse
.account-settings-info-view-avatar_title
display: none
}
.account-settings-info-view-right {
display: flex;
flex-direction: column;
align-items: center;
max-width: 448px;
padding: 20px;
}
}
.account-settings-info-view-right
display: flex
flex-direction: column
align-items: center
max-width: 448px
padding: 20px
</style>
9 changes: 4 additions & 5 deletions src/views/article/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,8 @@ export default {
}
</script>

<style lang="scss" scoped>
.article-image {
max-width: 25px;
max-height: 25px;
}
<style lang="sass" scoped>
.article-image
max-width: 25px
max-height: 25px
</style>
6 changes: 3 additions & 3 deletions src/views/article/components/Article.vue
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ export default {
}
</script>

<style lang="scss">
.avatar-uploader img {
<style lang="sass">
.avatar-uploader img
max-width: 100%
}
</style>
2 changes: 1 addition & 1 deletion src/views/demo/upload/qiniu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default {
}
</script>

<style lang="scss" scoped>
<style lang="sass" scoped>
.article-image {
max-width: 25px;
max-height: 25px;
Expand Down
30 changes: 14 additions & 16 deletions src/views/system/user/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -206,20 +206,18 @@ export default {
}
</script>

<style lang="scss">
.company {
display: flex;
align-items: center;
justify-content: space-between;
height: 64px;
padding: 0 24px;
line-height: 64px;
&-title {
flex: 1 1;
color: #000;
font-size: 16px;
line-height: 24px;
opacity: .85;
}
}
<style lang="sass">
.company
display: flex
align-items: center
justify-content: space-between
height: 64px
padding: 0 24px
line-height: 64px
&-title
flex: 1 1
color: #000
font-size: 16px
line-height: 24px
opacity: .85
</style>
Loading

0 comments on commit d6c704d

Please sign in to comment.