Showing
20 changed files
with
61 additions
and
8 deletions
public/font/brownstd/BrownStd-Bold.eot
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Bold.svg
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Bold.ttf
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Bold.woff
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Italic.eot
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Italic.svg
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Italic.ttf
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Italic.woff
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Light.eot
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Light.svg
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Light.ttf
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Light.woff
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Regular.eot
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Regular.svg
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Regular.ttf
0 → 100644
No preview for this file type
public/font/brownstd/BrownStd-Regular.woff
0 → 100644
No preview for this file type
@@ -17,7 +17,7 @@ html, | @@ -17,7 +17,7 @@ html, | ||
17 | body { | 17 | body { |
18 | width: 100%; | 18 | width: 100%; |
19 | font-size: 24px; | 19 | font-size: 24px; |
20 | - font-family: Helvetica, Roboto, "Heiti SC", "黑体", Arial; | 20 | + font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial; |
21 | line-height: 1.4; | 21 | line-height: 1.4; |
22 | } | 22 | } |
23 | 23 |
public/scss/common/_font.css
0 → 100644
1 | +/* BrownStd standard */ | ||
2 | +@font-face { | ||
3 | + font-family: "BrownStd"; | ||
4 | + src: resolve("brownstd/BrownStd-Regular.eot"); /* IE9 */ | ||
5 | + src: resolve("brownstd/BrownStd-Regular.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Regular.woff") format("woff"), resolve("brownstd/BrownStd-Regular.ttf") format("truetype"), resolve("brownstd/BrownStd-Regular.svg#iconfont") format("svg"); /* iOS 4.1- */ | ||
6 | +} | ||
7 | + | ||
8 | +/* BrownStd-Bold */ | ||
9 | +@font-face { | ||
10 | + font-family: "BrownStd-Bold"; | ||
11 | + src: resolve("brownstd/BrownStd-Bold.eot"); /* IE9 */ | ||
12 | + src: resolve("brownstd/BrownStd-Bold.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Bold.woff") format("woff"), resolve("brownstd/BrownStd-Bold.ttf") format("truetype"), resolve("brownstd/BrownStd-Bold.svg#iconfont") format("svg"); /* iOS 4.1- */ | ||
13 | +} | ||
14 | + | ||
15 | +.brown-bold { | ||
16 | + font-family: "BrownStd-Bold" !important; | ||
17 | +} | ||
18 | + | ||
19 | +/* BrownStd-Italic */ | ||
20 | +@font-face { | ||
21 | + font-family: "BrownStd-Italic"; | ||
22 | + src: resolve("brownstd/BrownStd-Italic.eot"); /* IE9 */ | ||
23 | + src: resolve("brownstd/BrownStd-Italic.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Italic.woff") format("woff"), resolve("brownstd/BrownStd-Italic.ttf") format("truetype"), resolve("brownstd/BrownStd-Italic.svg#iconfont") format("svg"); /* iOS 4.1- */ | ||
24 | +} | ||
25 | + | ||
26 | +.brown-italic { | ||
27 | + font-family: "BrownStd-Italic" !important; | ||
28 | +} | ||
29 | + | ||
30 | +/* BrownStd-Light */ | ||
31 | +@font-face { | ||
32 | + font-family: "BrownStd-Light"; | ||
33 | + src: resolve("brownstd/BrownStd-Light.eot"); /* IE9 */ | ||
34 | + src: resolve("brownstd/BrownStd-Light.eot?#iefix") format("embedded-opentype"), resolve("brownstd/BrownStd-Light.woff") format("woff"), resolve("brownstd/BrownStd-Light.ttf") format("truetype"), resolve("brownstd/BrownStd-Light.svg#iconfont") format("svg"); /* iOS 4.1- */ | ||
35 | +} | ||
36 | + | ||
37 | +.brown-light { | ||
38 | + font-family: "BrownStd-Light" !important; | ||
39 | +} |
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | </div> | 7 | </div> |
8 | </template> | 8 | </template> |
9 | <a class="item ellipsis" href="{{item.sortUrl}}"> | 9 | <a class="item ellipsis" href="{{item.sortUrl}}"> |
10 | - {{item.sortNameEn}}{{item.sortName}} | 10 | + {{(item.sortNameEn || '').trim()}}{{item.sortName}} |
11 | </a> | 11 | </a> |
12 | </template> | 12 | </template> |
13 | </div> | 13 | </div> |
@@ -63,10 +63,17 @@ | @@ -63,10 +63,17 @@ | ||
63 | position: relative; | 63 | position: relative; |
64 | display: block; | 64 | display: block; |
65 | padding: 0 30px; | 65 | padding: 0 30px; |
66 | - height: 126px; | ||
67 | - line-height: 126px; | ||
68 | - font-size: 30px; | 66 | + height: 124px; |
67 | + line-height: 124px; | ||
68 | + font-size: 36px; | ||
69 | font-weight: bold; | 69 | font-weight: bold; |
70 | + font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial; | ||
71 | + | ||
72 | + &:first-child { | ||
73 | + height: 142px; | ||
74 | + line-height: 142px; | ||
75 | + font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial; | ||
76 | + } | ||
70 | 77 | ||
71 | &:after { | 78 | &:after { |
72 | content: ""; | 79 | content: ""; |
@@ -84,11 +91,17 @@ | @@ -84,11 +91,17 @@ | ||
84 | } | 91 | } |
85 | 92 | ||
86 | .sep { | 93 | .sep { |
94 | + margin-top: -1px; | ||
87 | width: 100%; | 95 | width: 100%; |
88 | - height: 22px; | 96 | + height: 20px; |
89 | background: #f6f6f6; | 97 | background: #f6f6f6; |
90 | - border-top: 2PX solid #eee; | ||
91 | - border-bottom: 2PX solid #eee; | 98 | + border-top: 1px solid #eee; |
99 | + border-bottom: 1px solid #eee; | ||
100 | + | ||
101 | + & + .item { | ||
102 | + height: 142px; | ||
103 | + line-height: 142px; | ||
104 | + } | ||
92 | } | 105 | } |
93 | } | 106 | } |
94 | 107 |
-
Please register or login to post a comment