Commit 9c5c6f0b authored by 神楽坂玲奈's avatar 神楽坂玲奈

google+

parent 0b71d16d
......@@ -141,8 +141,14 @@ class Deck extends Spine.Controller
@set_history()
).disableSelection();
if $('.operate_area').hasClass('text')
#文字版
@el.jscroll({W: "12px", Btn:
{btn: false}})
else
window.main_count = if main_count > 40 then main_count else 'auto'
window.side_count = if side_count > 10 then side_count else 'auto'
window.extra_count = if extra_count > 10 then extra_count else 'auto'
location: ->
"/decks/?name=#{@deck_name}&cards=#{@encode()}"
url: ->
......
......@@ -397,6 +397,10 @@
btn: false
}
});
} else {
window.main_count = main_count > 40 ? main_count : 'auto';
window.side_count = side_count > 10 ? side_count : 'auto';
return window.extra_count = extra_count > 10 ? extra_count : 'auto';
}
};
......
......@@ -86,8 +86,8 @@
<span class="deck_category_count ${$index}">${$value}</span>{{/each}})
</small>
</legend>
<div class="deck_part main"
{{if $('.operate_area').hasClass('graphic')}} style="width:${main_count}px"{{/if}}>
<div class="deck_part main">
{{tmpl(main) '#card_usage_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template'}}
</div>
</fieldset>
......@@ -95,8 +95,8 @@
<legend id="deck_side_title" class="deck_title main">副卡组
<small>(${side_count})</small>
</legend>
<div class="deck_part side"
{{if $('.operate_area').hasClass('graphic')}} style="width:${main_count}px"{{/if}}>
<div class="deck_part side">
{{tmpl(side) '#card_usage_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template'}}
</div>
</fieldset>
......@@ -104,8 +104,8 @@
<legend id="deck_extra_title" class="deck_title main">额外卡组
<small>(${extra_count})</small>
</legend>
<div class="deck_part extra"
{{if $('.operate_area').hasClass('graphic')}} style="width:${extra_extra}px"{{/if}}>
<div class="deck_part extra">
{{tmpl(extra) '#card_usage_' + ($('.operate_area').hasClass('text') ? 'text' : 'graphic') + '_template'}}
</div>
</fieldset>
......@@ -431,7 +431,9 @@
</div>
<div class="select_cardUnder">
<div class="donwload_out" title="上传">
<input id="deck_load" class="upload_inner" type="file"/>
<div class="upload_inner" >
<input id="deck_load" type="file" tabindex="-1"/>
</div>
</div>
<div class="donwload_out" title="分享" id="deck_share">
<div class="download_inner"></div>
......
......@@ -85,6 +85,7 @@
<div id="footer1">
<h2>其他服务</h2>
<a href="mailto:zh99998@gmail.com">联系作者</a>
<a href="https://plus.google.com/107594261950300262383" rel="publisher">更新记录(Google+)</a>
</div>
<div id="footer2">
<h2>合作伙伴</h2>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment