Commit 146753003983711de0f4a1d79723336de73f16a6
1 parent
9ee1c1f4
remove body background
Showing
7 changed files
with
91 additions
and
248 deletions
css/common.css
... | ... | @@ -85,7 +85,6 @@ video { |
85 | 85 | } |
86 | 86 | body { |
87 | 87 | font: 12px/1.5 sans-serif; |
88 | - background-color: #F5F5F5; | |
89 | 88 | position: relative; |
90 | 89 | color: #333; |
91 | 90 | min-height: 100%; |
... | ... | @@ -258,8 +257,6 @@ a { |
258 | 257 | } |
259 | 258 | } |
260 | 259 | /*************************************************** |
261 | -<<<<<<< HEAD | |
262 | -======= | |
263 | 260 | * feature : 工具类class,提供浮动清除、文本对齐、显示隐藏等; |
264 | 261 | * update : 2015/02/03; |
265 | 262 | * use : 按需使用对应class即可; |
... | ... | @@ -437,7 +434,6 @@ a.m-more { |
437 | 434 | width: 25% !important; |
438 | 435 | } |
439 | 436 | /*************************************************** |
440 | ->>>>>>> c0cfc1bac841f1dbd73cdd87de041380fd52f99a | |
441 | 437 | * feature : 全局头部,提供默认 深色(绿底白字) & 浅色(白底黑字)主题; |
442 | 438 | * update : 2015/02/03; |
443 | 439 | * use : .m-header; |
... | ... | @@ -781,6 +777,36 @@ Pagination Styles |
781 | 777 | border-left: none; |
782 | 778 | border-top: none; |
783 | 779 | } |
780 | +.scroll-wrap { | |
781 | + overflow-y: hidden; | |
782 | + overflow-x: scroll; | |
783 | + -webkit-overflow-scrolling: touch; | |
784 | +} | |
785 | +.scroll-wrap .m-goods-items { | |
786 | + white-space: nowrap; | |
787 | +} | |
788 | +.scroll-wrap .m-goods-items li { | |
789 | + float: none; | |
790 | + display: inline; | |
791 | + width: 110px !important; | |
792 | +} | |
793 | +.scroll-wrap .m-goods-items li a { | |
794 | + display: inline-block; | |
795 | + width: 100px; | |
796 | +} | |
797 | +.scroll-wrap .m-tab { | |
798 | + white-space: nowrap; | |
799 | + overflow: visible; | |
800 | + width: auto; | |
801 | +} | |
802 | +.scroll-wrap .m-tab li { | |
803 | + float: none; | |
804 | + display: inline; | |
805 | + width: 90px; | |
806 | +} | |
807 | +.scroll-wrap .m-tab li a { | |
808 | + display: inline-block; | |
809 | +} | |
784 | 810 | .m-list-view { |
785 | 811 | margin-bottom: 10px; |
786 | 812 | } |
... | ... | @@ -1093,213 +1119,3 @@ Pagination Styles |
1093 | 1119 | height: 2px; |
1094 | 1120 | background-color: #23ac38; |
1095 | 1121 | } |
1096 | -<<<<<<< HEAD | |
1097 | -/*************************************************** | |
1098 | -* feature : 工具类class,提供浮动清除、文本对齐、显示隐藏等; | |
1099 | -* update : 2015/02/03; | |
1100 | -* use : 按需使用对应class即可; | |
1101 | -* desc : ; | |
1102 | -* feedback : 此处填入 issue, 并请附带以下信息[os_version, browser_version, page_path, issue_description] | |
1103 | -* - demo => [windows 7, IE 8, http://diligrp.com/icon.html, 在不定height下未能垂直居中]; | |
1104 | -****************************************************/ | |
1105 | -.text-left { | |
1106 | - text-align: left !important; | |
1107 | -} | |
1108 | -.text-center { | |
1109 | - text-align: center !important; | |
1110 | -} | |
1111 | -.text-right { | |
1112 | - text-align: right !important; | |
1113 | -} | |
1114 | -.text-nowrap { | |
1115 | - white-space: nowrap !important; | |
1116 | -} | |
1117 | -.text-overflow { | |
1118 | - overflow: hidden; | |
1119 | - text-overflow: ellipsis; | |
1120 | -} | |
1121 | -.text-lowercase { | |
1122 | - text-transform: lowercase; | |
1123 | -} | |
1124 | -.text-uppercase { | |
1125 | - text-transform: uppercase; | |
1126 | -} | |
1127 | -.text-capitalize { | |
1128 | - text-transform: capitalize; | |
1129 | -} | |
1130 | -.text-indent { | |
1131 | - text-indent: -999em; | |
1132 | -} | |
1133 | -.float-left { | |
1134 | - float: left !important; | |
1135 | -} | |
1136 | -.float-right { | |
1137 | - float: right !important; | |
1138 | -} | |
1139 | -.float-none { | |
1140 | - float: none !important; | |
1141 | -} | |
1142 | -.display-block { | |
1143 | - display: block !important; | |
1144 | -} | |
1145 | -.clearfix:after { | |
1146 | - content: ''; | |
1147 | - display: block; | |
1148 | - height: 0; | |
1149 | - overflow: hidden; | |
1150 | - font-size: 0; | |
1151 | - clear: both; | |
1152 | -} | |
1153 | -.m-hide { | |
1154 | - display: none !important; | |
1155 | - visibility: hidden; | |
1156 | - opacity: 0; | |
1157 | - z-index: -1; | |
1158 | -} | |
1159 | -.m-hidden { | |
1160 | - visibility: hidden; | |
1161 | - opacity: 0; | |
1162 | - z-index: -1; | |
1163 | -} | |
1164 | -.m-show { | |
1165 | - display: block !important; | |
1166 | - visibility: visible; | |
1167 | -} | |
1168 | -.m-separate { | |
1169 | - position: relative; | |
1170 | - width: 100%; | |
1171 | - line-height: 50px; | |
1172 | - text-align: center; | |
1173 | - font-size: 12px; | |
1174 | - color: #666; | |
1175 | - overflow: visible; | |
1176 | -} | |
1177 | -.m-more, | |
1178 | -a.m-more { | |
1179 | - display: block; | |
1180 | - font-size: 12px; | |
1181 | - text-align: center; | |
1182 | - color: #999; | |
1183 | - line-height: 45px; | |
1184 | - background-color: #FFF; | |
1185 | -} | |
1186 | -.m-animate-hide { | |
1187 | - -webkit-transform: translate(0, 100%) translateZ(0) !important; | |
1188 | - -ms-transform: translate(0, 100%) translateZ(0) !important; | |
1189 | - -o-transform: translate(0, 100%) translateZ(0) !important; | |
1190 | - transform: translate(0, 100%) translateZ(0) !important; | |
1191 | -} | |
1192 | -.m-animate-show { | |
1193 | - -webkit-transform: translate(0, 0) translateZ(0) !important; | |
1194 | - -ms-transform: translate(0, 0) translateZ(0) !important; | |
1195 | - -o-transform: translate(0, 0) translateZ(0) !important; | |
1196 | - transform: translate(0, 0) translateZ(0) !important; | |
1197 | -} | |
1198 | -.hidden { | |
1199 | - opacity: 0; | |
1200 | - z-index: -1; | |
1201 | -} | |
1202 | -.mask-hidden { | |
1203 | - opacity: 0; | |
1204 | -} | |
1205 | -.font-white { | |
1206 | - color: #FFF !important; | |
1207 | -} | |
1208 | -.font-white-opacity { | |
1209 | - color: rgba(255, 255, 255, 0.8) !important; | |
1210 | -} | |
1211 | -.font-deep { | |
1212 | - color: #333 !important; | |
1213 | -} | |
1214 | -.font-gray { | |
1215 | - color: #666 !important; | |
1216 | -} | |
1217 | -.font-light { | |
1218 | - color: #999 !important; | |
1219 | -} | |
1220 | -.font-yellow { | |
1221 | - color: #FF9D2C !important; | |
1222 | -} | |
1223 | -.font-orange { | |
1224 | - color: #FF6B00 !important; | |
1225 | -} | |
1226 | -.font-red { | |
1227 | - color: #fa4535 !important; | |
1228 | -} | |
1229 | -.font-green { | |
1230 | - color: #23ac38 !important; | |
1231 | -} | |
1232 | -.background-white { | |
1233 | - background-color: #FFF; | |
1234 | -} | |
1235 | -.background-gray { | |
1236 | - background-color: #666 !important; | |
1237 | -} | |
1238 | -.background-yellow { | |
1239 | - background-color: #FF9D2C !important; | |
1240 | -} | |
1241 | -.background-orange { | |
1242 | - background-color: #FF6B00 !important; | |
1243 | -} | |
1244 | -.background-red { | |
1245 | - background-color: #fa4535 !important; | |
1246 | -} | |
1247 | -.background-green { | |
1248 | - background-color: #23ac38 !important; | |
1249 | -} | |
1250 | -.position-relative { | |
1251 | - position: relative; | |
1252 | -} | |
1253 | -.z-index2 { | |
1254 | - z-index: 2; | |
1255 | -} | |
1256 | -.width-auto { | |
1257 | - width: auto !important; | |
1258 | -} | |
1259 | -.width-200p { | |
1260 | - width: 200%; | |
1261 | -} | |
1262 | -.m-col-1 { | |
1263 | - width: 100% !important; | |
1264 | -} | |
1265 | -.m-col-2 { | |
1266 | - width: 50% !important; | |
1267 | -} | |
1268 | -.m-col-3 { | |
1269 | - width: 33.33% !important; | |
1270 | -} | |
1271 | -.m-col-4 { | |
1272 | - width: 25% !important; | |
1273 | -} | |
1274 | -.scroll-wrap { | |
1275 | - overflow-y: hidden; | |
1276 | - overflow-x: scroll; | |
1277 | - -webkit-overflow-scrolling: touch; | |
1278 | -} | |
1279 | -.scroll-wrap .m-goods-items { | |
1280 | - white-space: nowrap; | |
1281 | -} | |
1282 | -.scroll-wrap .m-goods-items li { | |
1283 | - float: none; | |
1284 | - display: inline; | |
1285 | - width: 110px !important; | |
1286 | -} | |
1287 | -.scroll-wrap .m-goods-items li a { | |
1288 | - display: inline-block; | |
1289 | - width: 100px; | |
1290 | -} | |
1291 | -.scroll-wrap .m-tab { | |
1292 | - white-space: nowrap; | |
1293 | - overflow: visible; | |
1294 | - width: auto; | |
1295 | -} | |
1296 | -.scroll-wrap .m-tab li { | |
1297 | - float: none; | |
1298 | - display: inline; | |
1299 | - width: 90px; | |
1300 | -} | |
1301 | -.scroll-wrap .m-tab li a { | |
1302 | - display: inline-block; | |
1303 | -} | |
1304 | -======= | |
1305 | ->>>>>>> c0cfc1bac841f1dbd73cdd87de041380fd52f99a | ... | ... |
css/global.css
css/global.less
... | ... | @@ -2,34 +2,3 @@ |
2 | 2 | @import "util"; |
3 | 3 | @import "one-border"; |
4 | 4 | @import "section"; |
5 | -@import "section"; | |
6 | -.scroll-wrap{ | |
7 | - overflow-y: hidden; | |
8 | - overflow-x:scroll; | |
9 | - -webkit-overflow-scrolling: touch; | |
10 | - .m-goods-items{ | |
11 | - white-space: nowrap; | |
12 | - li{ | |
13 | - float: none; | |
14 | - display: inline; | |
15 | - width: 110px !important; | |
16 | - a{ | |
17 | - display: inline-block; | |
18 | - width: 100px; | |
19 | - } | |
20 | - } | |
21 | - } | |
22 | - .m-tab{ | |
23 | - white-space: nowrap; | |
24 | - overflow: visible; | |
25 | - width: auto; | |
26 | - li{ | |
27 | - float: none; | |
28 | - display: inline; | |
29 | - width: 90px; | |
30 | - a{ | |
31 | - display: inline-block; | |
32 | - } | |
33 | - } | |
34 | - } | |
35 | -} | ... | ... |
css/reset.css
css/reset.less
... | ... | @@ -17,7 +17,7 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr |
17 | 17 | body { |
18 | 18 | // font: 13px/18px "SimHei", "Microsoft YaHei", "Simson"; |
19 | 19 | font: 12px/1.5 sans-serif; |
20 | - background-color: #F5F5F5; | |
20 | + // background-color: #F5F5F5; | |
21 | 21 | position: relative; |
22 | 22 | color: #333; |
23 | 23 | min-height: 100%; | ... | ... |
css/section.css
... | ... | @@ -84,3 +84,33 @@ |
84 | 84 | border-left: none; |
85 | 85 | border-top: none; |
86 | 86 | } |
87 | +.scroll-wrap { | |
88 | + overflow-y: hidden; | |
89 | + overflow-x: scroll; | |
90 | + -webkit-overflow-scrolling: touch; | |
91 | +} | |
92 | +.scroll-wrap .m-goods-items { | |
93 | + white-space: nowrap; | |
94 | +} | |
95 | +.scroll-wrap .m-goods-items li { | |
96 | + float: none; | |
97 | + display: inline; | |
98 | + width: 110px !important; | |
99 | +} | |
100 | +.scroll-wrap .m-goods-items li a { | |
101 | + display: inline-block; | |
102 | + width: 100px; | |
103 | +} | |
104 | +.scroll-wrap .m-tab { | |
105 | + white-space: nowrap; | |
106 | + overflow: visible; | |
107 | + width: auto; | |
108 | +} | |
109 | +.scroll-wrap .m-tab li { | |
110 | + float: none; | |
111 | + display: inline; | |
112 | + width: 90px; | |
113 | +} | |
114 | +.scroll-wrap .m-tab li a { | |
115 | + display: inline-block; | |
116 | +} | ... | ... |
css/section.less
... | ... | @@ -90,3 +90,33 @@ |
90 | 90 | } |
91 | 91 | } |
92 | 92 | } |
93 | +.scroll-wrap{ | |
94 | + overflow-y: hidden; | |
95 | + overflow-x:scroll; | |
96 | + -webkit-overflow-scrolling: touch; | |
97 | + .m-goods-items{ | |
98 | + white-space: nowrap; | |
99 | + li{ | |
100 | + float: none; | |
101 | + display: inline; | |
102 | + width: 110px !important; | |
103 | + a{ | |
104 | + display: inline-block; | |
105 | + width: 100px; | |
106 | + } | |
107 | + } | |
108 | + } | |
109 | + .m-tab{ | |
110 | + white-space: nowrap; | |
111 | + overflow: visible; | |
112 | + width: auto; | |
113 | + li{ | |
114 | + float: none; | |
115 | + display: inline; | |
116 | + width: 90px; | |
117 | + a{ | |
118 | + display: inline-block; | |
119 | + } | |
120 | + } | |
121 | + } | |
122 | +} | ... | ... |