fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit a8c20ca0721cb3b50f2722ee689382d6018e960c 2 parents ae39cdd9 6c150c81

Merge branch 'feature/indexcss' into feature/webpack2

Inline Side-by-side
Showing 3 changed files with 292 additions and 293 deletions
@@ -92,7 +92,6 @@ @@ -92,7 +92,6 @@
92 &:before { 92 &:before {
93 content: "编辑"; 93 content: "编辑";
94 } 94 }
95 -  
96 display: none; 95 display: none;
97 width: 100px; 96 width: 100px;
98 height: 60px; 97 height: 60px;
@@ -539,7 +538,7 @@ @@ -539,7 +538,7 @@
539 color: #444; 538 color: #444;
540 font-size: 29px; 539 font-size: 29px;
541 border-radius: 4px; 540 border-radius: 4px;
542 - padding: 0px; 541 + padding: 0;
543 } 542 }
544 } 543 }
545 } 544 }
1 -.blk-cate-all {  
2 - font-size: 15PX;  
3 -  
4 - .category-nav {  
5 - height: 80px;  
6 - border-bottom: 1px solid #e6e6e6;  
7 - width: 100%;  
8 - background: #fff;  
9 - z-index: 10;  
10 -  
11 - li {  
12 - display: block;  
13 - box-sizing: border-box;  
14 - float: left;  
15 - height: 100%;  
16 - padding: 20px 0;  
17 - width: 50%;  
18 - text-align: center;  
19 - color: #999;  
20 -  
21 - &:last-child {  
22 - border-right: none;  
23 - }  
24 -  
25 - &.focus {  
26 - color: #000;  
27 - }  
28 -  
29 - &.bytouch {  
30 - background: #eee;  
31 - }  
32 - }  
33 -  
34 - span {  
35 - display: block;  
36 - width: 100%;  
37 - height: 30px;  
38 - line-height: 30px;  
39 - font-size: 80%;  
40 - }  
41 - }  
42 -  
43 - .loca {  
44 - position: fixed;  
45 - top: 88px;  
46 - }  
47 -  
48 - .content {  
49 - overflow: hidden;  
50 - position: relative;  
51 -  
52 - &.hide {  
53 - display: none;  
54 - }  
55 - }  
56 -  
57 - .living {  
58 - margin-top: 160px;  
59 - }  
60 -  
61 - .primary-level {  
62 - float: left;  
63 - box-sizing: border-box;  
64 - width: 45%;  
65 -  
66 - > li {  
67 - height: 89px;  
68 - line-height: 89px;  
69 - padding: 0 32px;  
70 - white-space: nowrap;  
71 - overflow: hidden;  
72 - text-overflow: ellipsis;  
73 - border-bottom: 1px solid #e6e6e6;  
74 -  
75 - &.focus {  
76 - background-color: #fff;  
77 - }  
78 -  
79 - &.highlight {  
80 - background-color: #eee;  
81 - }  
82 - }  
83 - }  
84 -  
85 - .trilanglefont {  
86 - font-family: "iconfont" !important;  
87 - font-size: 30px;  
88 - font-style: normal;  
89 - text-decoration: none;  
90 - -webkit-font-smoothing: antialiased;  
91 - -webkit-text-stroke-width: 0.2px;  
92 - -moz-osx-font-smoothing: grayscale;  
93 - color: #f4f4f4;  
94 - }  
95 -  
96 - .primary-level-trilangle {  
97 - float: right;  
98 - background-image: url(/product/arrow.png) no-repeat;  
99 - margin-top: 22px;  
100 - width: 20px;  
101 - height: 46px;  
102 - position: relative;  
103 - right: -32px;  
104 - }  
105 -  
106 - .sub-level-container {  
107 - float: left;  
108 - overflow-x: auto;  
109 - box-sizing: border-box;  
110 - background: #fff;  
111 - width: 55%;  
112 - height: 100%;  
113 - background: #f4f4f4;  
114 - }  
115 -  
116 - .sub-level {  
117 - width: 100%;  
118 - height: 100%;  
119 -  
120 - &.hide {  
121 - display: none;  
122 - }  
123 -  
124 - > li {  
125 - box-sizing: border-box;  
126 - height: 79px;  
127 - line-height: 79px;  
128 - border-bottom: 1px solid #e6e6e6;  
129 - padding-left: 20px;  
130 -  
131 - &.highlight {  
132 - background: #eee;  
133 - }  
134 -  
135 - &:last-child {  
136 - border-bottom: none;  
137 - }  
138 - }  
139 -  
140 - a {  
141 - display: block;  
142 - height: 100%;  
143 - width: 100%;  
144 - color: #afafaf;  
145 - }  
146 - } 1 +.blk-cate-all {
  2 + font-size: 15PX;
  3 +
  4 + .category-nav {
  5 + height: 80px;
  6 + border-bottom: 1px solid #e6e6e6;
  7 + width: 100%;
  8 + background: #fff;
  9 + z-index: 10;
  10 +
  11 + li {
  12 + display: block;
  13 + box-sizing: border-box;
  14 + float: left;
  15 + height: 100%;
  16 + padding: 20px 0;
  17 + width: 50%;
  18 + text-align: center;
  19 + color: #999;
  20 +
  21 + &:last-child {
  22 + border-right: none;
  23 + }
  24 +
  25 + &.focus {
  26 + color: #000;
  27 + }
  28 +
  29 + &.bytouch {
  30 + background: #eee;
  31 + }
  32 + }
  33 +
  34 + span {
  35 + display: block;
  36 + width: 100%;
  37 + height: 30px;
  38 + line-height: 30px;
  39 + font-size: 80%;
  40 + }
  41 + }
  42 +
  43 + .loca {
  44 + position: fixed;
  45 + top: 88px;
  46 + }
  47 +
  48 + .content {
  49 + overflow: hidden;
  50 + position: relative;
  51 +
  52 + &.hide {
  53 + display: none;
  54 + }
  55 + }
  56 +
  57 + .living {
  58 + margin-top: 160px;
  59 + }
  60 +
  61 + .primary-level {
  62 + float: left;
  63 + box-sizing: border-box;
  64 + width: 45%;
  65 +
  66 + > li {
  67 + height: 89px;
  68 + line-height: 89px;
  69 + padding: 0 32px;
  70 + white-space: nowrap;
  71 + overflow: hidden;
  72 + text-overflow: ellipsis;
  73 + border-bottom: 1px solid #e6e6e6;
  74 +
  75 + &.focus {
  76 + background-color: #fff;
  77 + }
  78 +
  79 + &.highlight {
  80 + background-color: #eee;
  81 + }
  82 + }
  83 + }
  84 +
  85 + .trilanglefont {
  86 + font-family: "iconfont" !important;
  87 + font-size: 30px;
  88 + font-style: normal;
  89 + text-decoration: none;
  90 + -webkit-font-smoothing: antialiased;
  91 + -webkit-text-stroke-width: 0.2px;
  92 + -moz-osx-font-smoothing: grayscale;
  93 + color: #f4f4f4;
  94 + }
  95 +
  96 + .primary-level-trilangle {
  97 + float: right;
  98 + background-image: url(/product/arrow.png) no-repeat;
  99 + margin-top: 22px;
  100 + width: 20px;
  101 + height: 46px;
  102 + position: relative;
  103 + right: -32px;
  104 + }
  105 +
  106 + .sub-level-container {
  107 + float: left;
  108 + overflow-x: auto;
  109 + box-sizing: border-box;
  110 + background: #fff;
  111 + width: 55%;
  112 + height: 100%;
  113 + background: #f4f4f4;
  114 + }
  115 +
  116 + .sub-level {
  117 + width: 100%;
  118 + height: 100%;
  119 +
  120 + &.hide {
  121 + display: none;
  122 + }
  123 +
  124 + > li {
  125 + box-sizing: border-box;
  126 + height: 79px;
  127 + line-height: 79px;
  128 + border-bottom: 1px solid #e6e6e6;
  129 + padding-left: 20px;
  130 +
  131 + &.highlight {
  132 + background: #eee;
  133 + }
  134 +
  135 + &:last-child {
  136 + border-bottom: none;
  137 + }
  138 + }
  139 +
  140 + a {
  141 + display: block;
  142 + height: 100%;
  143 + width: 100%;
  144 + color: #afafaf;
  145 + }
  146 + }
147 } 147 }
1 -.blk-cate-all {  
2 - font-size: 15PX;  
3 -  
4 - .category-nav {  
5 - height: 80px;  
6 - border-bottom: 1px solid #e6e6e6;  
7 - width: 100%;  
8 - background: #fff;  
9 - z-index: 10;  
10 -  
11 - li {  
12 - display: block;  
13 - box-sizing: border-box;  
14 - float: left;  
15 - height: 100%;  
16 - padding: 20px 0;  
17 - width: 50%;  
18 - text-align: center;  
19 - color: #999;  
20 -  
21 - &:last-child {  
22 - border-right: none;  
23 - }  
24 -  
25 - &.focus {  
26 - color: #000;  
27 - }  
28 -  
29 - &.bytouch {  
30 - background: #eee;  
31 - }  
32 - }  
33 -  
34 - span {  
35 - display: block;  
36 - width: 100%;  
37 - height: 30px;  
38 - line-height: 35px;  
39 - font-size: 90%;  
40 - }  
41 - }  
42 -  
43 - .loca {  
44 - position: fixed;  
45 - top: 88px;  
46 - }  
47 -  
48 - .content {  
49 - overflow: hidden;  
50 - position: relative;  
51 -  
52 - &.hide {  
53 - display: none;  
54 - }  
55 - }  
56 -  
57 - .living {  
58 - margin-top: 160px;  
59 - }  
60 -  
61 - .primary-level {  
62 - float: left;  
63 - box-sizing: border-box;  
64 - width: 45%;  
65 -  
66 - > li {  
67 - height: 89px;  
68 - line-height: 89px;  
69 - padding: 0 32px;  
70 - white-space: nowrap;  
71 - overflow: hidden;  
72 - text-overflow: ellipsis;  
73 - border-bottom: 1px solid #e6e6e6;  
74 -  
75 - &.focus {  
76 - background-color: #fff;  
77 - }  
78 -  
79 - &.highlight {  
80 - background-color: #eee;  
81 - }  
82 - }  
83 - }  
84 -  
85 - .trilanglefont {  
86 - font-family: "iconfont" !important;  
87 - font-size: 30px;  
88 - font-style: normal;  
89 - text-decoration: none;  
90 - -webkit-font-smoothing: antialiased;  
91 - -webkit-text-stroke-width: 0.2px;  
92 - -moz-osx-font-smoothing: grayscale;  
93 - color: #f4f4f4;  
94 - }  
95 -  
96 - .primary-level-trilangle {  
97 - float: right;  
98 - background-image: url(/product/arrow.png) no-repeat;  
99 - margin-top: 22px;  
100 - width: 20px;  
101 - height: 46px;  
102 - position: relative;  
103 - right: -33px;  
104 - }  
105 -  
106 - .sub-level-container {  
107 - float: left;  
108 - overflow-x: auto;  
109 - box-sizing: border-box;  
110 - width: 55%;  
111 - height: 100%;  
112 - background: #f4f4f4;  
113 - }  
114 -  
115 - .sub-level {  
116 - width: 100%;  
117 - height: 100%;  
118 -  
119 - &.hide {  
120 - display: none;  
121 - }  
122 -  
123 - > li {  
124 - box-sizing: border-box;  
125 - height: 79px;  
126 - line-height: 79px;  
127 - border-bottom: 1px solid #e6e6e6;  
128 - padding-left: 20px;  
129 -  
130 - &.highlight {  
131 - background: #eee;  
132 - }  
133 -  
134 - &:last-child {  
135 - border-bottom: none;  
136 - }  
137 - }  
138 -  
139 - a {  
140 - display: block;  
141 - height: 100%;  
142 - width: 100%;  
143 - color: #afafaf;  
144 - }  
145 - } 1 +.blk-cate-all {
  2 + font-size: 15PX;
  3 +
  4 + .category-nav {
  5 + height: 80px;
  6 + border-bottom: 1px solid #e6e6e6;
  7 + width: 100%;
  8 + background: #fff;
  9 + z-index: 10;
  10 +
  11 + li {
  12 + display: block;
  13 + box-sizing: border-box;
  14 + float: left;
  15 + height: 100%;
  16 + padding: 20px 0;
  17 + width: 50%;
  18 + text-align: center;
  19 + color: #999;
  20 +
  21 + &:last-child {
  22 + border-right: none;
  23 + }
  24 +
  25 + &.focus {
  26 + color: #000;
  27 + }
  28 +
  29 + &.bytouch {
  30 + background: #eee;
  31 + }
  32 + }
  33 +
  34 + span {
  35 + display: block;
  36 + width: 100%;
  37 + height: 30px;
  38 + line-height: 35px;
  39 + font-size: 90%;
  40 + }
  41 + }
  42 +
  43 + .loca {
  44 + position: fixed;
  45 + top: 88px;
  46 + }
  47 +
  48 + .content {
  49 + overflow: hidden;
  50 + position: relative;
  51 +
  52 + &.hide {
  53 + display: none;
  54 + }
  55 + }
  56 +
  57 + .living {
  58 + margin-top: 160px;
  59 + }
  60 +
  61 + .primary-level {
  62 + float: left;
  63 + box-sizing: border-box;
  64 + width: 45%;
  65 +
  66 + > li {
  67 + height: 89px;
  68 + line-height: 89px;
  69 + padding: 0 32px;
  70 + white-space: nowrap;
  71 + overflow: hidden;
  72 + text-overflow: ellipsis;
  73 + border-bottom: 1px solid #e6e6e6;
  74 +
  75 + &.focus {
  76 + background-color: #fff;
  77 + }
  78 +
  79 + &.highlight {
  80 + background-color: #eee;
  81 + }
  82 + }
  83 + }
  84 +
  85 + .trilanglefont {
  86 + font-family: "iconfont" !important;
  87 + font-size: 30px;
  88 + font-style: normal;
  89 + text-decoration: none;
  90 + -webkit-font-smoothing: antialiased;
  91 + -webkit-text-stroke-width: 0.2px;
  92 + -moz-osx-font-smoothing: grayscale;
  93 + color: #f4f4f4;
  94 + }
  95 +
  96 + .primary-level-trilangle {
  97 + float: right;
  98 + background-image: url(/product/arrow.png) no-repeat;
  99 + margin-top: 22px;
  100 + width: 20px;
  101 + height: 46px;
  102 + position: relative;
  103 + right: -33px;
  104 + }
  105 +
  106 + .sub-level-container {
  107 + float: left;
  108 + overflow-x: auto;
  109 + box-sizing: border-box;
  110 + width: 55%;
  111 + height: 100%;
  112 + background: #f4f4f4;
  113 + }
  114 +
  115 + .sub-level {
  116 + width: 100%;
  117 + height: 100%;
  118 +
  119 + &.hide {
  120 + display: none;
  121 + }
  122 +
  123 + > li {
  124 + box-sizing: border-box;
  125 + height: 79px;
  126 + line-height: 79px;
  127 + border-bottom: 1px solid #e6e6e6;
  128 + padding-left: 20px;
  129 +
  130 + &.highlight {
  131 + background: #eee;
  132 + }
  133 +
  134 + &:last-child {
  135 + border-bottom: none;
  136 + }
  137 + }
  138 +
  139 + a {
  140 + display: block;
  141 + height: 100%;
  142 + width: 100%;
  143 + color: #afafaf;
  144 + }
  145 + }
146 } 146 }