remove body background

bichao.dong
1 parent 9ee1c1f4
Showing 7 changed files with 91 additions and 248 deletions
css/common.css
css/global.css
css/global.less
css/reset.css
css/reset.less
css/section.css
css/section.less
@@ -85,7 +85,6 @@ video {
 }
 body {
   font: 12px/1.5 sans-serif;
-  background-color: #F5F5F5;
   position: relative;
   color: #333;
   min-height: 100%;
@@ -258,8 +257,6 @@ a {
   }
 }
 /***************************************************
-<<<<<<< HEAD
-=======
 * feature  :  工具类class，提供浮动清除、文本对齐、显示隐藏等;
 * update   :  2015/02/03;
 * use      :  按需使用对应class即可;
@@ -437,7 +434,6 @@ a.m-more {
   width: 25% !important;
 }
 /***************************************************
->>>>>>> c0cfc1bac841f1dbd73cdd87de041380fd52f99a
 * feature  :  全局头部，提供默认 深色(绿底白字) & 浅色(白底黑字)主题;
 * update   :  2015/02/03;
 * use      :  .m-header;
@@ -781,6 +777,36 @@ Pagination Styles
   border-left: none;
   border-top: none;
 }
+.scroll-wrap {
+  overflow-y: hidden;
+  overflow-x: scroll;
+  -webkit-overflow-scrolling: touch;
+}
+.scroll-wrap .m-goods-items {
+  white-space: nowrap;
+}
+.scroll-wrap .m-goods-items li {
+  float: none;
+  display: inline;
+  width: 110px !important;
+}
+.scroll-wrap .m-goods-items li a {
+  display: inline-block;
+  width: 100px;
+}
+.scroll-wrap .m-tab {
+  white-space: nowrap;
+  overflow: visible;
+  width: auto;
+}
+.scroll-wrap .m-tab li {
+  float: none;
+  display: inline;
+  width: 90px;
+}
+.scroll-wrap .m-tab li a {
+  display: inline-block;
+}
 .m-list-view {
   margin-bottom: 10px;
 }
@@ -1093,213 +1119,3 @@ Pagination Styles
   height: 2px;
   background-color: #23ac38;
 }
-<<<<<<< HEAD
-/***************************************************
-* feature  :  工具类class，提供浮动清除、文本对齐、显示隐藏等;
-* update   :  2015/02/03;
-* use      :  按需使用对应class即可;
-* desc     :  ;
-* feedback :  此处填入 issue, 并请附带以下信息[os_version, browser_version, page_path, issue_description]
-*          -  demo => [windows 7, IE 8, http://diligrp.com/icon.html, 在不定height下未能垂直居中];
-****************************************************/
-.text-left {
-  text-align: left !important;
-}
-.text-center {
-  text-align: center !important;
-}
-.text-right {
-  text-align: right !important;
-}
-.text-nowrap {
-  white-space: nowrap !important;
-}
-.text-overflow {
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.text-lowercase {
-  text-transform: lowercase;
-}
-.text-uppercase {
-  text-transform: uppercase;
-}
-.text-capitalize {
-  text-transform: capitalize;
-}
-.text-indent {
-  text-indent: -999em;
-}
-.float-left {
-  float: left !important;
-}
-.float-right {
-  float: right !important;
-}
-.float-none {
-  float: none !important;
-}
-.display-block {
-  display: block !important;
-}
-.clearfix:after {
-  content: '';
-  display: block;
-  height: 0;
-  overflow: hidden;
-  font-size: 0;
-  clear: both;
-}
-.m-hide {
-  display: none !important;
-  visibility: hidden;
-  opacity: 0;
-  z-index: -1;
-}
-.m-hidden {
-  visibility: hidden;
-  opacity: 0;
-  z-index: -1;
-}
-.m-show {
-  display: block !important;
-  visibility: visible;
-}
-.m-separate {
-  position: relative;
-  width: 100%;
-  line-height: 50px;
-  text-align: center;
-  font-size: 12px;
-  color: #666;
-  overflow: visible;
-}
-.m-more,
-a.m-more {
-  display: block;
-  font-size: 12px;
-  text-align: center;
-  color: #999;
-  line-height: 45px;
-  background-color: #FFF;
-}
-.m-animate-hide {
-  -webkit-transform: translate(0, 100%) translateZ(0) !important;
-  -ms-transform: translate(0, 100%) translateZ(0) !important;
-  -o-transform: translate(0, 100%) translateZ(0) !important;
-  transform: translate(0, 100%) translateZ(0) !important;
-}
-.m-animate-show {
-  -webkit-transform: translate(0, 0) translateZ(0) !important;
-  -ms-transform: translate(0, 0) translateZ(0) !important;
-  -o-transform: translate(0, 0) translateZ(0) !important;
-  transform: translate(0, 0) translateZ(0) !important;
-}
-.hidden {
-  opacity: 0;
-  z-index: -1;
-}
-.mask-hidden {
-  opacity: 0;
-}
-.font-white {
-  color: #FFF !important;
-}
-.font-white-opacity {
-  color: rgba(255, 255, 255, 0.8) !important;
-}
-.font-deep {
-  color: #333 !important;
-}
-.font-gray {
-  color: #666 !important;
-}
-.font-light {
-  color: #999 !important;
-}
-.font-yellow {
-  color: #FF9D2C !important;
-}
-.font-orange {
-  color: #FF6B00 !important;
-}
-.font-red {
-  color: #fa4535 !important;
-}
-.font-green {
-  color: #23ac38 !important;
-}
-.background-white {
-  background-color: #FFF;
-}
-.background-gray {
-  background-color: #666 !important;
-}
-.background-yellow {
-  background-color: #FF9D2C !important;
-}
-.background-orange {
-  background-color: #FF6B00 !important;
-}
-.background-red {
-  background-color: #fa4535 !important;
-}
-.background-green {
-  background-color: #23ac38 !important;
-}
-.position-relative {
-  position: relative;
-}
-.z-index2 {
-  z-index: 2;
-}
-.width-auto {
-  width: auto !important;
-}
-.width-200p {
-  width: 200%;
-}
-.m-col-1 {
-  width: 100% !important;
-}
-.m-col-2 {
-  width: 50% !important;
-}
-.m-col-3 {
-  width: 33.33% !important;
-}
-.m-col-4 {
-  width: 25% !important;
-}
-.scroll-wrap {
-  overflow-y: hidden;
-  overflow-x: scroll;
-  -webkit-overflow-scrolling: touch;
-}
-.scroll-wrap .m-goods-items {
-  white-space: nowrap;
-}
-.scroll-wrap .m-goods-items li {
-  float: none;
-  display: inline;
-  width: 110px !important;
-}
-.scroll-wrap .m-goods-items li a {
-  display: inline-block;
-  width: 100px;
-}
-.scroll-wrap .m-tab {
-  white-space: nowrap;
-  overflow: visible;
-  width: auto;
-}
-.scroll-wrap .m-tab li {
-  float: none;
-  display: inline;
-  width: 90px;
-}
-.scroll-wrap .m-tab li a {
-  display: inline-block;
-}
-=======
->>>>>>> c0cfc1bac841f1dbd73cdd87de041380fd52f99a
@@ -83,7 +83,6 @@ video {
 }
 body {
   font: 12px/1.5 sans-serif;
-  background-color: #F5F5F5;
   position: relative;
   color: #333;
   min-height: 100%;
@@ -2,34 +2,3 @@
 @import "util";
 @import "one-border";
 @import "section";
-@import "section";
-.scroll-wrap{
-  overflow-y: hidden;
-  overflow-x:scroll;
-  -webkit-overflow-scrolling: touch;
-  .m-goods-items{
-    white-space: nowrap;
-    li{
-      float: none;
-      display: inline;
-      width: 110px !important;
-      a{
-        display: inline-block;
-        width: 100px;
-      }
-    }
-  }
-  .m-tab{
-    white-space: nowrap;
-    overflow: visible;
-    width: auto;
-    li{
-      float: none;
-      display: inline;
-      width: 90px;
-      a{
-        display: inline-block;
-      }
-    }
-  }
-}
@@ -83,7 +83,6 @@ video {
 }
 body {
   font: 12px/1.5 sans-serif;
-  background-color: #F5F5F5;
   position: relative;
   color: #333;
   min-height: 100%;
@@ -17,7 +17,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr
 body {
     // font: 13px/18px "SimHei", "Microsoft YaHei", "Simson";
     font: 12px/1.5 sans-serif;
-    background-color: #F5F5F5;
+    // background-color: #F5F5F5;
     position: relative;
     color: #333;
     min-height: 100%;
@@ -84,3 +84,33 @@
   border-left: none;
   border-top: none;
 }
+.scroll-wrap {
+  overflow-y: hidden;
+  overflow-x: scroll;
+  -webkit-overflow-scrolling: touch;
+}
+.scroll-wrap .m-goods-items {
+  white-space: nowrap;
+}
+.scroll-wrap .m-goods-items li {
+  float: none;
+  display: inline;
+  width: 110px !important;
+}
+.scroll-wrap .m-goods-items li a {
+  display: inline-block;
+  width: 100px;
+}
+.scroll-wrap .m-tab {
+  white-space: nowrap;
+  overflow: visible;
+  width: auto;
+}
+.scroll-wrap .m-tab li {
+  float: none;
+  display: inline;
+  width: 90px;
+}
+.scroll-wrap .m-tab li a {
+  display: inline-block;
+}
@@ -90,3 +90,33 @@
         }
     }
 }
+.scroll-wrap{
+  overflow-y: hidden;
+  overflow-x:scroll;
+  -webkit-overflow-scrolling: touch;
+  .m-goods-items{
+    white-space: nowrap;
+    li{
+      float: none;
+      display: inline;
+      width: 110px !important;
+      a{
+        display: inline-block;
+        width: 100px;
+      }
+    }
+  }
+  .m-tab{
+    white-space: nowrap;
+    overflow: visible;
+    width: auto;
+    li{
+      float: none;
+      display: inline;
+      width: 90px;
+      a{
+        display: inline-block;
+      }
+    }
+  }
+}