Skip to content

Commit

Permalink
書籍大全、聲望大全、坐騎大全樣式調整 (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
dorazp authored Dec 25, 2023
1 parent 1d83966 commit ca34cdb
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 20 deletions.
37 changes: 37 additions & 0 deletions public/CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
查看分支:git branch

创建分支:git branch <name>

切换分支:git checkout <name>或者git switch <name>

创建+切换分支:git checkout -b <name>或者git switch -c <name>

合并某分支到当前分支:git merge <name>

删除分支:git branch -d <name>
运行:npm run serve

推送:git push origin dev

box-shadow: 0px 0px 14px 0px #000000CC;
width: calc(100%-135px);

color: #000;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
border-radius: 10px;
border: 1px #fff solid;
transition: 0.3s ease-out;
cursor: pointer;



background-color: #e86f0019;
box-sizing: border-box;
border-radius: 10px;
overflow: hidden;
overflow-y: auto;
border: 1px solid #d16400;
box-shadow: 0px 0px 10px rgba(232, 111, 0, 0.4);


color: #d16400;
3 changes: 3 additions & 0 deletions src/assets/css/book/card.less
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
}
}
&:hover {
.u-book-info{
box-shadow: 0px 0px 14px 0px rgba(0, 0, 0, 0.85);
}
.u-desc-info {
.desc {
opacity: 0;
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/book/single.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
padding: 14px 36px 14px 14px;
box-sizing: border-box;
color: #000000;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.25);
background: url("../../img/book/line.png") no-repeat top right #324148;
background-size: contain;
.book-content {
Expand Down Expand Up @@ -351,7 +351,7 @@
@media screen and (max-width: @phone) {
.book-single-wrapper .book-single-content {
.book-detail-wrapper {
flex-direction: column;
flex-direction: column-reverse;
.book-info {
.w(100%);
}
Expand Down
4 changes: 4 additions & 0 deletions src/assets/css/common/tabs.less
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,12 @@
.flex;
box-sizing: border-box;
flex-wrap: wrap;
justify-content:space-between;
padding: 10px 15px;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
.el-input{
width: calc(100% - 50px);
}
}
}
}
14 changes: 14 additions & 0 deletions src/assets/css/horse/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@
color: #fff;
}
}
.u-search{
svg{
cursor: pointer;
border-radius: 20px;
margin-top:3px;
}
&:hover{
svg{
fill: #fff;
background-color: #d16400;
border-color: #d16400;
}
}
}
}
.m-horse-content {
.m-horse-broadcast__header {
Expand Down
44 changes: 29 additions & 15 deletions src/assets/css/reputation/single.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
.item {
display: flex;
justify-content: flex-start;
align-items: center;
padding: 0 20px;
align-items: start;
padding: 18px 20px;
margin-bottom: 20px;
width: 100%;
height: 60px;
box-sizing: border-box;
color: #000;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
Expand All @@ -44,14 +43,16 @@
.desc {
display: flex;
justify-content: flex-start;
align-items: center;
align-items: start;
width: inherit;
.desc-title {
.fz(16px);
margin-right: 10px;
font-weight: 700;
width: 90px;
}
.desc-content {
width: inherit;
font-size: 14px;
font-weight: 300;
}
Expand All @@ -69,21 +70,22 @@
padding: 20px;
width: 414px;
height: 380px;
background-color: #e86f0019;
box-sizing: border-box;
border-radius: 10px;
overflow: hidden;
overflow-y: auto;
border: 1px solid #d16400;
box-shadow: 0px 0px 10px rgba(232, 111, 0, 0.4);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
border: 1px #fff solid;
transition: 0.3s ease-out;
cursor: pointer;
.stage-title {
display: flex;
justify-content: space-between;
align-items: center;
span {
font-size: 16px;
font-weight: 700;
color: #d16400;
color: #000;
}
.page-list {
display: flex;
Expand Down Expand Up @@ -121,11 +123,25 @@
height: 36px;
line-height: 36px;
text-align: center;
background-color: #d16400;
color: #fff;
background-color: #C5C5C5;
color: #000;
font-weight: 700;
border-radius: 5px;
}
&.active{
border: 1px solid #d16400;
box-shadow: 0px 0px 10px rgba(232, 111, 0, 0.4);
.stage-title{
span{
color:#d16400;
}
}
.no-data{
background-color: #d16400;
color:#fff;
}

}
}
}
}
Expand Down Expand Up @@ -215,11 +231,12 @@
.r(10px);
padding: 20px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
height: fit-content;
.map-content {
.clip;
margin-top: 20px;
width: 468px;
height: 275px;
height: 260px;
overflow: hidden;
.m-reputation-map {
& > div {
Expand Down Expand Up @@ -320,15 +337,12 @@
flex-direction: column;
height: auto;
align-items: flex-start;
.from-to {
font-weight: normal;
}

.desc {
align-items: flex-start;
font-weight: normal;
.desc-title {
flex-shrink: 0;
font-weight: normal;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/views/horse/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
>
{{ item.name }}
</div>
</div>

<div class="u-search m-common-card">
<el-popover
ref="popover"
:placement="isPhone ? 'right' : 'bottom'"
Expand Down Expand Up @@ -40,9 +43,6 @@
<img svg-inline src="@/assets/img/filter.svg" fill="#949494" />
</div>
</el-popover>
</div>

<div class="u-search m-common-card">
<el-input
placeholder="输入关键词搜索"
v-model="keyword"
Expand Down

0 comments on commit ca34cdb

Please sign in to comment.