Authored by 陈峰

合并解决冲突

... ... @@ -11,7 +11,6 @@
overflow: hidden;
text-align: center;
}
.search-input {
position: relative;
padding: 14px 30px;
... ... @@ -39,19 +38,10 @@
border: none;
}
.btn-intro,
.btn-col {
.clear-input {
position: absolute;
display: block;
width: 124px;
height: 48px;
line-height: 48px;
font-size: 12PX;
text-align: center;
border: 1px solid #fff;
color: #fff;
top: 50%;
margin-top: -24px;
top: 10px;
right: 100px;
}
.search {
... ... @@ -85,183 +75,175 @@
overflow: hidden;
}
.btn-col {
right: 30px;
.iconfont {
font-size: 12PX;
}
.brand-name {
width: 40%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
position: absolute;
}
.brand-thumb {
display: block;
float: left;
width: 150px;
height: 80px;
margin: 0;
}
span {
font-size: 28px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.entry {
color: #999;
font-size: 28px;
float: right;
}
.brand-name {
width: 40%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
position: absolute;
}
.brand-header {
position: relative;
height: 150px;
.brand-thumb {
display: block;
float: left;
width: 150px;
height: 80px;
margin: 0;
}
> img {
display: block;
height: 100%;
width: 100%;
}
.entry {
color: #999;
font-size: 28px;
float: right;
}
}
.btn-intro,
.btn-col {
position: absolute;
.brand-header {
position: relative;
height: 150px;
> img {
display: block;
width: 124px;
height: 48px;
line-height: 48px;
text-align: center;
border: 1px solid #fff;
color: #fff;
top: 50%;
margin-top: -24px;
height: 100%;
width: 100%;
}
}
.btn-intro {
right: 180px;
}
.btn-intro,
.btn-col {
position: absolute;
display: block;
width: 124px;
height: 48px;
line-height: 48px;
font-size: 12PX;
text-align: center;
border: 1px solid #fff;
color: #fff;
top: 50%;
margin-top: -24px;
}
.btn-col {
right: 30px;
.btn-intro {
right: 180px;
}
.iconfont {
font-size: 24px;
}
.btn-col {
right: 30px;
&.coled {
opacity: 0.5;
}
.iconfont {
font-size: 12PX;
}
.txt:after {
content: "收藏";
}
&.coled {
opacity: 0.5;
}
&.coled .txt:after {
content: "已收藏";
}
.txt:after {
content: "收藏";
}
.brand-intro-box {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.3);
padding: 88px 0;
z-index: 10;
overflow: auto;
.brand-intro {
position: relative;
box-sizing: border-box;
width: 85%;
margin: 0 7.5%;
background: #fff;
padding: 20px 8%;
}
&.coled .txt:after {
content: "已收藏";
}
}
h2 {
text-align: center;
font-size: 34px;
line-height: 80px;
}
.brand-intro-box {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.3);
padding: 88px 0;
z-index: 10;
overflow: auto;
.brand-intro {
position: relative;
box-sizing: border-box;
width: 85%;
margin: 0 7.5%;
background: #fff;
padding: 20px 8%;
}
.list-nav {
border-top: 2px solid #fff;
border-bottom: 1px solid #e6e6e6;
> li {
float: left;
width: 25%;
height: 33PX;
line-height: 33PX;
text-align: center;
font-size: 14PX;
}
h2 {
text-align: center;
font-size: 34px;
line-height: 80px;
}
.fo {
font-size: 36px;
height: 80px;
line-height: 80px;
text-align: center;
.con {
font-size: 24px;
line-height: 32px;
padding: 40px 0;
border-top: 1px solid #e6e6e6;
border-bottom: 1px solid #e6e6e6;
overflow-x: hidden;
}
> span {
font-size: 44px;
}
}
.fo {
font-size: 36px;
height: 80px;
line-height: 80px;
text-align: center;
.close-intro {
position: absolute;
top: 12px;
right: 12px;
}
> span {
font-size: 44px;
}
}
.list-nav {
border-top: 2px solid #fff;
border-bottom: 1px solid #e6e6e6;
> li {
float: left;
width: 25%;
height: 66px;
line-height: 66px;
text-align: center;
font-size: 28px;
}
.close-intro {
position: absolute;
top: 12px;
right: 12px;
}
}
.bytouch {
background: #eee;
}
.list-nav {
border-top: 2px solid #fff;
border-bottom: 1px solid #e6e6e6;
a {
display: block;
box-sizing: border-box;
width: 100%;
height: 100%;
color: #999;
}
> li {
float: left;
width: 25%;
height: 33PX;
line-height: 33PX;
text-align: center;
font-size: 14PX;
}
.nav-txt {
display: inline-block;
height: 100%;
box-sizing: border-box;
}
.bytouch {
background: #eee;
}
.new .iconfont {
transform: scale(0.8);
font-weight: bold;
font-size: 12PX;
}
a {
display: block;
box-sizing: border-box;
width: 100%;
height: 100%;
color: #999;
}
.filter .iconfont {
font-size: 12PX;
transition: transform 0.1 ease-in;
}
.nav-txt {
display: inline-block;
height: 100%;
box-sizing: border-box;
}
.active > a {
color: #000;
.iconfont {
color: #999;
&.cur {
color: #000;
... ... @@ -269,6 +251,21 @@
}
}
.new .iconfont {
transform: scale(0.8);
font-weight: bold;
font-size: 12PX;
}
.filter .iconfont {
font-size: 12PX;
transition: transform 0.1 ease-in;
}
.filter.active .iconfont {
transform: rotate(-180deg);
}
.icon {
position: relative;
... ... @@ -288,85 +285,58 @@
}
}
.filter .iconfont {
font-size: 24px;
transition: transform 0.1 ease-in;
}
.filter.active .iconfont {
transform: rotate(-180deg);
.no-result {
text-align: center;
vertical-align: middle;
color: #ccc;
font-size: 1.2em;
margin-top: 440px;
}
.icon {
.goods-container {
position: relative;
min-height: 880px;
padding-left: 0.375rem;
padding-top: 0.2rem;
}
i {
position: absolute;
transform: scale(0.8);
font-weight: bold;
}
.new-list {
width: 100%;
background-color: #fff;
font-size: 28px;
color: #444;
position: absolute;
z-index: 5;
li {
margin-left: 35px;
height: 88px;
line-height: 88px;
border-bottom: 1px solid #e0e0e0;
padding-right: 38px;
&:last-child {
border-bottom: none;
}
.up {
top: -22px;
&.active {
background: resolve('product/shop/check.png') no-repeat 94% center;
background-size: 36px 26px;
}
}
}
.down {
top: -8px;
}
.suspend-home {
bottom: 258px;
}
}
.no-result {
text-align: center;
vertical-align: middle;
color: #ccc;
font-size: 1.2em;
margin-top: 440px;
}
.goods-container {
position: relative;
min-height: 880px;
padding-left: 0.375rem;
padding-top: 0.2rem;
}
.new-list {
width: 100%;
background-color: #fff;
font-size: 28px;
color: #444;
position: absolute;
z-index: 5;
li {
margin-left: 35px;
height: 88px;
line-height: 88px;
border-bottom: 1px solid #e0e0e0;
padding-right: 38px;
&:last-child {
border-bottom: none;
}
&.active {
background: resolve("product/shop/check.png") no-repeat 94% center;
background-size: 36px 26px;
}
/*搜索分割*/
.search-divide {
float: left;
height: 50px;
width: 100%;
padding: 10px 0;
color: #ccc;
text-align: center;
}
}
.suspend-home {
bottom: 258px;
}
/* 搜索分割 */
.search-divide {
float: left;
height: 50px;
width: 100%;
padding: 10px 0;
color: #ccc;
text-align: center;
}
}
\ No newline at end of file
... ...