Commit 304daa60c456359f37eb0cde469941f432b209b1

Authored by zhifeng
1 parent 793052d4

新样式添加

css/style/m/list-view.css 0 → 100644
  1 +.m-list-view {
  2 + margin-top: 10px;
  3 +}
  4 +.m-list-view .cell {
  5 + font-size: 14px;
  6 + padding: 0 0 0 10px;
  7 + background-color: #FFF;
  8 + overflow: hidden;
  9 + position: relative;
  10 + text-align: left;
  11 +}
  12 +.m-list-view .cell-header {
  13 + background-color: #f8f8f8;
  14 + padding: 0 10px;
  15 +}
  16 +.m-list-view .cell-header .title {
  17 + font-size: 13px;
  18 + color: #333;
  19 + line-height: 35px;
  20 + width: auto;
  21 +}
  22 +.m-list-view .cell-header .text {
  23 + font-size: 13px;
  24 + line-height: 35px;
  25 + float: right;
  26 + color: #9e9e9e;
  27 + text-align: right;
  28 + margin: 0;
  29 +}
  30 +.m-list-view .cell-basic {
  31 + padding: 11px 10px;
  32 +}
  33 +.m-list-view .cell-basic .title,
  34 +.m-list-view .cell-basic .text {
  35 + float: none;
  36 + display: inline-block;
  37 + vertical-align: middle;
  38 + margin: 0 10px 0 0;
  39 + line-height: 1.5;
  40 +}
  41 +.m-list-view .cell-basic .sub-title {
  42 + padding-top: 10px;
  43 + font-size: 13px;
  44 + color: #999;
  45 +}
  46 +.m-list-view .cell-radio {
  47 + text-align: right;
  48 + padding: 0 10px;
  49 + margin-bottom: 10px;
  50 + background-color: #eee;
  51 +}
  52 +.m-list-view .cell-radio .title {
  53 + color: #333;
  54 + width: auto;
  55 + text-align: left;
  56 +}
  57 +.m-list-view .cell-radio .text {
  58 + float: none;
  59 + text-align: right;
  60 +}
  61 +.m-list-view .cell-radio .m-radio {
  62 + margin-left: 8px;
  63 +}
  64 +.m-list-view .cell-radio .m-table-view {
  65 + margin: 0 -10px;
  66 +}
  67 +.m-list-view .cell-radio .m-table-view .cell-radio {
  68 + margin: 0;
  69 + background-color: #FFF;
  70 +}
  71 +.m-list-view .cell-extend .m-table-view {
  72 + margin: 0 0 0 45px;
  73 +}
  74 +.m-list-view .cell-extend .m-table-view .cell {
  75 + padding: 0;
  76 +}
  77 +.m-list-view .cell-extend .m-table-view .text {
  78 + margin-left: 0;
  79 +}
  80 +.m-list-view .cell-pic {
  81 + padding: 15px;
  82 +}
  83 +.m-list-view .cell-pic .pic {
  84 + float: left;
  85 +}
  86 +.m-list-view .cell-pic .cont {
  87 + margin-left: 90px;
  88 +}
  89 +.m-list-view .cell-pic h3 {
  90 + font-size: 14px;
  91 + font-weight: normal;
  92 +}
  93 +.m-list-view .cell-pic em {
  94 + font-size: 16px;
  95 + font-weight: normal;
  96 +}
  97 +.m-list-view .cell-pic p {
  98 + color: #9b9b9b;
  99 + font-size: 12px;
  100 +}
  101 +.m-list-view .acc-icon {
  102 + position: relative;
  103 + padding-right: 30px;
  104 +}
  105 +.m-list-view .acc-icon .acc {
  106 + position: absolute;
  107 + right: 0;
  108 + top: 0;
  109 + min-width: 30px;
  110 + height: 100%;
  111 + line-height: 44px;
  112 + text-align: left;
  113 + color: #999;
  114 + text-align: right;
  115 +}
  116 +.m-list-view .acc-icon .acc .m-icon {
  117 + margin-right: 5px;
  118 +}
  119 +.m-list-view .title {
  120 + font-size: 15px;
  121 + color: #999;
  122 + float: left;
  123 + font-weight: 400;
  124 + line-height: 44px;
  125 + width: 75px;
  126 +}
  127 +.m-list-view .text {
  128 + margin-left: 75px;
  129 + display: block;
  130 + font-size: 15px;
  131 + color: #333;
  132 + line-height: 44px;
  133 + position: relative;
  134 + white-space: nowrap;
  135 + word-break: break-all;
  136 + text-overflow: ellipsis;
  137 + overflow: hidden;
  138 +}
  139 +.m-list-view .text .m-input {
  140 + font-size: 15px;
  141 +}
