fe / yohobuywap-node · Commits

Go to a project

Authored by 姜枫
Commit 0054fac36f1ede50d02b15068fbc7713a8be0c3f 1 parent a1d7131f

处理字体大小

Inline Side-by-side
Showing 9 changed files with 99 additions and 84 deletions
... ... @@ -8,7 +8,7 @@ require('channel/home.page.css');
var $ = require('yoho-jquery'),
Swiper = require('yoho-swiper'),
Swiper = require('yoho-swiper2'),
lazyLoad = require('yoho-jquery-lazyload'),
fastclick = require('yoho-fastclick'),
noticeScroll = require('../plugin/notice-scroll'),
... ...
... ... @@ -5,7 +5,7 @@
@import "../layout/_swiper.css";
.brand-page {
.re-pos-search {
top: 80px !important;
top: 40PX !important;
}
.banner-top {
... ... @@ -48,8 +48,8 @@
.genderNav {
display: block;
width: 100%;
height: 80px;
line-height: 80px;
height: 40PX;
line-height: 40PX;
overflow: hidden;
color: #aeaeae;
z-index: 3;
... ... @@ -69,7 +69,7 @@
float: left;
text-align: center;
position: relative;
font-size: 28px;
i {
width: 100%;
... ... @@ -83,6 +83,7 @@
height: auto;
overflow: hidden;
display: block;
font-size: 14PX;
}
.split-border {
... ... @@ -131,7 +132,6 @@
float: left;
text-align: center;
position: relative;
font-size: 28px;
i {
width: 100%;
... ... @@ -145,6 +145,7 @@
height: auto;
overflow: hidden;
display: block;
font-size: 14PX;
}
.split-border {
... ... @@ -176,7 +177,7 @@
padding: 14px 3.125%;
background-color: #f8f8f8;
left: 0;
top: 90px;
top: 40PX;
position: fixed;
z-index: 2;
... ... @@ -207,7 +208,7 @@
.search-icon {
position: absolute;
font-size: 24px;
font-size: 12PX;
top: 0;
left: 24px;
line-height: 60px;
... ... @@ -218,7 +219,7 @@
border: none;
width: 95%;
height: 60px;
font-size: 1.2em;
font-size: 16PX;
padding: 0 10px;
}
... ... @@ -264,6 +265,11 @@
.floor-header {
padding: 0;
h2 {
font-size: 15PX;
color: #444;
}
}
.brands-swiper {
... ... @@ -311,7 +317,7 @@
padding: 0 20px;
height: 50px;
line-height: 50px;
font-size: 34px;
font-size: 17PX;
border-top: 1px solid #e6e6e6;
background-color: #f4f4f4;
}
... ... @@ -325,7 +331,7 @@
display: block;
height: 76px;
line-height: 76px;
font-size: 28px;
font-size: 14PX;
border-bottom: 1px solid #f3f3f3;
border-top: 1px solid #f9f9f9;
... ... @@ -336,7 +342,7 @@
height: 42px;
text-align: center;
vertical-align: middle;
font-size: 28px;
font-size: 14PX;
line-height: 44px;
color: #fff;
border-radius: 50px;
... ...
... ... @@ -16,7 +16,7 @@
margin-right: 4px;
height: 28px;
text-align: center;
font-size: 18px;
font-size: 12PX;
line-height: 28px;
&:last-child {
... ... @@ -107,7 +107,7 @@
background: #ffac5b;
color: #fff;
text-align: center;
font-size: 18px;
font-size: 12PX;
line-height: 28px;
}
... ... @@ -148,7 +148,7 @@
margin: 15px 0 10px;
min-height: 50px;
color: #444;
font-size: 22px;
font-size: 12PX;
line-height: 30px;
padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */
display: -webkit-box;
... ... @@ -159,7 +159,7 @@
}
.price {
font-size: 22px;
font-size: 12PX;
line-height: 22px;
white-space: nowrap;
... ... @@ -172,6 +172,7 @@
}
.market-price {
font-size: 12PX;
margin: 0 0 0 5px;
color: #b0b0b0;
text-decoration: line-through;
... ...
... ... @@ -3,8 +3,8 @@
background: #fff;
border: 1px solid #e0e0e0;
border-bottom: none;
line-height: 72px;
font-size: 30px;
line-height: 36PX;
font-size: 15PX;
color: #b0b0b0;
text-align: center;
}
... ... @@ -55,7 +55,7 @@
.name {
float: left;
font-size: 28px;
font-size: 14PX;
color: #000;
padding: 30px 0;
margin-left: 30px;
... ... @@ -63,7 +63,7 @@
.intro {
float: left;
font-size: 28px;
font-size: 14PX;
color: #b0b0b0;
padding: 30px 0;
margin-left: 30px;
... ... @@ -75,8 +75,8 @@
background: #fff;
.title {
line-height: 60px;
font-size: 40px;
line-height: 30PX;
font-size: 20PX;
color: #000;
font-weight: bold;
}
... ... @@ -84,8 +84,8 @@
.text-block {
padding: 20px 30px;
line-height: 46px;
font-size: 28px;
line-height: 23PX;
font-size: 14PX;
background: #fff;
color: #444;
word-break: break-word;
... ... @@ -258,7 +258,7 @@
h2 {
margin-left: -15px;
line-height: 104px;
font-size: 30px;
font-size: 15PX;
color: #b0b0b0;
text-align: center;
}
... ... @@ -387,7 +387,7 @@
.brand-name {
margin: 10px 0 0 0;
line-height: 24px;
font-size: 18px;
font-size: 12PX;
color: #babac2;
text-align: center;
text-decoration: none;
... ... @@ -406,8 +406,8 @@
.tag-bg {
position: absolute;
height: 40px;
width: 40px;
height: 20PX;
width: 20PX;
background: resolve('guang/tag.png') no-repeat;
background-size: 100% 100%;
top: 35px;
... ... @@ -420,14 +420,14 @@
li {
float: left;
margin-top: 31px;
margin-left: 31px;
margin-top: 16PX;
margin-left: 16PX;
}
a {
height: 50px;
line-height: 50px;
font-size: 30px;
height: 20PX;
line-height: 25PX;
font-size: 15PX;
color: #000;
text-decoration: underline;
white-space: nowrap;
... ... @@ -471,9 +471,9 @@
float: left;
width: 360px;
margin-left: 30px;
line-height: 40px;
line-height: 20PX;
color: #444;
font-size: 28px;
font-size: 14PX;
}
.title {
... ... @@ -485,16 +485,16 @@
}
.publish-time {
font-size: 18px;
font-size: 12PX;
margin-top: 0;
color: #b0b0b0;
.iconfont {
font-size: 18px;
font-size: 12PX;
}
}
}
.down-bottom {
height: 44PX;
background: #fff;
... ...
.guang-list-page {
.editor-header {
margin-bottom: 30px;
padding-top: 36px;
padding-bottom: 40px;
margin-bottom: 15PX;
padding-top: 18PX;
padding-bottom: 20PX;
background: #fff;
border-bottom: 1px solid #e0e0e0;
}
... ... @@ -11,8 +11,8 @@
float: left;
margin-left: 30px;
img {
width: 100px;
height: 100px;
width: 50PX;
height: 50PX;
border-radius: 50%;
}
}
... ... @@ -22,14 +22,14 @@
margin-left: 32px;
width: 475px;
.name {
font-size: 32px;
line-height: 40px;
font-size: 16PX;
line-height: 20PX;
}
.info {
margin-top: 6px;
color: #bdbdbf;
font-size: 24px;
line-height: 32px;
font-size: 12PX;
line-height: 16PX;
}
}
... ...
... ... @@ -54,7 +54,7 @@
width: 100%;
bottom: 0;
color: #000;
font-size: 22px;
font-size: 12PX;
}
}
}
... ...
... ... @@ -111,6 +111,7 @@
width: 124px;
height: 48px;
line-height: 48px;
font-size: 12PX;
text-align: center;
border: 1px solid #fff;
color: #fff;
... ... @@ -126,7 +127,7 @@
right: 30px;
.iconfont {
font-size: 24px;
font-size: 12PX;
}
&.coled {
... ... @@ -202,10 +203,10 @@
> li {
float: left;
width: 25%;
height: 66px;
line-height: 66px;
height: 33PX;
line-height: 33PX;
text-align: center;
font-size: 28px;
font-size: 14PX;
}
.bytouch {
... ... @@ -241,10 +242,11 @@
.new .iconfont {
transform: scale(0.8);
font-weight: bold;
font-size: 12PX;
}
.filter .iconfont {
font-size: 24px;
font-size: 12PX;
transition: transform 0.1 ease-in;
}
... ... @@ -262,11 +264,11 @@
}
.up {
top: -22px;
top: -11PX;
}
.down {
top: -8px;
top: -4PX;
}
}
}
... ...
... ... @@ -46,7 +46,7 @@
border: none;
background: transparent;
color: #666;
font-size: 30px;
font-size: 15PX;
line-height: 56px;
}
}
... ...
... ... @@ -30,8 +30,10 @@
display: block;
width: 100%;
border-left: 1px solid #e0e0e0;
margin-top: 30px;
height: 28px;
margin-top: 15PX;
height: 14PX;
font-size: 14PX;
line-height: 14PX;
}
&:first-child {
.text {
... ... @@ -46,7 +48,7 @@
}
}
.nav-main {
margin-bottom: 30px;
}
... ... @@ -110,7 +112,7 @@
.nav {
width: 100%;
height: 88px;
height: 44PX;
margin: 0;
padding: 0;
border: 0;
... ... @@ -123,7 +125,7 @@
border-sizing: border-box;
border-bottom: 1px solid #e0e0e0;
z-index: 2;
li{
display: block;
height: 28px;
... ... @@ -147,7 +149,7 @@
.color {
color: #444;
}
}
}
.main {
... ... @@ -250,11 +252,15 @@
border-top: 1px solid #e0e0e0;
color: #444;
text-align: center;
height: 100px;
line-height: 100px;
font-size: 30px;
height: 50PX;
line-height: 50PX;
margin-top: 30px;
position: relative;
font-size: 15PX;
h2 {
font-size: 15PX;
}
}
.hot-category .floor-header {
... ... @@ -392,9 +398,9 @@
.list-nav li {
display: block;
height: 80px;
height: 40PX;
float: left;
line-height: 80px;
line-height: 40PX;
width: 24.8%;
text-align: center;
border-sizing: border-box;
... ... @@ -402,7 +408,7 @@
span {
padding-top: 0;
font-size: 28px;
font-size: 14PX;
}
&.default:after,
... ... @@ -424,11 +430,11 @@
}
.list-nav .icon .up {
top: -28px;
top: -14PX;
}
.list-nav .icon .down {
top: -14px;
top: -7PX;
}
.goods-container {
... ... @@ -450,9 +456,9 @@
bottom: 0;
display: table;
width: 100%;
height: 88px;
line-height: 88px;
font-size: 28px;
height: 44PX;
line-height: 44PX;
font-size: 14PX;
background: #fff;
border-top: 1px solid #e0e0e0;
z-index: 2;
... ... @@ -468,8 +474,8 @@
.wall {
width: 0;
height: 28px;
margin-top: 30px;
height: 14PX;
margin-top: 15PX;
float: right;
border-right: 1px solid #e0e0e0;
display: inline-block;
... ... @@ -549,15 +555,15 @@
li {
display: block;
height: 78px;
height: 40PX;
float: left;
line-height: 78px;
line-height: 40PX;
width: 24.8%;
text-align: center;
border-sizing: border-box;
span {
font-size: 28px;
font-size: 14PX;
}
a {
... ... @@ -590,7 +596,7 @@
}
.filter .iconfont {
font-size: 22px;
font-size: 12PX;
transition: transform 0.1 ease-in;
}
... ... @@ -600,17 +606,17 @@
}
.pos-list .icon .up {
top: -28px;
top: -14PX;
}
.pos-list .icon .down {
top: -14px;
top: -7PX;
}
.category-list-top-board {
border-top: 1px solid #e0e0e0;
}
.category-list-last-li {
border-right: 1px solid #e0e0e0;
}
... ... @@ -685,10 +691,10 @@
margin-top: initial;
position: fixed;
top: 46px;
&.call-by-fix {
top: 80px;
position: fixed;
left: 0;
}
}
\ No newline at end of file
}
... ...