Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JX3BOX/bps
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaviilee committed Dec 27, 2023
2 parents 5e7a35e + 7ec1ddb commit 443454e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"kungfu": "node ./tools/kungfu.js"
},
"dependencies": {
"@jx3box/jx3box-comment-ui": "^1.8.1",
"@jx3box/jx3box-common": "^8.1.3",
"@jx3box/jx3box-common-ui": "^8.0.12",
"@jx3box/jx3box-comment-ui": "^1.8.2",
"@jx3box/jx3box-common": "^8.1.4",
"@jx3box/jx3box-common-ui": "^8.0.15",
"@jx3box/jx3box-data": "^3.5.6",
"@jx3box/jx3box-editor": "^2.0.9",
"@jx3box/jx3box-editor": "^2.1.0",
"@jx3box/jx3box-talent": "^1.2.7",
"@jx3box/jx3box-talent2": "^1.5.7",
"axios": "^0.21.1",
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/list_side.less
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
}
@media screen and (max-width:@phone){
.m-side-rank,.m-side-links,.m-group{
.none;
// .none;
}
}
}
4 changes: 2 additions & 2 deletions src/assets/css/side.less
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@

@media screen and (max-width:@ipad){
#directory{
.none;
// .none;
}
}

@media screen and (max-width: @phone) {
.m-side-rank,
.m-side-links {
.none;
// .none;
}
}
2 changes: 1 addition & 1 deletion src/components/single/single_side.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default {
<style lang="less">
.m-single-side {
padding: 20px;
padding: 15px;
}
.m-single-directory {
.mb(20px);
Expand Down
6 changes: 3 additions & 3 deletions src/layout/ListLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<tabs />
<slot></slot>
</div>
<RightSidebar class="m-bps-right-side">
<RightSidebar class="m-bps-right-side" :show-toggle="true">
<Side class="m-extend" />
</RightSidebar>
<Footer></Footer>
Expand Down Expand Up @@ -51,8 +51,8 @@ export default {

<style lang="less">
.m-bps-right-side {
&.c-sidebar-right.is-close {
transform: translateX(0) !important;
.c-sidebar-right-inner {
background-color: #fff !important;
}
}
@import "~@/assets/css/list.less";
Expand Down

0 comments on commit 443454e

Please sign in to comment.