Skip to content

Commit aca9962

Browse files
re-fortkazupon
authored andcommitted
Switched 4-spaces indent in ejs files to 2 spaces. (vuejs#1133) (vuejs#354)
1 parent 1e07167 commit aca9962

File tree

6 files changed

+243
-243
lines changed

6 files changed

+243
-243
lines changed

themes/vue/layout/layout.ejs

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,128 @@
11
<% var isIndex = page.path === 'index.html' %>
22
<!DOCTYPE html>
33
<html lang="ja">
4-
<head>
5-
<title><%- page.title ? page.title + ' - ' : '' %>Vue.js</title>
6-
<meta charset="utf-8">
7-
<meta name="description" content="<%- theme.site_description %>">
8-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
4+
<head>
5+
<title><%- page.title ? page.title + ' ' : '' %>Vue.js</title>
6+
<meta charset="utf-8">
7+
<meta name="description" content="<%- theme.site_description %>">
8+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
99

10-
<link rel="alternate" hreflang="x-default" href="https://vuejs.org/<%- page.path %>">
11-
<link rel="alternate" hreflang="zh" href="https://cn.vuejs.org/<%- page.path %>">
12-
<link rel="alternate" hreflang="ja" href="https://jp.vuejs.org/<%- page.path %>">
13-
<link rel="alternate" hreflang="ru" href="https://ru.vuejs.org/<%- page.path %>">
14-
<link rel="alternate" hreflang="ko" href="https://kr.vuejs.org/<%- page.path %>">
15-
<link rel="alternate" hreflang="pt-BR" href="https://br.vuejs.org/<%- page.path %>">
16-
<link rel="alternate" hreflang="fr" href="https://fr.vuejs.org/<%- page.path %>">
10+
<link rel="alternate" hreflang="x-default" href="https://vuejs.org/<%- page.path %>">
11+
<link rel="alternate" hreflang="zh" href="https://cn.vuejs.org/<%- page.path %>">
12+
<link rel="alternate" hreflang="ja" href="https://jp.vuejs.org/<%- page.path %>">
13+
<link rel="alternate" hreflang="ru" href="https://ru.vuejs.org/<%- page.path %>">
14+
<link rel="alternate" hreflang="ko" href="https://kr.vuejs.org/<%- page.path %>">
15+
<link rel="alternate" hreflang="pt-BR" href="https://br.vuejs.org/<%- page.path %>">
16+
<link rel="alternate" hreflang="fr" href="https://fr.vuejs.org/<%- page.path %>">
1717

18-
<meta property="og:type" content="article">
19-
<meta property="og:title" content="<%- page.title ? page.title + ' - ' : '' %>Vue.js">
20-
<meta property="og:description" content="<%- theme.site_description %>">
21-
<meta property="og:image" content="https://<%- theme.root_domain %>/<%- url_for("/images/logo.png") %>">
18+
<meta property="og:type" content="article">
19+
<meta property="og:title" content="<%- page.title ? page.title + ' ' : '' %>Vue.js">
20+
<meta property="og:description" content="<%- theme.site_description %>">
21+
<meta property="og:image" content="https://<%- theme.root_domain %>/<%- url_for("/images/logo.png") %>">
2222

23-
<meta name="twitter:card" content="summary">
24-
<meta name="twitter:title" content="<%- page.title ? page.title + ' - ' : '' %>Vue.js">
25-
<meta name="twitter:description" content="<%- theme.site_description %>">
26-
<meta name="twitter:image" content="https://<%- theme.root_domain %>/images/logo.png">
23+
<meta name="twitter:card" content="summary">
24+
<meta name="twitter:title" content="<%- page.title ? page.title + ' ' : '' %>Vue.js">
25+
<meta name="twitter:description" content="<%- theme.site_description %>">
26+
<meta name="twitter:image" content="https://<%- theme.root_domain %>/images/logo.png">
2727

28-
<link rel="apple-touch-icon" sizes="57x57" href="<%- url_for("/images/icons/apple-icon-57x57.png") %>">
29-
<link rel="apple-touch-icon" sizes="60x60" href="<%- url_for("/images/icons/apple-icon-60x60.png") %>">
30-
<link rel="apple-touch-icon" sizes="72x72" href="<%- url_for("/images/icons/apple-icon-72x72.png") %>">
31-
<link rel="apple-touch-icon" sizes="76x76" href="<%- url_for("/images/icons/apple-icon-76x76.png") %>">
32-
<link rel="apple-touch-icon" sizes="114x114" href="<%- url_for("/images/icons/apple-icon-114x114.png") %>">
33-
<link rel="apple-touch-icon" sizes="120x120" href="<%- url_for("/images/icons/apple-icon-120x120.png") %>">
34-
<link rel="apple-touch-icon" sizes="144x144" href="<%- url_for("/images/icons/apple-icon-144x144.png") %>">
35-
<link rel="apple-touch-icon" sizes="152x152" href="<%- url_for("/images/icons/apple-icon-152x152.png") %>">
36-
<link rel="apple-touch-icon" sizes="180x180" href="<%- url_for("/images/icons/apple-icon-180x180.png") %>">
37-
<link rel="icon" type="image/png" sizes="192x192" href="<%- url_for("/images/icons/android-icon-192x192.png") %>">
38-
<link rel="icon" type="image/png" sizes="32x32" href="<%- url_for("/images/icons/favicon-32x32.png") %>">
39-
<link rel="icon" type="image/png" sizes="96x96" href="<%- url_for("/images/icons/favicon-96x96.png") %>">
40-
<link rel="icon" type="image/png" sizes="16x16" href="<%- url_for("/images/icons/favicon-16x16.png") %>">
41-
<meta name="msapplication-TileImage" content="/images/icons/ms-icon-144x144.png">
42-
<link rel="icon" href="<%- url_for("/images/logo.png") %>" type="image/png">
28+
<link rel="apple-touch-icon" sizes="57x57" href="<%- url_for("/images/icons/apple-icon-57x57.png") %>">
29+
<link rel="apple-touch-icon" sizes="60x60" href="<%- url_for("/images/icons/apple-icon-60x60.png") %>">
30+
<link rel="apple-touch-icon" sizes="72x72" href="<%- url_for("/images/icons/apple-icon-72x72.png") %>">
31+
<link rel="apple-touch-icon" sizes="76x76" href="<%- url_for("/images/icons/apple-icon-76x76.png") %>">
32+
<link rel="apple-touch-icon" sizes="114x114" href="<%- url_for("/images/icons/apple-icon-114x114.png") %>">
33+
<link rel="apple-touch-icon" sizes="120x120" href="<%- url_for("/images/icons/apple-icon-120x120.png") %>">
34+
<link rel="apple-touch-icon" sizes="144x144" href="<%- url_for("/images/icons/apple-icon-144x144.png") %>">
35+
<link rel="apple-touch-icon" sizes="152x152" href="<%- url_for("/images/icons/apple-icon-152x152.png") %>">
36+
<link rel="apple-touch-icon" sizes="180x180" href="<%- url_for("/images/icons/apple-icon-180x180.png") %>">
37+
<link rel="icon" type="image/png" sizes="192x192" href="<%- url_for("/images/icons/android-icon-192x192.png") %>">
38+
<link rel="icon" type="image/png" sizes="32x32" href="<%- url_for("/images/icons/favicon-32x32.png") %>">
39+
<link rel="icon" type="image/png" sizes="96x96" href="<%- url_for("/images/icons/favicon-96x96.png") %>">
40+
<link rel="icon" type="image/png" sizes="16x16" href="<%- url_for("/images/icons/favicon-16x16.png") %>">
41+
<meta name="msapplication-TileImage" content="/images/icons/ms-icon-144x144.png">
42+
<link rel="icon" href="<%- url_for("/images/logo.png") %>" type="image/png">
4343

44-
<meta name="msapplication-TileColor" content="#4fc08d">
45-
<meta name="theme-color" content="#4fc08d">
44+
<meta name="msapplication-TileColor" content="#4fc08d">
45+
<meta name="theme-color" content="#4fc08d">
4646

47-
<meta name="msapplication-config" content="browserconfig.xml">
48-
<link rel="manifest" href="/manifest.json">
47+
<meta name="msapplication-config" content="browserconfig.xml">
48+
<link rel="manifest" href="/manifest.json">
4949

50-
<link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Roboto Mono' rel='stylesheet' type='text/css'>
51-
<link href='//fonts.googleapis.com/css?family=Dosis:500&text=Vue.js' rel='stylesheet' type='text/css'>
50+
<link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600|Roboto Mono' rel='stylesheet' type='text/css'>
51+
<link href='//fonts.googleapis.com/css?family=Dosis:500&text=Vue.js' rel='stylesheet' type='text/css'>
5252

53-
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
53+
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
5454

55-
<!-- main page styles -->
56-
<%- css(isIndex ? 'css/index' : 'css/page') %>
55+
<!-- main page styles -->
56+
<%- css(isIndex ? 'css/index' : 'css/page') %>
5757

58-
<!-- this needs to be loaded before guide's inline scripts -->
59-
<script src="<%- url_for("/js/vue.js") %>"></script>
60-
<script>window.PAGE_TYPE = "<%- page.type %>"</script>
58+
<!-- this needs to be loaded before guide's inline scripts -->
59+
<script src="<%- url_for("/js/vue.js") %>"></script>
60+
<script>window.PAGE_TYPE = "<%- page.type %>"</script>
6161

62-
<!-- ga -->
63-
<script>
64-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
65-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
66-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
67-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
62+
<!-- ga -->
63+
<script>
64+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
65+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
66+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
67+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
6868
69-
ga('create', '<%- theme.google_analytics %>', '<%- theme.root_domain %>');
70-
ga('send', 'pageview');
71-
</script>
72-
</head>
73-
<body class="<%- isIndex ? '' : 'docs' -%>">
74-
<div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
75-
<a class="menu-button"></a>
76-
<a class="logo" href="/"></a>
77-
</div>
78-
<%- partial('partials/header') %>
79-
<% if (!isIndex) { %>
80-
<div id="main" class="fix-sidebar">
81-
<% if (page.blog_index) { %>
82-
<%- partial('partials/blog') %>
83-
<% } else { %>
84-
<%- body %>
85-
<% } %>
86-
</div>
87-
<script src="<%- url_for("/js/smooth-scroll.min.js") %>"></script>
69+
ga('create', '<%- theme.google_analytics %>', '<%- theme.root_domain %>');
70+
ga('send', 'pageview');
71+
</script>
72+
</head>
73+
<body class="<%- isIndex ? '' : 'docs' -%>">
74+
<div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
75+
<a class="menu-button"></a>
76+
<a class="logo" href="/"></a>
77+
</div>
78+
<%- partial('partials/header') %>
79+
<% if (!isIndex) { %>
80+
<div id="main" class="fix-sidebar">
81+
<% if (page.blog_index) { %>
82+
<%- partial('partials/blog') %>
8883
<% } else { %>
89-
<%- body %>
84+
<%- body %>
9085
<% } %>
86+
</div>
87+
<script src="<%- url_for("/js/smooth-scroll.min.js") %>"></script>
88+
<% } else { %>
89+
<%- body %>
90+
<% } %>
9191

92-
<!-- main custom script for sidebars, version selects etc. -->
93-
<script src="<%- url_for("/js/css.escape.js") %>"></script>
94-
<script src="<%- url_for("/js/common.js") %>"></script>
92+
<!-- main custom script for sidebars, version selects etc. -->
93+
<script src="<%- url_for("/js/css.escape.js") %>"></script>
94+
<script src="<%- url_for("/js/common.js") %>"></script>
9595

96-
<!-- search -->
97-
<link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
98-
<%- css('css/search') %>
99-
<script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
100-
<script>
101-
[
102-
'#search-query-nav',
103-
'#search-query-sidebar',
104-
'#search-query-menu'
105-
].forEach(function (selector) {
106-
if (!document.querySelector(selector)) return
107-
// search index defaults to v2
108-
var match = window.location.pathname.match(/^\/(v\d+)/)
109-
var version = match ? match[1] : 'v2'
110-
docsearch({
111-
appId: 'BH4D9OD16A',
112-
apiKey: '0a75952972806d9ad07e387d08e9cc4c',
113-
indexName: 'vuejs_jp',
114-
inputSelector: selector,
115-
algoliaOptions: { facetFilters: ["version:" + version] }
116-
})
117-
})
118-
</script>
96+
<!-- search -->
97+
<link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
98+
<%- css('css/search') %>
99+
<script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
100+
<script>
101+
[
102+
'#search-query-nav',
103+
'#search-query-sidebar',
104+
'#search-query-menu'
105+
].forEach(function (selector) {
106+
if (!document.querySelector(selector)) return
107+
// search index defaults to v2
108+
var match = window.location.pathname.match(/^\/(v\d+)/)
109+
var version = match ? match[1] : 'v2'
110+
docsearch({
111+
appId: 'BH4D9OD16A',
112+
apiKey: '0a75952972806d9ad07e387d08e9cc4c',
113+
indexName: 'vuejs_jp',
114+
inputSelector: selector,
115+
algoliaOptions: { facetFilters: ["version:" + version] }
116+
})
117+
})
118+
</script>
119119

120-
<!-- fastclick -->
121-
<script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
122-
<script>
123-
document.addEventListener('DOMContentLoaded', function() {
124-
FastClick.attach(document.body);
125-
}, false);
126-
</script>
127-
</body>
120+
<!-- fastclick -->
121+
<script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
122+
<script>
123+
document.addEventListener('DOMContentLoaded', function() {
124+
FastClick.attach(document.body)
125+
}, false)
126+
</script>
127+
</body>
128128
</html>

themes/vue/layout/page.ejs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<% if (page.type) { %>
2-
<%- partial('partials/sidebar', { type: page.type === 'menu' ? 'guide' : page.type, index: page.index }) %>
2+
<%- partial('partials/sidebar', { type: page.type === 'menu' ? 'guide' : page.type, index: page.index }) %>
33
<% } else { %>
44
<div class="sidebar">
55
<ul class="main-menu">
@@ -8,38 +8,38 @@
88
</div>
99
<% } %>
1010
<div class="content <%- page.type ? page.type + ' with-sidebar' : '' %> <%- page.type === 'guide' ? page.path.replace(/.+\//, '').replace('.html', '') + '-guide' : '' %>">
11-
<% if (page.type) { %>
12-
<% if (page.type === 'menu') { %>
13-
<form id="search-form">
14-
<input type="text" id="search-query-menu" class="search-query st-default-search-input">
15-
</form>
16-
<%- partial('partials/toc', { type: 'guide' }) %>
17-
<% } else { %>
18-
<%- partial('partials/ad') %>
19-
<% } %>
11+
<% if (page.type) { %>
12+
<% if (page.type === 'menu') { %>
13+
<form id="search-form">
14+
<input type="text" id="search-query-menu" class="search-query st-default-search-input">
15+
</form>
16+
<%- partial('partials/toc', { type: 'guide' }) %>
17+
<% } else { %>
18+
<%- partial('partials/ad') %>
2019
<% } %>
21-
<% if (page.title.trim()) { %>
22-
<h1><%- page.title %><%- page.type === 'examples' ? ' の例' : '' %></h1>
23-
<% } %>
24-
<p class="updated">最終更新日: <%- date(page.updated, 'YYYY年M月D日') %></p>
25-
<% if (page.type === 'contribution') { %>
26-
<%- partial('partials/contribution') %>
27-
<% } %>
28-
<%- page.content %>
29-
<% if (page.type === 'guide') { %>
30-
<div class="guide-links">
31-
<% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %>
32-
<span><a href="<%- url_for(page.path) %>"><%- page.title %></a></span>
33-
<% }) %>
34-
<% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %>
35-
<span style="float: right;"><a href="<%- url_for(page.path) %>"><%- page.title %></a></span>
36-
<% }) %>
37-
</div>
38-
<% } %>
39-
<div class="footer">
40-
<%- partial('partials/ad-text') %>
41-
間違いを見つけた、またはドキュメントに貢献したいですか?
42-
<a href="https://github.com/vuejs/jp.vuejs.org/blob/lang-ja/src/<%- page.path.replace(/\.html$/, '.md') %>" target="_blank">Github 上でこのページを編集する</a> か、<a href="https://github.com/vuejs/jp.vuejs.org" target="_blank">Github からこのサイトを Fork してプルリクエストしましょう
43-
</a>!
20+
<% } %>
21+
<% if (page.title.trim()) { %>
22+
<h1><%- page.title %><%- page.type === 'examples' ? ' の例' : '' %></h1>
23+
<% } %>
24+
<p class="updated">最終更新日: <%- date(page.updated, 'YYYY年M月D日') %></p>
25+
<% if (page.type === 'contribution') { %>
26+
<%- partial('partials/contribution') %>
27+
<% } %>
28+
<%- page.content %>
29+
<% if (page.type === 'guide') { %>
30+
<div class="guide-links">
31+
<% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %>
32+
<span><a href="<%- url_for(page.path) %>"><%- page.title %></a></span>
33+
<% }) %>
34+
<% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %>
35+
<span style="float: right;"><a href="<%- url_for(page.path) %>"><%- page.title %></a></span>
36+
<% }) %>
4437
</div>
38+
<% } %>
39+
<div class="footer">
40+
<%- partial('partials/ad-text') %>
41+
間違いを見つけた、またはドキュメントに貢献したいですか?
42+
<a href="https://github.com/vuejs/jp.vuejs.org/blob/lang-ja/src/<%- page.path.replace(/\.html$/, '.md') %>" target="_blank">Github 上でこのページを編集する</a> か、<a href="https://github.com/vuejs/jp.vuejs.org" target="_blank">Github からこのサイトを Fork してプルリクエストしましょう
43+
</a>!
44+
</div>
4545
</div>
Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
<div class="sidebar">
2-
<div class="sidebar-inner">
3-
<ul class="main-menu">
4-
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
5-
</ul>
6-
<div class="list">
7-
<div class="main-sponsor">
8-
<span>Platinum Sponsor</span><br>
9-
<a href="https://stdlib.com" target="_blank" class="logo">
10-
<img src="<%- url_for("/images/stdlib.png") %>">
11-
</a>
12-
</div>
13-
<a class="become-backer" href="<%- url_for("/support-vuejs") %>">
14-
Become a Sponsor
15-
</a>
16-
<h2>
17-
<% if (type === 'guide') { %>
18-
ガイド
19-
<% } else if (type === 'api') { %>
20-
API
21-
<% } else if (type === 'examples') { %>
22-
23-
<% } %>
24-
<% if (type !== 'cookbook') { %>
25-
<select class="version-select">
26-
<option value="SELF" selected>2.x</option>
27-
<option value="v1">1.0</option>
28-
<option value="012">0.12</option>
29-
</select>
30-
<% } %>
31-
</h2>
32-
<%- partial('partials/toc', { type: type }) %>
33-
</div>
2+
<div class="sidebar-inner">
3+
<ul class="main-menu">
4+
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
5+
</ul>
6+
<div class="list">
7+
<div class="main-sponsor">
8+
<span>プラチナスポンサー</span><br>
9+
<a href="https://stdlib.com" target="_blank" class="logo">
10+
<img src="<%- url_for("/images/stdlib.png") %>">
11+
</a>
12+
</div>
13+
<a class="become-backer" href="<%- url_for("/support-vuejs") %>">
14+
スポンサーになる
15+
</a>
16+
<h2>
17+
<% if (type === 'guide') { %>
18+
ガイド
19+
<% } else if (type === 'api') { %>
20+
API
21+
<% } else if (type === 'examples') { %>
22+
23+
<% } %>
24+
<% if (type !== 'cookbook') { %>
25+
<select class="version-select">
26+
<option value="SELF" selected>2.x</option>
27+
<option value="v1">1.0</option>
28+
<option value="012">0.12</option>
29+
</select>
30+
<% } %>
31+
</h2>
32+
<%- partial('partials/toc', { type: type }) %>
3433
</div>
34+
</div>
3535
</div>

themes/vue/layout/partials/sponsors.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<a href="https://www.xfive.co/" target="_blank" style="width: 65px;">
4545
<img src="<%- url_for("/images/xfive.png") %>" style="width: 65px;">
4646
</a>
47-
<a href="http://www.frontenddevelopermeetups.com/" target="_blank" style="width:100px;">
48-
<img src="<%- url_for("/images/frontend-meetups.png") %>" style="width:100px">
47+
<a href="http://www.frontenddevelopermeetups.com/" target="_blank" style="width: 100px;">
48+
<img src="<%- url_for("/images/frontend-meetups.png") %>" style="width: 100px">
4949
</a>
5050
<br>
5151

0 commit comments

Comments
 (0)