fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 2ed1d0d6a77106c1c220e504b578a139e281ad43 2 parents 6ae28e0b 1e8501b4

format-sass

Inline Side-by-side
Showing 46 changed files with 84 additions and 123 deletions
**/css/**/*.css
**/dist/**/*.css
**/scss/activity/_aslider.css
**/scss/activity/trend/map.css
**/scss/activity/live/*.css
... ...
... ... @@ -6,7 +6,7 @@
<span>{{this}}</span>
{{/ studentArr}}
</span>
<a class="checkMySchool"></a>
<a class="check-my-school"></a>
</div>
<div class="privilege clearfix">
<a class="privilege-item open-dia" href="javascript:void(0);">
... ...
... ... @@ -21,7 +21,7 @@
</div>
<div class="item-content">
<i class="rank-icon top">{{rank}}</i>
<h2 {{# sales_phrase}}class="hasActive"{{/ sales_phrase}}>{{name}}</h2>
<h2 {{# sales_phrase}}class="has-active"{{/ sales_phrase}}>{{name}}</h2>
{{# active}}
<p>{{.}}</p>
{{/ active}}
... ...
... ... @@ -2,7 +2,7 @@
<div id="allproduct" class="allproduct">
<a href={{allProduct}}>
<p class="allproductParagaraph buriedpoint" data-bp-id ="shop_category_all_1">全部商品</p>
<p class="all-product-paragaraph buriedpoint" data-bp-id ="shop_category_all_1">全部商品</p>
<i class="arrow-icon iconfont">&#xe614;</i>
</a>
</div>
... ...
... ... @@ -14,7 +14,7 @@
"build": "webpack --config ./public/build/webpack.prod.config.js",
"debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js",
"lint-js": "eslint -c .eslintrc --cache .",
"lint-css": "stylelint --syntax scss --config .stylelintrc public/scss/**/*.css",
"lint-css": "stylelint --syntax scss --config .stylelintrc 'public/scss/**/*.css'",
"lint-vue-js": "eslint -c .eslintrc --cache public/vue/**/*.vue",
"lint-vue-css": "stylelint --syntax scss --extract --config .stylelintrc public/vue/**/*.vue",
"precommit": "node lint.js"
... ...
... ... @@ -346,7 +346,7 @@ $(
default:
}
$('.checkMySchool').on('click', function() {
$('.check-my-school').on('click', function() {
var sTop = $('#university').offset().top;
$(window).scrollTop(sTop);
... ...
... ... @@ -119,9 +119,9 @@ $('#hotRank').on('touchstart', function(e) {
var target = ev.target || ev.srcElement;
if (target.nodeName.toLowerCase() === 'span') {
target.parentNode.className = 'bgActive ' + target.parentNode.className;
target.parentNode.className = 'bg-active ' + target.parentNode.className;
}
}).on('touchend touchcancel', function() {
$('.s-goods-nav .nav-item').removeClass('bgActive');
$('.s-goods-nav .nav-item').removeClass('bg-active');
});
... ...
... ... @@ -713,7 +713,6 @@
.name {
font-size: 50px;
margin-top: 50px;
display: inline-block;
max-height: 120px;
overflow: hidden;
text-overflow: ellipsis;
... ...
... ... @@ -41,7 +41,7 @@
}
}
.checkMySchool {
.check-my-school {
width: 150px;
height: 30px;
position: absolute;
... ... @@ -145,14 +145,14 @@
&:last-child {
font-size: 27px;
text-align: right;
}
span {
&:last-child span {
color: #ac8412;
}
}
}
}
}
.university {
padding: 0 30px;
... ...
... ... @@ -100,7 +100,6 @@
display: inline-block;
height: 35px;
line-height: 35px;
overflow: hidden;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
... ...
... ... @@ -353,8 +353,7 @@
}
}
.class {
.class-item {
.class .class-item {
border-top: solid 1px #e0e0e0;
border-bottom: solid 1px #e0e0e0;
padding: 30px;
... ... @@ -448,7 +447,6 @@
}
}
}
}
.foot-btn {
width: 100%;
... ... @@ -667,8 +665,9 @@
background-color: #fff;
height: 100px;
overflow: hidden;
}
ul {
.time-nav ul {
float: left;
width: auto;
... ... @@ -692,7 +691,6 @@
}
}
}
}
.adviser {
background-color: #fff;
... ... @@ -856,8 +854,9 @@
.chosen-list {
border-top: solid 1px #e0e0e0;
background-color: #fff;
}
.item {
.chosen-list .item {
padding: 30px;
border-bottom: solid 1px #e0e0e0;
display: block;
... ... @@ -902,7 +901,6 @@
}
}
}
}
.kids-pic {
padding: 30px;
... ...
... ... @@ -6,7 +6,6 @@
background: resolve("activity/vip-day/activity.jpg");
background-size: 100% 100%;
height: 363px;
/*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/
}
.vip-day-footer {
... ... @@ -310,7 +309,7 @@
.vip-good-name {
font-size: 20px;
color: #fff;
height: calc(2*20*1.4px);
height: 56px;
margin-bottom: 10px;
margin-left: 5px;
margin-right: 5px;
... ...
... ... @@ -101,8 +101,8 @@ $border-radius: 8px;
.game-item {
float: left;
width: calc((586-4) / 3px);
height: calc((406-4) / 3px);
width: 194px;
height: 134px;
margin-right: 2px;
margin-bottom: 2px;
... ...
.vip-day10.entry {
.vip-day10 .entry {
background: resolve("activity/vip-day/vip-day1028/bg.jpg");
background-size: 100% 100%;
}
... ... @@ -7,7 +7,6 @@
background: resolve("activity/vip-day/vip-day1028/head.gif");
background-size: 100% 100%;
height: 486px;
/*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/
}
.vip-day10-slogan {
... ...
... ... @@ -101,8 +101,8 @@ $border-radius: 8px;
.game-item {
float: left;
width: calc((586-4) / 3px);
height: calc((406-4) / 3px);
width: 194px;
height: 134px;
margin-right: 2px;
margin-bottom: 2px;
... ...
... ... @@ -215,7 +215,6 @@
.pagination-inner {
left: auto;
right: 30px;
-webkit-transform: none;
transform: none;
position: absolute;
... ...
@import "layout/swiper";
@import "channel/banner-top";
@import "common/good";
@import './index';
@import "./index";
... ...
... ... @@ -47,9 +47,6 @@
}
}
/*-------------------------------------*\
.coupon 单个优惠券
\*-------------------------------------*/
.coupon {
min-height: 165px;
margin-left: 30px;
... ...
... ... @@ -57,6 +57,7 @@
&.highlight {
color: $basicBtnC;
}
font-size: 28px;
float: left;
width: 50%;
... ... @@ -68,6 +69,7 @@
padding-right: 5PX;
font-size: inherit;
}
position: relative;
.animate-count {
... ... @@ -198,20 +200,19 @@
}
}
.goods-consults.customer-consults {
.consult-item {
@mixin consult-item ;
margin-top: 0;
margin-bottom: 15px;
}
}
.goods-consults {
overflow: hidden;
padding: 0;
background: none;
}
.goods-consults .customer-consults .consult-item {
@mixin consult-item ;
margin-top: 0;
margin-bottom: 15px;
}
.readmore {
display: block;
height: 88px;
... ... @@ -238,6 +239,7 @@
.goods-consults .faq-item {
@mixin consult-item ;
margin-top: 0;
margin-bottom: 15px;
... ...
... ... @@ -89,7 +89,6 @@ $basicBtnC: #eb0313;
box-sizing: border-box;
padding: 6px 3%;
width: 49.9%;
width: 49.9%;
height: 100%;
border: 1px solid #fff;
background-color: $tableCellC;
... ... @@ -891,10 +890,7 @@ $basicBtnC: #eb0313;
}
.content-main.consult-content-main {
padding-right: 28px;
padding-left: 28px;
padding-top: 20px;
padding-bottom: 20px;
padding: 20px 28px;
.question {
font-size: 24px;
... ...
... ... @@ -33,43 +33,43 @@
.method-1 {
li:nth-child(1) .intro-img {
background-image: resolve(product/help/1.png);
background-image: resolve("product/help/1.png");
}
li:nth-child(2) .intro-img {
background-image: resolve(product/help/2.png);
background-image: resolve("product/help/2.png");
}
li:nth-child(3) .intro-img {
background-image: resolve(product/help/3.png);
background-image: resolve("product/help/3.png");
}
}
.method-2 {
li:nth-child(1) .intro-img {
background-image: resolve(product/help/4.png);
background-image: resolve("product/help/4.png");
}
li:nth-child(2) .intro-img {
background-image: resolve(product/help/5.png);
background-image: resolve("product/help/5.png");
}
li:nth-child(3) .intro-img {
background-image: resolve(product/help/6.png);
background-image: resolve("product/help/6.png");
}
li:nth-child(4) .intro-img {
background-image: resolve(product/help/7.png);
background-image: resolve("product/help/7.png");
}
}
.how {
li:nth-child(1) .intro-img {
background-image: resolve(product/help/8.png);
background-image: resolve("product/help/8.png");
}
li:nth-child(2) .intro-img {
background-image: resolve(product/help/9.png);
background-image: resolve("product/help/9.png");
margin-bottom: 0;
}
}
... ...
... ... @@ -60,7 +60,7 @@
color: #444;
font-size: 28px;
&.hasActive {
&.has-active {
margin: 5px 0 0 !important;
}
}
... ... @@ -99,7 +99,6 @@
li {
float: left;
width: auto;
height: 67px;
line-height: 67px;
width: 145px;
... ... @@ -143,7 +142,7 @@
color: #000;
}
&.bgActive {
&.bg-active {
color: #000;
background-color: #e0e0e0;
}
... ...
... ... @@ -14,7 +14,7 @@
box-sizing: border-box;
padding: 0 22px;
width: 100%;
height: 70px; /**父元素hidden 隐藏滚动条**/
height: 70px;
border-bottom: 1px solid #e6e6e6;
background: #f0f0f0;
color: #999;
... ...
... ... @@ -333,7 +333,6 @@
bottom: 258px;
}
/* 搜索分割 */
.intro-text,
.word-content {
margin-left: -0.375rem;
... ... @@ -397,4 +396,6 @@
margin-top: 0;
border-top: none;
}
=======
>>>>>>> feature/indexcss
}
... ...
... ... @@ -70,7 +70,6 @@
height: 62px;
line-height: 62px;
padding: 0 20px;
font-size: 28px;
color: #000;
overflow: hidden;
text-overflow: ellipsis;
... ...
... ... @@ -6,7 +6,18 @@
height: 119px;
overflow: hidden;
ul {
&.fix-top {
position: fixed;
top: 0;
right: 0;
left: 0;
z-index: 100;
box-shadow: 0 1px 0 0 #e1e1e1;
}
}
}
.seckill-list .nav-list ul {
width: auto;
overflow: hidden;
height: 100%;
... ... @@ -100,15 +111,4 @@
padding-right: 5px;
}
}
}
&.fix-top {
position: fixed;
top: 0;
right: 0;
left: 0;
z-index: 100;
box-shadow: 0 1px 0 0 #e1e1e1;
}
}
}
... ...
.seckill-list {
.product-list {
.seckill-list .product-list {
background-color: #fff;
margin-top: 1px;
.item {
.item-link {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1;
}
}
.seckill-list .product-list .item {
position: relative;
padding: 20px 30px;
display: -webkit-box;
... ... @@ -21,8 +30,9 @@
width: 100%;
}
}
}
.item-info {
.seckill-list .product-list .item .item-info {
-webkit-box-flex: 1;
position: relative;
min-height: 202px;
... ... @@ -128,16 +138,4 @@
}
}
}
}
}
.item-link {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1;
}
}
}
... ...
... ... @@ -32,8 +32,7 @@
padding: 0 10px;
}
.allproductParagaraph {
/* font-size: 18px; */
.all-product-paragaraph {
left: 20px;
}
... ...
... ... @@ -43,12 +43,10 @@
}
}
li:first-child {
.text {
&:first-child .text {
border-left: none;
}
}
}
.shop-foot-wrapper {
position: fixed;
... ... @@ -129,7 +127,7 @@
font-size: 28px;
background: #fff;
overflow: hidden;
border-sizing: border-box;
box-sizing: border-box;
border-bottom: 1px solid #e0e0e0;
z-index: 2;
... ... @@ -142,7 +140,7 @@
text-align: center;
border-left: 1px solid #e0e0e0;
margin-top: 30px;
border-sizing: border-box;
box-sizing: border-box;
color: #b0b0b0;
&:first-child {
... ... @@ -167,6 +165,7 @@
.banner-area {
@extend .banner-top;
margin-bottom: 30px;
}
... ... @@ -401,7 +400,7 @@
line-height: 40PX;
width: 20%;
text-align: center;
border-sizing: border-box;
box-sizing: border-box;
position: relative;
span {
... ... @@ -525,6 +524,7 @@
.pos-list {
@extend .sale-page;
background: #fff;
width: 100%;
overflow: hidden;
... ... @@ -536,7 +536,7 @@
line-height: 40PX;
width: 20%;
text-align: center;
border-sizing: border-box;
box-sizing: border-box;
span {
font-size: 14PX;
... ...
... ... @@ -12,7 +12,7 @@
}
.descripition {
margin: 0 20px 0px;
margin: 0 20px;
font-size: 22px;
line-height: 36px;
padding: 60px 20px 40px;
... ...
... ... @@ -24,19 +24,7 @@
}
.shop-coupon {
// padding-right: 30px;
background-color: #f0f0f0;
// white-space: nowrap;
/*.coupon-small {
float: none;
display: inline-block !important;
white-space: normal;
}
&::-webkit-scrollbar {
display: none;
}*/
}
.shop-swiper {
... ...
... ... @@ -5,7 +5,6 @@
@import "layout/swiper";
/* page */
/* @import "channel/index"; */
@import "channel/banner-top";
@import "channel/floor-header";
@import "channel/search";
... ...
... ... @@ -155,7 +155,6 @@ body {
}
}
/* menu open*/
.menu-open {
.menu {
display: block;
... ...
.service-chat {
/* 聊天气泡 */
.head-icon {
height: 90px;
width: 90px;
... ... @@ -26,12 +25,6 @@
font-size: 28px;
word-break: break-all;
border-radius: 10px;
&.msg-pic {
}
&.msg-order {
}
}
.msg-txt {
... ... @@ -125,10 +118,6 @@
}
}
/*.send-msg-status {
}*/
.recevied-msg {
.head-icon {
float: left;
... ...