Skip to content

Commit 03a30b9

Browse files
author
Liu Jie
authored
Merge pull request #5 from Yeskn/dev
 delete vendor js files
2 parents 0e8c879 + db63f5e commit 03a30b9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+52
-11821
lines changed

‎.bowerrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"directory" : "web/lib/"
2+
"directory" : "web/lib/",
3+
"registry": "https://registry.bower.io"
34
}

‎src/Yeskn/WebBundle/Resources/views/base.html.twig‎

Lines changed: 14 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
'lib/font-awesome/css/font-awesome.min.css'
3030
'lib/wangEditor/dist/css/wangEditor.min.css'
3131
'lib/nprogress/nprogress.css'
32-
'lib-man/bootoast/css/bootoast.css'
33-
'lib-man/live2d/css/live2d.css'
34-
'lib-man/who/jquery.atwho.min.css'
3532
'css/common.css'
3633
filter='cssrewrite' %}
3734
<link rel="stylesheet" href="{{ asset_url }}"/>
35+
36+
<link rel="stylesheet" href="https://static.yeskn.com/live2d/css/live2d.css">
37+
<link rel="stylesheet" href="https://static.yeskn.com/jquery-atwho/jquery.atwho.min.css">
38+
<link rel="stylesheet" href="https://static.yeskn.com/bootoast/css/bootoast.css">
3839
{% endstylesheets %}
3940
{% endblock %}
4041

@@ -44,6 +45,7 @@
4445
filter='uglifyjs2' %}
4546
<script src="{{ asset_url }}"></script>
4647
{% endjavascripts %}
48+
4749
<!--[if lt IE 9]>
4850
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
4951
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
@@ -130,44 +132,9 @@
130132

131133
{% if app.request.get('_pjax') is empty %}
132134
{% block footer %}
133-
<footer>
134-
<div class="container">
135-
<div class="brand">
136-
<b><a data-pjax href="{{ path('about') }}">{{ 'about.vmoex'|trans }}</a></b>
137-
<span class="snow">·</span>
138-
<b><a data-pjax href="{{ path('yeskn_web_default_contribute') }}">{{ '支持我们'|trans }}</a></b>
139-
<span class="snow">·</span>
140-
<b><a data-pjax href="{{ path('buy_beer') }}">{{ 'buy_beer'|trans }} ｡◕‿◕｡</a></b>
141-
</div>
142-
143-
<br>
144-
145-
<div class="language-box">
146-
<span style="display: inline-block;margin-right: 10px">{{ 'vmoex_available_with'|trans }}</span>
147-
148-
<img class="footer-flag" src="{{ asset('img/flags/zh_CN.png') }}" alt="zh_CN">
149-
<a data-pjax href="javascript:" class="set-locale-link" data-locale="zh_CN">{{ 'chinese'|trans }}</a>
150-
<span class="snow">·</span>
151-
<img class="footer-flag" src="{{ asset('img/flags/en.png') }}" alt="en">
152-
<a href="javascript:" class="set-locale-link" data-locale="en">{{ 'english'|trans }}</a>
153-
<span class="snow">·</span>
154-
<img class="footer-flag" src="{{ asset('img/flags/zh_TW.png') }}" alt="zh_TW">
155-
<a href="javascript:" class="set-locale-link" data-locale="zh_TW">{{ 'chinese.tw'|trans }}</a>
156-
<span class="snow">·</span>
157-
<img class="footer-flag" src="{{ asset('img/flags/jp.png') }}" alt="jp">
158-
<a href="javascript:" class="set-locale-link" data-locale="jp">{{ 'japanese'|trans }}</a>
159-
</div>
160-
161-
{% set siteState = siteState() %}
162-
<p style="margin: 20px 5px">{{ '当前在线count人'|trans({count:siteState.onlineUserCount}) }}，{{ '历史最高'|trans }} 393</p>
163-
<p class="copy">© 2018 Vmoex - {{ 'vmoex_slogan'|trans }}</p>
164-
<p class="power">Designed with <span>❤</span> 彩虹の恋しい at Shanghai, China</p>
165-
</div>
166-
</footer>
135+
{% include '@YesknWeb/footer.html.twig' %}
167136
{% endblock %}
168137

