fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit ddf03d33cae01e92079e622d8b7325d5f3522e87 2 parents bb0acd6d 9e42dde9

Merge branch 'develop/wap' into beta/wap 

Conflicts:
	static/dist/myohobuy/1.3.8/index.css
	static/dist/myohobuy/1.3.8/lib.js
Inline Side-by-side
Showing 4 changed files with 2 additions and 2 deletions
This diff could not be displayed because it is too large.
@@ -38,12 +38,12 @@ @@ -38,12 +38,12 @@
38 text-align: center; 38 text-align: center;
39 font-size: 22px; 39 font-size: 22px;
40 color: #fff; 40 color: #fff;
41 - background: resolve("../img/me/employ/rank.png") no-repeat; 41 + background: resolve("me/employ/rank.png") no-repeat;
42 background-position: center top; 42 background-position: center top;
43 background-size: auto 100%; 43 background-size: auto 100%;
44 44
45 &.top { 45 &.top {
46 - background: resolve("../img/me/employ/rank-t.png") no-repeat; 46 + background: resolve("me/employ/rank-t.png") no-repeat;
47 background-position: center top; 47 background-position: center top;
48 background-size: 100%; 48 background-size: 100%;
49 line-height: 54px; 49 line-height: 54px;