Authored by chenchao

Merge branch 'master' into dev6.0_免邮券

@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 </select> 152 </select>
153 <div style="position: relative"> 153 <div style="position: relative">
154 <div class="copy-link"> 154 <div class="copy-link">
155 - <span style="width:40px;height:40px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span> 155 + <span style="width:40px;height:30px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span>
156 </div> 156 </div>
157 <input type="text" style="padding-left:40px" class="form-control input-resource" value='[[data.resource]]'> 157 <input type="text" style="padding-left:40px" class="form-control input-resource" value='[[data.resource]]'>
158 </div> 158 </div>
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 </select> 152 </select>
153 <div style="position: relative"> 153 <div style="position: relative">
154 <div class="copy-link"> 154 <div class="copy-link">
155 - <span style="width:40px;height:40px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span> 155 + <span style="width:40px;height:30px;" class="glyphicon glyphicon-copyright-mark info-copy" data-index="[[index]]" data-clipboard-text='[[data.resource]]' title="复制文本内容"></span>
156 </div> 156 </div>
157 <input type="text" style="padding-left:40px" class="form-control input-resource" value='[[data.resource]]'> 157 <input type="text" style="padding-left:40px" class="form-control input-resource" value='[[data.resource]]'>
158 </div> 158 </div>