... ...
css/style/m2.0/list-view.css 0 → 100644
  1 +.m-list-view {
  2 + margin-top: 10px;
  3 +}
  4 +.m-list-view .cell {
  5 + font-size: 14px;
  6 + padding: 0 0 0 15px;
  7 + background-color: #FFF;
  8 + overflow: hidden;
  9 + position: relative;
  10 + text-align: left;
  11 +}
  12 +.m-list-view .cell-header {
  13 + background-color: #f8f8f8;
  14 + padding: 0 10px;
  15 +}
  16 +.m-list-view .cell-header .title {
  17 + font-size: 13px;
  18 + color: #333;
  19 + line-height: 35px;
  20 + width: auto;
  21 +}
  22 +.m-list-view .cell-header .text {
  23 + font-size: 13px;
  24 + line-height: 35px;
  25 + float: right;
  26 + color: #9e9e9e;
  27 + text-align: right;
  28 + margin: 0;
  29 +}
  30 +.m-list-view .cell-basic {
  31 + padding: 11px 10px;
  32 +}
  33 +.m-list-view .cell-basic .title,
  34 +.m-list-view .cell-basic .text {
  35 + float: none;
  36 + display: inline-block;
  37 + vertical-align: middle;
  38 + margin: 0 10px 0 0;
  39 + line-height: 1.5;
  40 +}
  41 +.m-list-view .cell-basic .sub-title {
  42 + padding-top: 10px;
  43 + font-size: 13px;
  44 + color: #999;
  45 +}
  46 +.m-list-view .cell-radio {
  47 + text-align: right;
  48 + padding: 0 10px;
  49 + margin-bottom: 10px;
  50 + background-color: #eee;
  51 +}
  52 +.m-list-view .cell-radio .title {
  53 + color: #333;
  54 + width: auto;
  55 + text-align: left;
  56 +}
  57 +.m-list-view .cell-radio .text {
  58 + float: none;
  59 + text-align: right;
  60 +}
  61 +.m-list-view .cell-radio .m-radio {
  62 + margin-left: 8px;
  63 +}
  64 +.m-list-view .cell-radio .m-table-view {
  65 + margin: 0 -10px;
  66 +}
  67 +.m-list-view .cell-radio .m-table-view .cell-radio {
  68 + margin: 0;
  69 + background-color: #FFF;
  70 +}
  71 +.m-list-view .cell-extend .m-table-view {
  72 + margin: 0 0 0 45px;
  73 +}
  74 +.m-list-view .cell-extend .m-table-view .cell {
  75 + padding: 0;
  76 +}
  77 +.m-list-view .cell-extend .m-table-view .text {
  78 + margin-left: 0;
  79 +}
  80 +.m-list-view .cell-pic {
  81 + padding: 15px;
  82 +}
  83 +.m-list-view .cell-pic .pic {
  84 + float: left;
  85 +}
  86 +.m-list-view .cell-pic .cont {
  87 + margin-left: 90px;
  88 +}
  89 +.m-list-view .cell-pic h3 {
  90 + font-size: 14px;
  91 + font-weight: normal;
  92 +}
  93 +.m-list-view .cell-pic em {
  94 + font-size: 16px;
  95 + font-weight: normal;
  96 +}
  97 +.m-list-view .cell-pic p {
  98 + color: #9b9b9b;
  99 + font-size: 12px;
  100 +}
  101 +.m-list-view .acc-icon {
  102 + position: relative;
  103 + padding-right: 30px;
  104 +}
  105 +.m-list-view .acc-icon .acc {
  106 + position: absolute;
  107 + right: 0;
  108 + top: 0;
  109 + min-width: 30px;
  110 + height: 100%;
  111 + line-height: 44px;
  112 + text-align: left;
  113 + color: #999;
  114 + text-align: right;
  115 +}
  116 +.m-list-view .acc-icon .acc .m-icon {
  117 + margin-right: 4px;
  118 +}
  119 +.m-list-view .title {
  120 + font-size: 15px;
  121 + color: #999;
  122 + float: left;
  123 + font-weight: 400;
  124 + line-height: 44px;
  125 +}
  126 +.m-list-view .text {
  127 + display: block;
  128 + font-size: 15px;
  129 + color: #333;
  130 + line-height: 44px;
  131 + position: relative;
  132 + white-space: nowrap;
  133 + word-break: break-all;
  134 + text-overflow: ellipsis;
  135 + overflow: hidden;
  136 +}
  137 +.m-list-view .text .m-input {
  138 + font-size: 15px;
  139 +}