169-
{% include '@YesknWeb/landlord.html.twig' %}
170-
171138
{% block foot_js_link %}
172139
<script type="text/javascript">
173140
$(function () {
@@ -179,23 +146,22 @@
179146
'lib/bootstrap/dist/js/bootstrap.min.js'
180147
'lib/nprogress/nprogress.js'
181148
'lib/jquery-pjax/jquery.pjax.js'
182-
'lib-man/weditor/editor.js'
183-
'lib-man/bootoast/js/bootoast.js'
184-
'lib-man/who/jquery.atwho.min.js'
185-
'lib-man/live2d/js/live2d.js'
186-
'lib-man/live2d/js/message.js'
187149
'assets-private/js/functions.js'
188150
'assets-private/js/event.js'
189151
'assets-private/js/socket.js'
190152
'assets-private/js/pjax.js'
191153
'assets-private/js/common.js'
192154
filter='uglifyjs2' %}
193-
<script src="{{ asset_url }}"></script>
194-
195-
<script src="https://cdn.bootcss.com/socket.io/1.3.7/socket.io.min.js"></script>
155+
<script src="{{ asset_url }}"></script>
156+
<script src="https://static.yeskn.com/weditor/editor.js"></script>
157+
<script src="https://static.yeskn.com/live2d/js/live2d.js"></script>
158+
<script src="https://static.yeskn.com/live2d/js/message.js"></script>
159+
<script src="https://static.yeskn.com/bootoast/js/bootoast.js"></script>
160+
<script src="https://static.yeskn.com/jquery-atwho/jquery.atwho.min.js"></script>
161+
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
162+
<script src="https://cdn.bootcss.com/socket.io/1.3.7/socket.io.min.js"></script>
196163
{% endjavascripts %}
197164
{% endblock %}
198165
{% endif %}
199-
<!-- Page rendered on {{ 'now'|localizeddate('long', 'long', null, 'UTC') }} -->
200166
</body>
201167
</html>

‎src/Yeskn/WebBundle/Resources/views/footer.html.twig‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<footer>
2+
<div class="container">
3+
<div class="brand">
4+
<b><a data-pjax href="{{ path('about') }}">{{ 'about.vmoex'|trans }}</a></b>
5+
<span class="snow">·</span>
6+
<b><a data-pjax href="{{ path('yeskn_web_default_contribute') }}">{{ '支持我们'|trans }}</a></b>
7+
<span class="snow">·</span>
8+
<b><a data-pjax href="{{ path('buy_beer') }}">{{ 'buy_beer'|trans }} ｡◕‿◕｡</a></b>
9+
</div>
10+
11+
<br>
12+
13+
<div class="language-box">
14+
<span style="display: inline-block;margin-right: 10px">{{ 'vmoex_available_with'|trans }}</span>
15+
16+
<img class="footer-flag" src="{{ asset('img/flags/zh_CN.png') }}" alt="zh_CN">
17+
<a data-pjax href="javascript:" class="set-locale-link" data-locale="zh_CN">{{ 'chinese'|trans }}</a>
18+
<span class="snow">·</span>
19+
<img class="footer-flag" src="{{ asset('img/flags/en.png') }}" alt="en">
20+
<a href="javascript:" class="set-locale-link" data-locale="en">{{ 'english'|trans }}</a>
21+
<span class="snow">·</span>
22+
<img class="footer-flag" src="{{ asset('img/flags/zh_TW.png') }}" alt="zh_TW">
23+
<a href="javascript:" class="set-locale-link" data-locale="zh_TW">{{ 'chinese.tw'|trans }}</a>
24+
<span class="snow">·</span>
25+
<img class="footer-flag" src="{{ asset('img/flags/jp.png') }}" alt="jp">
26+
<a href="javascript:" class="set-locale-link" data-locale="jp">{{ 'japanese'|trans }}</a>
27+
</div>
28+
29+
{% set siteState = siteState() %}
30+
<p style="margin: 20px 5px">{{ '当前在线count人'|trans({count:siteState.onlineUserCount}) }}，{{ '历史最高'|trans }} 393</p>
31+
<p class="copy">© 2018 Vmoex - {{ 'vmoex_slogan'|trans }}</p>
32+
<p class="power">Designed with <span>❤</span> 彩虹の恋しい at Shanghai, China</p>
33+
</div>
34+
</footer>
35+
36+
{% include '@YesknWeb/landlord.html.twig' %}

‎web/lib-man/bootoast/css/bootoast.css‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)