fe / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit 5c1fcc022884829467042f3c47c9ea327f77e3ce 2 parents a737d5fe c290d62e

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 2 changed files with 12 additions and 8 deletions
... ... @@ -10,28 +10,28 @@
<meta name="description" content="{{description}}">
<title>{{title}}</title>
{{#if rlsEnv}}
<!-- [if (gte IE 6)&(lte IE 8)>
<link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">
<!--[if lt IE 9]>
<script src="http://cdn.yoho.cn/yohobuy/respond.min.js"></script>
<![endif]-->
<link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">
{{/if}}
{{#if preEnv}}
<!-- [if (gte IE 6)&(lte IE 8)>
<link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">
<!--[if lt IE 9]>
<script src="http://cdn.yoho.cn/yohobuy/respond.min.js"></script>
<![endif]-->
<link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">
{{/if}}
{{#if testEnv}}
<!-- [if (gte IE 6)&(lte IE 8)>
<link rel="stylesheet" href="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index.css">
<!--[if lt IE 9]>
<script src="http://static.buy.test.yoho.cn/dist/yohobuy/respond.min.js"></script>
<![endif]-->
<link rel="stylesheet" href="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index.css">
{{/if}}
{{#if devEnv}}
<!-- [if (gte IE 6)&(lte IE 8)>
<link rel="stylesheet" href="http://webstatic.dev.yohobuy.com/css/index.css">
<!--[if lt IE 9]>
<script src="http://webstatic.dev.yohobuy.com/plugin/page-use/respond.min.js"></script>
<![endif]-->
<link rel="stylesheet" href="http://webstatic.dev.yohobuy.com/css/index.css">
{{/if}}
</head>
<body>
... ...
... ... @@ -20,6 +20,10 @@
.attr-content {
margin-left: 90px;
.default {
padding-right: 140px;
}
}
.multi-select {
... ...