... ...
css/style/m2.0/m_btn.css
... ... @@ -22,44 +22,60 @@
22 22 background: url('../../images/icon/icon.png') no-repeat;
23 23 background-size: 150px;
24 24 }
25   -.m-btn {
  25 +.m-btn,
  26 +a.m-btn {
26 27 display: inline-block;
27 28 padding: 0 15px;
28   - line-height: 45px;
29   - font-size: 18px;
  29 + min-width: 43px;
  30 + line-height: 28px;
  31 + font-size: 14px;
30 32 color: #666;
31 33 text-align: center;
32 34 border: none;
33 35 background-color: #FFF;
34   - border-radius: 5px;
35   - -webkit-border-radius: 5px;
36   - -moz-border-radius: 5px;
37 36 cursor: pointer;
38 37 vertical-align: middle;
39   - border: 1px solid #ddd;
  38 + border: 1px solid #EEE;
  39 + background-color: #EEE;
40 40 }
41   -.m-btn.btn-success {
  41 +.m-btn.btn-success,
  42 +a.m-btn.btn-success {
42 43 color: #FFF;
43   - background-color: #23ac38;
44   - border: none;
  44 + background-color: #23AC38;
  45 + border-color: #23AC38;
45 46 }
46   -.m-btn.btn-success.reverse {
  47 +.m-btn.btn-success.reverse,
  48 +a.m-btn.btn-success.reverse {
47 49 background-color: #FFF;
48 50 color: #23ac38;
49 51 line-height: 43px;
50 52 border: 1px solid #23ac38;
51 53 }
52   -.m-btn.btn-warning {
  54 +.m-btn.btn-large,
  55 +a.m-btn.btn-large {
  56 + font-size: 16px;
  57 + line-height: 48px;
  58 +}
  59 +.m-btn.btn-default,
  60 +a.m-btn.btn-default {
  61 + background-color: #FFF;
  62 + color: #666;
  63 + border-color: #ddd;
  64 +}
  65 +.m-btn.btn-warning,
  66 +a.m-btn.btn-warning {
53 67 color: #FFF;
54 68 background-color: #ff9d2c;
55   - border: none;
  69 + border-color: #ff9d2c;
56 70 }
57   -.m-btn.btn-danger {
  71 +.m-btn.btn-danger,
  72 +a.m-btn.btn-danger {
58 73 color: #FFF;
59   - background-color: #fa4535;
60   - border: none;
  74 + background-color: #FA4535;
  75 + border-color: #FA4535;
61 76 }
62   -.m-btn.btn-text {
  77 +.m-btn.btn-text,
  78 +a.m-btn.btn-text {
63 79 background: none;
64 80 border: 1px solid #23ac38;
65 81 color: #23ac38;
... ... @@ -72,7 +88,8 @@
72 88 border-radius: 2px;
73 89 margin-top: -2px;
74 90 }
75   -.m-btn.disabled {
  91 +.m-btn.disabled,
  92 +a.m-btn.disabled {
76 93 background-color: #ddd;
77 94 border-color: #ddd;
78 95 }
... ...
css/style/m2.0/m_footer.css
1   -.bg-img{background:url(../../images/icon/icon.png)no-repeat;background-size:150px}.m-footer{position:fixed;left:0;right:0;bottom:0;padding:12px 10px;background:rgba(255,255,255,.9);border-top:1px solid #ddd}
2 1 \ No newline at end of file
  2 +/***************************************************
  3 +* feature : 全局底部;
  4 +* update : 2015/02/03;
  5 +* use : .m-footer;
  6 +* extend : .footer-*;
  7 +* example : <footer class="m-footer"></footer>;
  8 +* desc : ;
  9 +* feedback : 此处填入 issue, 并请附带以下信息[os_version, browser_version, page_path, issue_description]
  10 +* - demo => [windows 7, IE 8, http://diligrp.com/icon.html, 在不定height下未能垂直居中];
  11 +****************************************************/
  12 +/***************************************************
  13 +* feature : 变量配置;
  14 +* update : 2015/02/05;
  15 +* use : ;
  16 +* extend : ;
  17 +* example : ;
  18 +* desc : ;
  19 +* feedback : 此处填入 issue, 并请附带以下信息[os_version, browser_version, page_path, issue_description]
  20 +* - demo => [windows 7, IE 8, http://diligrp.com/icon.html, 在不定height下未能垂直居中];
  21 +****************************************************/
  22 +.bg-img {
  23 + background: url('../../images/icon/icon.png') no-repeat;
  24 + background-size: 150px;
  25 +}
  26 +.m-footer {
  27 + position: fixed !important;
  28 + left: 0;
  29 + right: 0;
  30 + bottom: 0;
  31 + padding: 12px 10px;
  32 + background: rgba(255, 255, 255, 0.9);
  33 + z-index: 1;
  34 +}
... ...
css/style/m2.0/m_header.css
... ... @@ -43,7 +43,6 @@
43 43 .m-header.header-light {
44 44 background: rgba(255, 255, 255, 0.8);
45 45 color: #000;
46   - box-shadow: inset 0 0 1px #ddd;
47 46 }
48 47 .m-header.header-light .text {
49 48 color: #666;
... ... @@ -98,20 +97,28 @@
98 97 color: #FFF;
99 98 }
100 99 .m-header.header-search .head {
101   - padding: 7px 44px 7px 44px;
  100 + padding: 7px 44px;
102 101 }
103 102 .m-header.header-search .search-box {
104 103 line-height: 30px;
105 104 font-size: 14px;
106 105 padding: 0 8px;
107 106 background-color: #55bb22;
108   - border-radius: 3px;
109   - height: 30px;
110 107 color: #eee;
111 108 cursor: text;
  109 + display: block;
  110 + background-color: #F5F5F5;
  111 + color: #999;
112 112 text-align: left;
113 113 }
  114 +.m-header.header-search .icon-search {
  115 + margin-top: 7px;
  116 +}
  117 +.m-header.header-search .icon-search-w {
  118 + margin-top: 8px;
  119 +}
114 120 .m-header.header-search .input-wrap {
  121 + display: block;
115 122 overflow: hidden;
116 123 padding-left: 8px;
117 124 box-sizing: border-box;
... ... @@ -121,10 +128,12 @@
121 128 width: 98%;
122 129 display: block;
123 130 padding: 4px 0;
124   - color: #FFF;
  131 + color: #333;
  132 + border: none;
  133 + background: none;
125 134 }
126 135 .m-header.header-search .m-input::-webkit-input-placeholder {
127   - color: #EEE;
  136 + color: #999;
128 137 }
129 138 .m-header.header-search .m-dropdown {
130 139 float: left;
... ... @@ -139,3 +148,7 @@
139 148 padding: 7px 10px 7px 44px;
140 149 margin-right: 0;
141 150 }
  151 +.m-header.header-home .search-box {
  152 + background-color: #55bb22;
  153 + color: #eee;
  154 +}
... ...
css/style/m2.0/m_icon.css
... ... @@ -60,379 +60,690 @@ This must be run when you have at least 2 sprites.
60 60 }
61 61 .icon-information {
62 62 background-image: url(../../images/dist/sprite.png);
63   - background-position: -100px -240px;
  63 + background-position: -580px 0px;
  64 + background-position: -290px 0px;
  65 + width: 120px;
64 66 width: 60px;
  67 + height: 40px;
65 68 height: 20px;
66   - background-size: 315px;
  69 + background-size: 350px;
67 70 }
68 71 .icon-logo-app {
69 72 background-image: url(../../images/dist/sprite.png);
70   - background-position: -205px -260px;
  73 + background-position: -580px -210px;
  74 + background-position: -290px -105px;
  75 + width: 50px;
71 76 width: 25px;
  77 + height: 50px;
72 78 height: 25px;
73   - background-size: 315px;
  79 + background-size: 350px;
74 80 }
75 81 .icon-fiter {
76 82 background-image: url(../../images/dist/sprite.png);
77   - background-position: -290px -200px;
  83 + background-position: -440px -360px;
  84 + background-position: -220px -180px;
  85 + width: 40px;
78 86 width: 20px;
  87 + height: 40px;
79 88 height: 20px;
80   - background-size: 315px;
  89 + background-size: 350px;
81 90 }
82 91 .icon-have-point {
83 92 background-image: url(../../images/dist/sprite.png);
84   - background-position: -250px -240px;
  93 + background-position: -668px -453px;
  94 + background-position: -334px -226.5px;
  95 + width: 24px;
85 96 width: 12px;
  97 + height: 24px;
86 98 height: 12px;
87   - background-size: 315px;
  99 + background-size: 350px;
88 100 }
89 101 .icon-new {
90 102 background-image: url(../../images/dist/sprite.png);
91   - background-position: 0px -290px;
  103 + background-position: -580px -310px;
  104 + background-position: -290px -155px;
  105 + width: 60px;
92 106 width: 30px;
  107 + height: 34px;
93 108 height: 17px;
94   - background-size: 315px;
  109 + background-size: 350px;
95 110 }
96 111 .icon-no-point {
97 112 background-image: url(../../images/dist/sprite.png);
98   - background-position: -262px -240px;
  113 + background-position: -513px -480px;
  114 + background-position: -256.5px -240px;
  115 + width: 24px;
99 116 width: 12px;
  117 + height: 24px;
100 118 height: 12px;
101   - background-size: 315px;
  119 + background-size: 350px;
102 120 }
103 121 .icon-pro-more {
104 122 background-image: url(../../images/dist/sprite.png);
105   - background-position: -100px -260px;
  123 + background-position: -580px -40px;
  124 + background-position: -290px -20px;
  125 + width: 60px;
106 126 width: 30px;
  127 + height: 60px;
107 128 height: 30px;
108   - background-size: 315px;
109   -}
110   -.icon-search {
111   - background-image: url(../../images/dist/sprite.png);
112   - background-position: -290px -25px;
113   - width: 22.5px;
114   - height: 22.5px;
115   - background-size: 315px;
  129 + background-size: 350px;
116 130 }
117 131 .icon-talking {
118 132 background-image: url(../../images/dist/sprite.png);
119   - background-position: -290px -47.5px;
  133 + background-position: -580px -344px;
  134 + background-position: -290px -172px;
  135 + width: 45px;
120 136 width: 22.5px;
  137 + height: 45px;
121 138 height: 22.5px;
122   - background-size: 315px;
  139 + background-size: 350px;
123 140 }
124 141 .icon-white-jt {
125 142 background-image: url(../../images/dist/sprite.png);
126   - background-position: -280px -217px;
  143 + background-position: -680px -210px;
  144 + background-position: -340px -105px;
  145 + width: 20px;
127 146 width: 10px;
  147 + height: 30px;
128 148 height: 15px;
129   - background-size: 315px;
  149 + background-size: 350px;
130 150 }
131 151 .icon-cdzg {
132 152 background-image: url(../../images/dist/sprite.png);
133   - background-position: 0px -240px;
  153 + background-position: -480px 0px;
  154 + background-position: -240px 0px;
  155 + width: 100px;
134 156 width: 50px;
  157 + height: 100px;
135 158 height: 50px;
136   - background-size: 315px;
  159 + background-size: 350px;
137 160 }
138 161 .icon-gqxx {
139 162 background-image: url(../../images/dist/sprite.png);
140   - background-position: -240px -150px;
  163 + background-position: -480px -100px;
  164 + background-position: -240px -50px;
  165 + width: 100px;
141 166 width: 50px;
  167 + height: 100px;
142 168 height: 50px;
143   - background-size: 315px;
  169 + background-size: 350px;
144 170 }
145 171 .icon-jhd {
146 172 background-image: url(../../images/dist/sprite.png);
147   - background-position: -50px -240px;
  173 + background-position: -480px -200px;
  174 + background-position: -240px -100px;
  175 + width: 100px;
148 176 width: 50px;
  177 + height: 100px;
149 178 height: 50px;
150   - background-size: 315px;
  179 + background-size: 350px;
151 180 }
152 181 .icon-nhzy {
153 182 background-image: url(../../images/dist/sprite.png);
154   - background-position: -240px -100px;
  183 + background-position: -480px -300px;
  184 + background-position: -240px -150px;
  185 + width: 100px;
155 186 width: 50px;
  187 + height: 100px;
156 188 height: 50px;
157   - background-size: 315px;
  189 + background-size: 350px;
158 190 }
159 191 .icon-pfsc {
160 192 background-image: url(../../images/dist/sprite.png);
161   - background-position: -240px -50px;
  193 + background-position: 0px -480px;
  194 + background-position: 0px -240px;
  195 + width: 100px;
162 196 width: 50px;
  197 + height: 100px;
163 198 height: 50px;
164   - background-size: 315px;
  199 + background-size: 350px;
165 200 }
166 201 .icon-tcls {
167 202 background-image: url(../../images/dist/sprite.png);
168   - background-position: -120px -180px;
  203 + background-position: -100px -480px;
  204 + background-position: -50px -240px;
  205 + width: 100px;
169 206 width: 50px;
  207 + height: 100px;
170 208 height: 50px;
171   - background-size: 315px;
  209 + background-size: 350px;
172 210 }
173 211 .icon-wdnf {
174 212 background-image: url(../../images/dist/sprite.png);
175   - background-position: -170px -180px;
  213 + background-position: -240px -360px;
  214 + background-position: -120px -180px;
  215 + width: 100px;
176 216 width: 50px;
  217 + height: 100px;
177 218 height: 50px;
178   - background-size: 315px;
  219 + background-size: 350px;
179 220 }
180 221 .icon-yqxx {
181 222 background-image: url(../../images/dist/sprite.png);
182   - background-position: -240px 0px;
  223 + background-position: -340px -360px;
  224 + background-position: -170px -180px;
  225 + width: 100px;
183 226 width: 50px;
  227 + height: 100px;
184 228 height: 50px;
185   - background-size: 315px;
  229 + background-size: 350px;
186 230 }
187 231 .icon-cao-mei {
188 232 background-image: url(../../images/dist/sprite.png);
189   - background-position: -60px -180px;
  233 + background-position: -240px -240px;
  234 + background-position: -120px -120px;
  235 + width: 120px;
190 236 width: 60px;
  237 + height: 120px;
191 238 height: 60px;
192   - background-size: 315px;
  239 + background-size: 350px;
193 240 }
194 241 .icon-da-suan {
195 242 background-image: url(../../images/dist/sprite.png);
196   - background-position: 0px -180px;
  243 + background-position: -360px 0px;
  244 + background-position: -180px 0px;
  245 + width: 120px;
197 246 width: 60px;
  247 + height: 120px;
198 248 height: 60px;
199   - background-size: 315px;
  249 + background-size: 350px;
200 250 }
201 251 .icon-dou-jiao {
202 252 background-image: url(../../images/dist/sprite.png);
203   - background-position: -180px -120px;
  253 + background-position: -360px -120px;
  254 + background-position: -180px -60px;
  255 + width: 120px;
204 256 width: 60px;
  257 + height: 120px;
205 258 height: 60px;
206   - background-size: 315px;
  259 + background-size: 350px;
207 260 }
208 261 .icon-hua-cai {
209 262 background-image: url(../../images/dist/sprite.png);
210   - background-position: -180px -60px;
  263 + background-position: -360px -240px;
  264 + background-position: -180px -120px;
  265 + width: 120px;
211 266 width: 60px;
  267 + height: 120px;
212 268 height: 60px;
213   - background-size: 315px;
  269 + background-size: 350px;
214 270 }
215 271 .icon-luo-bo {
216 272 background-image: url(../../images/dist/sprite.png);
217   - background-position: -180px 0px;
  273 + background-position: 0px -360px;
  274 + background-position: 0px -180px;
  275 + width: 120px;
218 276 width: 60px;
  277 + height: 120px;
219 278 height: 60px;
220   - background-size: 315px;
  279 + background-size: 350px;
221 280 }
222 281 .icon-mo-gu {
223 282 background-image: url(../../images/dist/sprite.png);
224   - background-position: -60px 0px;
  283 + background-position: -120px -360px;
  284 + background-position: -60px -180px;
  285 + width: 120px;
225 286 width: 60px;
  287 + height: 120px;
226 288 height: 60px;
227   - background-size: 315px;
  289 + background-size: 350px;
228 290 }
229 291 .icon-ping-guo {
230 292 background-image: url(../../images/dist/sprite.png);
231   - background-position: -120px -120px;
  293 + background-position: 0px 0px;
  294 + width: 120px;
232 295 width: 60px;
  296 + height: 120px;
233 297 height: 60px;
234   - background-size: 315px;
  298 + background-size: 350px;
235 299 }
236 300 .icon-pro-more2 {
237 301 background-image: url(../../images/dist/sprite.png);
238   - background-position: -220px -180px;
  302 + background-position: -620px -477px;
  303 + background-position: -310px -238.5px;
  304 + width: 40px;
239 305 width: 20px;
  306 + height: 40px;
240 307 height: 20px;
241   - background-size: 315px;
  308 + background-size: 350px;
242 309 }
243 310 .icon-pu-tao {
244 311 background-image: url(../../images/dist/sprite.png);
245   - background-position: -60px -120px;
  312 + background-position: 0px -240px;
  313 + background-position: 0px -120px;
  314 + width: 120px;
246 315 width: 60px;
  316 + height: 120px;
247 317 height: 60px;
248   - background-size: 315px;
  318 + background-size: 350px;
249 319 }
250 320 .icon-tao-zi {
251 321 background-image: url(../../images/dist/sprite.png);
252   - background-position: 0px 0px;
  322 + background-position: -240px -120px;
  323 + background-position: -120px -60px;
  324 + width: 120px;
253 325 width: 60px;
  326 + height: 120px;
254 327 height: 60px;
255   - background-size: 315px;
  328 + background-size: 350px;
256 329 }
257 330 .icon-tu-dou {
258 331 background-image: url(../../images/dist/sprite.png);
259   - background-position: 0px -120px;
  332 + background-position: -240px 0px;
  333 + background-position: -120px 0px;
  334 + width: 120px;
260 335 width: 60px;
  336 + height: 120px;
261 337 height: 60px;
262   - background-size: 315px;
  338 + background-size: 350px;
263 339 }
264 340 .icon-xiang-jiao {
265 341 background-image: url(../../images/dist/sprite.png);
266   - background-position: -120px -60px;
  342 + background-position: -120px -120px;
  343 + background-position: -60px -60px;
  344 + width: 120px;
267 345 width: 60px;
  346 + height: 120px;
268 347 height: 60px;
269   - background-size: 315px;
  348 + background-size: 350px;
270 349 }
271 350 .icon-xue-li {
272 351 background-image: url(../../images/dist/sprite.png);
273   - background-position: -120px 0px;
  352 + background-position: 0px -120px;
  353 + background-position: 0px -60px;
  354 + width: 120px;
274 355 width: 60px;
  356 + height: 120px;
275 357 height: 60px;
276   - background-size: 315px;
  358 + background-size: 350px;
277 359 }
278 360 .icon-yang-cong {
279 361 background-image: url(../../images/dist/sprite.png);
280   - background-position: -60px -60px;
  362 + background-position: -120px -240px;
  363 + background-position: -60px -120px;
  364 + width: 120px;
281 365 width: 60px;
  366 + height: 120px;
282 367 height: 60px;
283   - background-size: 315px;
  368 + background-size: 350px;
284 369 }
285 370 .icon-ying-tao {
286 371 background-image: url(../../images/dist/sprite.png);
287   - background-position: 0px -60px;
  372 + background-position: -120px 0px;
  373 + background-position: -60px 0px;
  374 + width: 120px;
288 375 width: 60px;
  376 + height: 120px;
289 377 height: 60px;
290   - background-size: 315px;
  378 + background-size: 350px;
291 379 }
292 380 .icon-dgys {
293 381 background-image: url(../../images/dist/sprite.png);
294   - background-position: -230px -260px;
  382 + background-position: -580px -160px;
  383 + background-position: -290px -80px;
  384 + width: 50px;
295 385 width: 25px;
  386 + height: 50px;
296 387 height: 25px;
297   - background-size: 315px;
  388 + background-size: 350px;
298 389 }
299 390 .icon-qtzl {
300 391 background-image: url(../../images/dist/sprite.png);
301   - background-position: -255px -260px;
  392 + background-position: -630px -160px;
  393 + background-position: -315px -80px;
  394 + width: 50px;
302 395 width: 25px;
  396 + height: 50px;
303 397 height: 25px;
304   - background-size: 315px;
  398 + background-size: 350px;
305 399 }
306 400 .icon-scl {
307 401 background-image: url(../../images/dist/sprite.png);
308   - background-position: -180px -260px;
  402 + background-position: -640px -40px;
  403 + background-position: -320px -20px;
  404 + width: 50px;
309 405 width: 25px;
  406 + height: 50px;
310 407 height: 25px;
311   - background-size: 315px;
  408 + background-size: 350px;
312 409 }
313 410 .icon-sgl_20150825111731 {
314 411 background-image: url(../../images/dist/sprite.png);
315   - background-position: -155px -260px;
  412 + background-position: -630px -210px;
  413 + background-position: -315px -105px;
  414 + width: 50px;
316 415 width: 25px;
  416 + height: 50px;
317 417 height: 25px;
318   - background-size: 315px;
  418 + background-size: 350px;
319 419 }
320 420 .icon-spfl {
321 421 background-image: url(../../images/dist/sprite.png);
322   - background-position: -130px -260px;
  422 + background-position: -580px -260px;
  423 + background-position: -290px -130px;
  424 + width: 50px;
323 425 width: 25px;
  426 + height: 50px;
324 427 height: 25px;
325   - background-size: 315px;
  428 + background-size: 350px;
326 429 }
327 430 .icon-wlfw {
328 431 background-image: url(../../images/dist/sprite.png);
329   - background-position: -290px 0px;
  432 + background-position: -630px -260px;
  433 + background-position: -315px -130px;
  434 + width: 50px;
330 435 width: 25px;
  436 + height: 50px;
331 437 height: 25px;
332   - background-size: 315px;
  438 + background-size: 350px;
333 439 }
334 440 .icon-ddgl {
335 441 background-image: url(../../images/dist/sprite.png);
336   - background-position: -220px -200px;
  442 + background-position: -580px -517px;
  443 + background-position: -290px -258.5px;
  444 + width: 40px;
337 445 width: 20px;
  446 + height: 40px;
338 447 height: 20px;
339   - background-size: 315px;
  448 + background-size: 350px;
340 449 }
341 450 .icon-szgl {
342 451 background-image: url(../../images/dist/sprite.png);
343   - background-position: -290px -260px;
  452 + background-position: -620px -517px;
  453 + background-position: -310px -258.5px;
  454 + width: 40px;
344 455 width: 20px;
  456 + height: 40px;
345 457 height: 20px;
346   - background-size: 315px;
  458 + background-size: 350px;
347 459 }
348 460 .icon-tkgl {
349 461 background-image: url(../../images/dist/sprite.png);
350   - background-position: -290px -240px;
  462 + background-position: -660px -477px;
  463 + background-position: -330px -238.5px;
  464 + width: 40px;
351 465 width: 20px;
  466 + height: 40px;
352 467 height: 20px;
353   - background-size: 315px;
  468 + background-size: 350px;
354 469 }
355 470 .icon-wdsc {
356 471 background-image: url(../../images/dist/sprite.png);
357   - background-position: -290px -220px;
  472 + background-position: -660px -517px;
  473 + background-position: -330px -258.5px;
  474 + width: 40px;
358 475 width: 20px;
  476 + height: 40px;
359 477 height: 20px;
360   - background-size: 315px;
  478 + background-size: 350px;
361 479 }
362 480 .icon-xxgl {
363 481 background-image: url(../../images/dist/sprite.png);
364   - background-position: -290px -180px;
  482 + background-position: -580px -477px;
  483 + background-position: -290px -238.5px;
  484 + width: 40px;
365 485 width: 20px;
  486 + height: 40px;
366 487 height: 20px;
367   - background-size: 315px;
  488 + background-size: 350px;
368 489 }
369 490 .icon-back-top {
370 491 background-image: url(../../images/dist/sprite.png);
  492 + background-position: -480px -400px;
371 493 background-position: -240px -200px;
  494 + width: 80px;
372 495 width: 40px;
  496 + height: 80px;
373 497 height: 40px;
374   - background-size: 315px;
  498 + background-size: 350px;
375 499 }
376 500 .icon-dwtb {
377 501 background-image: url(../../images/dist/sprite.png);
378   - background-position: -290px -158px;
  502 + background-position: -580px -389px;
  503 + background-position: -290px -194.5px;
  504 + width: 44px;
379 505 width: 22px;
  506 + height: 44px;
380 507 height: 22px;
381   - background-size: 315px;
  508 + background-size: 350px;
382 509 }
383 510 .icon-lsjt {
384 511 background-image: url(../../images/dist/sprite.png);
385   - background-position: -290px -280px;
  512 + background-position: -668px -433px;
  513 + background-position: -334px -216.5px;
  514 + width: 30px;
386 515 width: 15px;
  516 + height: 20px;
387 517 height: 10px;
388   - background-size: 315px;
  518 + background-size: 350px;
389 519 }
390 520 .icon-wsc {
391 521 background-image: url(../../images/dist/sprite.png);
392   - background-position: -290px -114px;
  522 + background-position: -624px -389px;
  523 + background-position: -312px -194.5px;
  524 + width: 44px;
393 525 width: 22px;
  526 + height: 44px;
394 527 height: 22px;
395   - background-size: 315px;
  528 + background-size: 350px;
396 529 }
397 530 .icon-xk-no {
398 531 background-image: url(../../images/dist/sprite.png);
399   - background-position: -290px -92px;
  532 + background-position: -580px -433px;
  533 + background-position: -290px -216.5px;
  534 + width: 44px;
400 535 width: 22px;
  536 + height: 44px;
401 537 height: 22px;
402   - background-size: 315px;
  538 + background-size: 350px;
403 539 }
404 540 .icon-xk-yes {
405 541 background-image: url(../../images/dist/sprite.png);
406   - background-position: -290px -70px;
  542 + background-position: -625px -344px;
  543 + background-position: -312.5px -172px;
  544 + width: 44px;
407 545 width: 22px;
  546 + height: 44px;
408 547 height: 22px;
409   - background-size: 315px;
  548 + background-size: 350px;
410 549 }
411 550 .icon-ysc {
412 551 background-image: url(../../images/dist/sprite.png);
413   - background-position: -290px -136px;
  552 + background-position: -624px -433px;
  553 + background-position: -312px -216.5px;
  554 + width: 44px;
414 555 width: 22px;
  556 + height: 44px;
415 557 height: 22px;
416   - background-size: 315px;
  558 + background-size: 350px;
417 559 }
418 560 .icon-sdrz {
419 561 background-image: url(../../images/dist/sprite.png);
420   - background-position: -160px -240px;
  562 + background-position: -580px -100px;
  563 + background-position: -290px -50px;
  564 + width: 90px;
421 565 width: 45px;
  566 + height: 30px;
422 567 height: 15px;
423   - background-size: 315px;
  568 + background-size: 350px;
424 569 }
425 570 .icon-sxsj {
426 571 background-image: url(../../images/dist/sprite.png);
427   - background-position: -205px -240px;
  572 + background-position: -580px -130px;
  573 + background-position: -290px -65px;
  574 + width: 90px;
428 575 width: 45px;
  576 + height: 30px;
429 577 height: 15px;
430   - background-size: 315px;
  578 + background-size: 350px;
  579 +}
  580 +.icon-arrow-down {
  581 + background-image: url(../../images/dist/sprite.png);
  582 + background-position: -668px -415px;
  583 + background-position: -334px -207.5px;
  584 + width: 26px;
  585 + width: 13px;
  586 + height: 14px;
  587 + height: 7px;
  588 + background-size: 350px;
431 589 }
432 590 .icon-back {
433 591 background-image: url(../../images/dist/sprite.png);
434   - background-position: -280px -200px;
  592 + background-position: -680px -160px;
  593 + background-position: -340px -80px;
  594 + width: 20px;
435 595 width: 10px;
  596 + height: 34px;
436 597 height: 17px;
437   - background-size: 315px;
  598 + background-size: 350px;
  599 +}
  600 +.icon-call {
  601 + background-image: url(../../images/dist/sprite.png);
  602 + background-position: -640px -310px;
  603 + background-position: -320px -155px;
  604 + width: 32px;
  605 + width: 16px;
  606 + height: 33px;
  607 + height: 16.5px;
  608 + background-size: 350px;
  609 +}
  610 +.icon-circle-back {
  611 + background-image: url(../../images/dist/sprite.png);
  612 + background-position: -270px -480px;
  613 + background-position: -135px -240px;
  614 + width: 70px;
  615 + width: 35px;
  616 + height: 70px;
  617 + height: 35px;
  618 + background-size: 350px;
  619 +}
  620 +.icon-circle-more {
  621 + background-image: url(../../images/dist/sprite.png);
  622 + background-position: -340px -480px;
  623 + background-position: -170px -240px;
  624 + width: 70px;
  625 + width: 35px;
  626 + height: 70px;
  627 + height: 35px;
  628 + background-size: 350px;
  629 +}
  630 +.icon-circle-star {
  631 + background-image: url(../../images/dist/sprite.png);
  632 + background-position: -410px -480px;
  633 + background-position: -205px -240px;
  634 + width: 70px;
  635 + width: 35px;
  636 + height: 70px;
  637 + height: 35px;
  638 + background-size: 350px;
  639 +}
  640 +.icon-circle-video {
  641 + background-image: url(../../images/dist/sprite.png);
  642 + background-position: -200px -480px;
  643 + background-position: -100px -240px;
  644 + width: 70px;
  645 + width: 35px;
  646 + height: 70px;
  647 + height: 35px;
  648 + background-size: 350px;
  649 +}
  650 +.icon-jrjhd {
  651 + background-image: url(../../images/dist/sprite.png);
  652 + background-position: -440px -400px;
  653 + background-position: -220px -200px;
  654 + width: 36px;
  655 + width: 18px;
  656 + height: 37px;
  657 + height: 18.5px;
  658 + background-size: 350px;
  659 +}
  660 +.icon-medal-gold {
  661 + background-image: url(../../images/dist/sprite.png);
  662 + background-position: -670px -130px;
  663 + background-position: -335px -65px;
  664 + width: 22px;
  665 + width: 11px;
  666 + height: 30px;
  667 + height: 15px;
  668 + background-size: 350px;
  669 +}
  670 +.icon-medal-sliver {
  671 + background-image: url(../../images/dist/sprite.png);
  672 + background-position: -672px -310px;
  673 + background-position: -336px -155px;
  674 + width: 22px;
  675 + width: 11px;
  676 + height: 30px;
  677 + height: 15px;
  678 + background-size: 350px;
  679 +}
  680 +.icon-phone {
  681 + background-image: url(../../images/dist/sprite.png);
  682 + background-position: -670px -100px;
  683 + background-position: -335px -50px;
  684 + width: 29px;
  685 + width: 14.5px;
  686 + height: 29px;
  687 + height: 14.5px;
  688 + background-size: 350px;
  689 +}
  690 +.icon-search-w {
  691 + background-image: url(../../images/dist/sprite.png);
  692 + background-position: -668px -389px;
  693 + background-position: -334px -194.5px;
  694 + width: 25px;
  695 + width: 12.5px;
  696 + height: 26px;
  697 + height: 13px;
  698 + background-size: 350px;
  699 +}
  700 +.icon-search {
  701 + background-image: url(../../images/dist/sprite.png);
  702 + background-position: -669px -344px;
  703 + background-position: -334.5px -172px;
  704 + width: 30px;
  705 + width: 15px;
  706 + height: 31px;
  707 + height: 15.5px;
  708 + background-size: 350px;
  709 +}
  710 +.icon-star {
  711 + background-image: url(../../images/dist/sprite.png);
  712 + background-position: -480px -480px;
  713 + background-position: -240px -240px;
  714 + width: 33px;
  715 + width: 16.5px;
  716 + height: 31px;
  717 + height: 15.5px;
  718 + background-size: 350px;
  719 +}
  720 +.icon-up-down {
  721 + background-image: url(../../images/dist/sprite.png);
  722 + background-position: -560px -400px;
  723 + background-position: -280px -200px;
  724 + width: 20px;
  725 + width: 10px;
  726 + height: 24px;
  727 + height: 12px;
  728 + background-size: 350px;
  729 +}
  730 +.icon-yjt {
  731 + background-image: url(../../images/dist/sprite.png);
  732 + background-position: -680px -260px;
  733 + background-position: -340px -130px;
  734 + width: 17px;
  735 + width: 8.5px;
  736 + height: 30px;
  737 + height: 15px;
  738 + background-size: 350px;
  739 +}
  740 +.icon-arrow {
  741 + background-image: url(../../images/dist/sprite.png);
  742 + background-position: -680px -260px;
  743 + background-position: -340px -130px;
  744 + width: 17px;
  745 + width: 8.5px;
  746 + height: 30px;
  747 + height: 15px;
  748 + background-size: 350px;
438 749 }
... ...
css/style/m2.0/m_like.css
... ... @@ -26,6 +26,7 @@
26 26 width: 75px;
27 27 height: 14px;
28 28 display: inline-block;
  29 + vertical-align: middle;
29 30 background: url("../../images/icon/star@2x.png") left center repeat-x;
30 31 background-size: 15px;
31 32 }
... ...
css/style/m2.0/m_reset.css
... ... @@ -109,6 +109,7 @@ body {
109 109 font: 12px/1.5 sans-serif;
110 110 background-color: #F5F5F5;
111 111 position: relative;
  112 + color: #333;
112 113 min-height: 100%;
113 114 overflow-x: hidden;
114 115 }
... ...
css/style/m2.0/m_segment.css
... ... @@ -24,35 +24,42 @@
24 24 }
25 25 .m-segment {
26 26 overflow: hidden;
  27 + vertical-align: middle;
27 28 }
28 29 .m-segment li {
29 30 width: 50%;
30   - line-height: 35px;
  31 + line-height: 30px;
31 32 text-align: center;
32 33 float: left;
33 34 background-color: #FFF;
34   - border: 1px solid #6c2;
  35 + color: #23AC38;
  36 + border: 1px solid #23AC38;
35 37 border-right: none;
36 38 box-sizing: border-box;
37 39 }
38   -.m-segment li .text {
  40 +.m-segment li:last-child {
  41 + border-right: 1px solid #23AC38;
  42 +}
  43 +.m-segment li .segment-text {
39 44 display: block;
40   - color: #66cc22;
  45 + color: #23AC38;
  46 + line-height: 30px;
41 47 font-size: 14px;
42 48 }
43   -.m-segment li:first-child {
44   - border-top-left-radius: 4px;
45   - border-bottom-left-radius: 4px;
46   -}
47   -.m-segment li:last-child {
48   - border-top-right-radius: 4px;
49   - border-bottom-right-radius: 4px;
50   - border-right: 1px solid #6c2;
51   -}
52 49 .m-segment .on {
53 50 color: #FFF;
54   - background-color: #66cc22;
  51 + background-color: #23AC38;
55 52 }
56   -.m-segment .on .text {
  53 +.m-segment .on .segment-text {
57 54 color: #FFF;
58 55 }
  56 +.m-segment.tab-col-2 li {
  57 + width: 50% !important;
  58 +}
  59 +.m-segment.tab-col-3 li {
  60 + width: 33.3% !important;
  61 +}
  62 +.m-segment.tab-col-4 li {
  63 + padding-right: 0;
  64 + width: 25% !important;
  65 +}
... ...
css/style/m2.0/m_step.css
... ... @@ -25,18 +25,7 @@
25 25 .m-step {
26 26 overflow: hidden;
27 27 position: relative;
28   - padding: 12px 0;
29   -}
30   -.m-step:before,
31   -.m-step:after {
32   - content: '';
33   - position: absolute;
34   - left: 0;
35   - right: 6px;
36   - top: 50%;
37   - height: 3px;
38   - background-color: #ddd;
39   - margin-top: -1px;
  28 + padding: 11px 0;
40 29 }
41 30 .m-step:after {
42 31 left: auto;
... ... @@ -57,29 +46,16 @@
57 46 min-width: 85px;
58 47 box-sizing: border-box;
59 48 }
60   -.m-step li:before {
61   - content: '';
62   - position: absolute;
63   - width: 7px;
64   - height: 7px;
65   - border: 2px solid #FFF;
66   - background-color: #DDD;
67   - font-size: 0;
68   - overflow: hidden;
69   - top: 50%;
70   - margin-top: -5px;
71   - border-radius: 50%;
72   - box-shadow: 0 0 1px #ddd;
73   -}
74   -.m-step .text {
  49 +.m-step .desc,
  50 +.m-step .price {
75 51 font-size: 14px;
76 52 color: #6c2;
77 53 display: block;
78   - padding-bottom: 7px;
  54 + padding-bottom: 8px;
79 55 }
80   -.m-step .desc {
81   - font-size: 12px;
82   - color: #999;
83   - display: block;
84   - padding-top: 7px;
  56 +.m-step .price {
  57 + font-size: 18px;
  58 + font-style: normal;
  59 + padding: 0;
  60 + line-height: 1.1;
85 61 }
... ...
css/style/m2.0/m_tab.css
... ... @@ -27,7 +27,6 @@
27 27 background-color: #FFF;
28 28 font-size: 14px;
29 29 color: #999;
30   - border: 1px solid #ddd;
31 30 border-width: 1px 0;
32 31 overflow: hidden;
33 32 box-sizing: border-box;
... ... @@ -58,9 +57,13 @@
58 57 bottom: 0;
59 58 left: 0;
60 59 right: 0;
61   - height: 1px;
62   - background-color: #2caa3f;
  60 + height: 2px;
  61 + background-color: #23AC38;
63 62 }
64 63 .m-tab.tab-col-2 li {
65 64 width: 50% !important;
66 65 }
  66 +.m-tab.tab-col-4 li {
  67 + padding-right: 0;
  68 + width: 25% !important;
  69 +}
... ...
css/style/m2.0/utilities.css
... ... @@ -113,12 +113,24 @@ a.m-more {
113 113 opacity: 0;
114 114 z-index: -1;
115 115 }
  116 +.font-white {
  117 + color: #FFF !important;
  118 +}
  119 +.font-gray {
  120 + color: #666 !important;
  121 +}
  122 +.font-light {
  123 + color: #999 !important;
  124 +}
  125 +.font-yellow {
  126 + color: #FF9D2C !important;
  127 +}
  128 +.font-orange {
  129 + color: #FF6B00 !important;
  130 +}
116 131 .font-red {
117 132 color: #fa4535 !important;
118 133 }
119 134 .font-green {
120 135 color: #23ac38 !important;
121 136 }
122   -.font-orange {
123   - color: #ff9d2c !important;
124   -}
... ...
css/style/product-filter.css
  1 +.product-filter .m-list-view {
  2 + margin-top: 0;
  3 +}
  4 +.product-filter .m-list-view .cell {
  5 + padding: 15px;
  6 +}
  7 +.product-filter .m-list-view .acc-icon .acc {
  8 + right: 10px;
  9 +}
1 10 .product-filter .m-list-view .text {
  11 + display: inline-block;
2 12 margin-left: 0;
  13 + font-size: 14px;
  14 + line-height: 30px;
  15 + vertical-align: middle;
  16 +}
  17 +.product-filter .m-list-view .filed {
  18 + line-height: 20px;
  19 + margin-bottom: 10px;
  20 +}
  21 +.product-filter .m-list-view .separate {
  22 + display: inline-block;
  23 + width: 30px;
  24 + text-align: center;
  25 + line-height: 30px;
  26 +}
  27 +.product-filter .m-list-view .btn-group {
  28 + margin: -10px 0 0 -10px;
  29 +}
  30 +.product-filter .m-list-view .btn-group .m-btn {
  31 + float: left;
  32 + margin: 10px 0 0 10px;
  33 +}
  34 +.product-filter .pop-foot {
  35 + position: absolute;
  36 + bottom: 0;
  37 + left: 0;
  38 + right: 0;
  39 +}
  40 +.product-filter .pop-foot .m-btn {
  41 + float: left;
  42 + box-sizing: border-box;
  43 + width: 50%;
3 44 }
... ...