fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit a8c20ca0721cb3b50f2722ee689382d6018e960c 2 parents ae39cdd9 6c150c81

Merge branch 'feature/indexcss' into feature/webpack2

Inline Side-by-side
Showing 3 changed files with 292 additions and 293 deletions
... ... @@ -92,7 +92,6 @@
&:before {
content: "编辑";
}
display: none;
width: 100px;
height: 60px;
... ... @@ -539,7 +538,7 @@
color: #444;
font-size: 29px;
border-radius: 4px;
padding: 0px;
padding: 0;
}
}
}
... ...
.blk-cate-all {
font-size: 15PX;
.category-nav {
height: 80px;
border-bottom: 1px solid #e6e6e6;
width: 100%;
background: #fff;
z-index: 10;
li {
display: block;
box-sizing: border-box;
float: left;
height: 100%;
padding: 20px 0;
width: 50%;
text-align: center;
color: #999;
&:last-child {
border-right: none;
}
&.focus {
color: #000;
}
&.bytouch {
background: #eee;
}
}
span {
display: block;
width: 100%;
height: 30px;
line-height: 30px;
font-size: 80%;
}
}
.loca {
position: fixed;
top: 88px;
}
.content {
overflow: hidden;
position: relative;
&.hide {
display: none;
}
}
.living {
margin-top: 160px;
}
.primary-level {
float: left;
box-sizing: border-box;
width: 45%;
> li {
height: 89px;
line-height: 89px;
padding: 0 32px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid #e6e6e6;
&.focus {
background-color: #fff;
}
&.highlight {
background-color: #eee;
}
}
}
.trilanglefont {
font-family: "iconfont" !important;
font-size: 30px;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
color: #f4f4f4;
}
.primary-level-trilangle {
float: right;
background-image: url(/product/arrow.png) no-repeat;
margin-top: 22px;
width: 20px;
height: 46px;
position: relative;
right: -32px;
}
.sub-level-container {
float: left;
overflow-x: auto;
box-sizing: border-box;
background: #fff;
width: 55%;
height: 100%;
background: #f4f4f4;
}
.sub-level {
width: 100%;
height: 100%;
&.hide {
display: none;
}
> li {
box-sizing: border-box;
height: 79px;
line-height: 79px;
border-bottom: 1px solid #e6e6e6;
padding-left: 20px;
&.highlight {
background: #eee;
}
&:last-child {
border-bottom: none;
}
}
a {
display: block;
height: 100%;
width: 100%;
color: #afafaf;
}
}
.blk-cate-all {
font-size: 15PX;
.category-nav {
height: 80px;
border-bottom: 1px solid #e6e6e6;
width: 100%;
background: #fff;
z-index: 10;
li {
display: block;
box-sizing: border-box;
float: left;
height: 100%;
padding: 20px 0;
width: 50%;
text-align: center;
color: #999;
&:last-child {
border-right: none;
}
&.focus {
color: #000;
}
&.bytouch {
background: #eee;
}
}
span {
display: block;
width: 100%;
height: 30px;
line-height: 30px;
font-size: 80%;
}
}
.loca {
position: fixed;
top: 88px;
}
.content {
overflow: hidden;
position: relative;
&.hide {
display: none;
}
}
.living {
margin-top: 160px;
}
.primary-level {
float: left;
box-sizing: border-box;
width: 45%;
> li {
height: 89px;
line-height: 89px;
padding: 0 32px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid #e6e6e6;
&.focus {
background-color: #fff;
}
&.highlight {
background-color: #eee;
}
}
}
.trilanglefont {
font-family: "iconfont" !important;
font-size: 30px;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
color: #f4f4f4;
}
.primary-level-trilangle {
float: right;
background-image: url(/product/arrow.png) no-repeat;
margin-top: 22px;
width: 20px;
height: 46px;
position: relative;
right: -32px;
}
.sub-level-container {
float: left;
overflow-x: auto;
box-sizing: border-box;
background: #fff;
width: 55%;
height: 100%;
background: #f4f4f4;
}
.sub-level {
width: 100%;
height: 100%;
&.hide {
display: none;
}
> li {
box-sizing: border-box;
height: 79px;
line-height: 79px;
border-bottom: 1px solid #e6e6e6;
padding-left: 20px;
&.highlight {
background: #eee;
}
&:last-child {
border-bottom: none;
}
}
a {
display: block;
height: 100%;
width: 100%;
color: #afafaf;
}
}
}
... ...
.blk-cate-all {
font-size: 15PX;
.category-nav {
height: 80px;
border-bottom: 1px solid #e6e6e6;
width: 100%;
background: #fff;
z-index: 10;
li {
display: block;
box-sizing: border-box;
float: left;
height: 100%;
padding: 20px 0;
width: 50%;
text-align: center;
color: #999;
&:last-child {
border-right: none;
}
&.focus {
color: #000;
}
&.bytouch {
background: #eee;
}
}
span {
display: block;
width: 100%;
height: 30px;
line-height: 35px;
font-size: 90%;
}
}
.loca {
position: fixed;
top: 88px;
}
.content {
overflow: hidden;
position: relative;
&.hide {
display: none;
}
}
.living {
margin-top: 160px;
}
.primary-level {
float: left;
box-sizing: border-box;
width: 45%;
> li {
height: 89px;
line-height: 89px;
padding: 0 32px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid #e6e6e6;
&.focus {
background-color: #fff;
}
&.highlight {
background-color: #eee;
}
}
}
.trilanglefont {
font-family: "iconfont" !important;
font-size: 30px;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
color: #f4f4f4;
}
.primary-level-trilangle {
float: right;
background-image: url(/product/arrow.png) no-repeat;
margin-top: 22px;
width: 20px;
height: 46px;
position: relative;
right: -33px;
}
.sub-level-container {
float: left;
overflow-x: auto;
box-sizing: border-box;
width: 55%;
height: 100%;
background: #f4f4f4;
}
.sub-level {
width: 100%;
height: 100%;
&.hide {
display: none;
}
> li {
box-sizing: border-box;
height: 79px;
line-height: 79px;
border-bottom: 1px solid #e6e6e6;
padding-left: 20px;
&.highlight {
background: #eee;
}
&:last-child {
border-bottom: none;
}
}
a {
display: block;
height: 100%;
width: 100%;
color: #afafaf;
}
}
.blk-cate-all {
font-size: 15PX;
.category-nav {
height: 80px;
border-bottom: 1px solid #e6e6e6;
width: 100%;
background: #fff;
z-index: 10;
li {
display: block;
box-sizing: border-box;
float: left;
height: 100%;
padding: 20px 0;
width: 50%;
text-align: center;
color: #999;
&:last-child {
border-right: none;
}
&.focus {
color: #000;
}
&.bytouch {
background: #eee;
}
}
span {
display: block;
width: 100%;
height: 30px;
line-height: 35px;
font-size: 90%;
}
}
.loca {
position: fixed;
top: 88px;
}
.content {
overflow: hidden;
position: relative;
&.hide {
display: none;
}
}
.living {
margin-top: 160px;
}
.primary-level {
float: left;
box-sizing: border-box;
width: 45%;
> li {
height: 89px;
line-height: 89px;
padding: 0 32px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid #e6e6e6;
&.focus {
background-color: #fff;
}
&.highlight {
background-color: #eee;
}
}
}
.trilanglefont {
font-family: "iconfont" !important;
font-size: 30px;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
color: #f4f4f4;
}
.primary-level-trilangle {
float: right;
background-image: url(/product/arrow.png) no-repeat;
margin-top: 22px;
width: 20px;
height: 46px;
position: relative;
right: -33px;
}
.sub-level-container {
float: left;
overflow-x: auto;
box-sizing: border-box;
width: 55%;
height: 100%;
background: #f4f4f4;
}
.sub-level {
width: 100%;
height: 100%;
&.hide {
display: none;
}
> li {
box-sizing: border-box;
height: 79px;
line-height: 79px;
border-bottom: 1px solid #e6e6e6;
padding-left: 20px;
&.highlight {
background: #eee;
}
&:last-child {
border-bottom: none;
}
}
a {
display: block;
height: 100%;
width: 100%;
color: #afafaf;
}
}
}
... ...