Skip to content

Switched 4-spaces indent in ejs files to 2 spaces. #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 17, 2017
Merged

Switched 4-spaces indent in ejs files to 2 spaces. #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcf80bf
Formatted all inline styles.
Jinjiang Sep 14, 2017
a11ea19
Switched all ejs files from 4 spaces to 2 spaces.
Jinjiang Sep 14, 2017
dd0ec68
Merge branch 'master' into patch-3
Jinjiang Sep 15, 2017
15431c2
Fixed 4-spaces in page.ejs
Jinjiang Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 107 additions & 107 deletions themes/vue/layout/layout.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,128 +1,128 @@
<% var isIndex = page.path === 'index.html' %>
<!DOCTYPE html>
<html lang="en">
<head>
<title><%- page.title ? page.title + ' — ' : '' %>Vue.js</title>
<meta charset="utf-8">
<meta name="description" content="<%- theme.site_description %>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<head>
<title><%- page.title ? page.title + ' — ' : '' %>Vue.js</title>
<meta charset="utf-8">
<meta name="description" content="<%- theme.site_description %>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

<link rel="alternate" hreflang="x-default" href="https://vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="zh" href="https://cn.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="ja" href="https://jp.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="ru" href="https://ru.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="ko" href="https://kr.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="pt-BR" href="https://br.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="fr" href="https://fr.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="x-default" href="https://vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="zh" href="https://cn.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="ja" href="https://jp.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="ru" href="https://ru.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="ko" href="https://kr.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="pt-BR" href="https://br.vuejs.org/<%- page.path %>">
<link rel="alternate" hreflang="fr" href="https://fr.vuejs.org/<%- page.path %>">

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

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

<link rel="apple-touch-icon" sizes="57x57" href="<%- url_for("/images/icons/apple-icon-57x57.png") %>">
<link rel="apple-touch-icon" sizes="60x60" href="<%- url_for("/images/icons/apple-icon-60x60.png") %>">
<link rel="apple-touch-icon" sizes="72x72" href="<%- url_for("/images/icons/apple-icon-72x72.png") %>">
<link rel="apple-touch-icon" sizes="76x76" href="<%- url_for("/images/icons/apple-icon-76x76.png") %>">
<link rel="apple-touch-icon" sizes="114x114" href="<%- url_for("/images/icons/apple-icon-114x114.png") %>">
<link rel="apple-touch-icon" sizes="120x120" href="<%- url_for("/images/icons/apple-icon-120x120.png") %>">
<link rel="apple-touch-icon" sizes="144x144" href="<%- url_for("/images/icons/apple-icon-144x144.png") %>">
<link rel="apple-touch-icon" sizes="152x152" href="<%- url_for("/images/icons/apple-icon-152x152.png") %>">
<link rel="apple-touch-icon" sizes="180x180" href="<%- url_for("/images/icons/apple-icon-180x180.png") %>">
<link rel="icon" type="image/png" sizes="192x192" href="<%- url_for("/images/icons/android-icon-192x192.png") %>">
<link rel="icon" type="image/png" sizes="32x32" href="<%- url_for("/images/icons/favicon-32x32.png") %>">
<link rel="icon" type="image/png" sizes="96x96" href="<%- url_for("/images/icons/favicon-96x96.png") %>">
<link rel="icon" type="image/png" sizes="16x16" href="<%- url_for("/images/icons/favicon-16x16.png") %>">
<meta name="msapplication-TileImage" content="/images/icons/ms-icon-144x144.png">
<link rel="icon" href="<%- url_for("/images/logo.png") %>" type="image/png">
<link rel="apple-touch-icon" sizes="57x57" href="<%- url_for("/images/icons/apple-icon-57x57.png") %>">
<link rel="apple-touch-icon" sizes="60x60" href="<%- url_for("/images/icons/apple-icon-60x60.png") %>">
<link rel="apple-touch-icon" sizes="72x72" href="<%- url_for("/images/icons/apple-icon-72x72.png") %>">
<link rel="apple-touch-icon" sizes="76x76" href="<%- url_for("/images/icons/apple-icon-76x76.png") %>">
<link rel="apple-touch-icon" sizes="114x114" href="<%- url_for("/images/icons/apple-icon-114x114.png") %>">
<link rel="apple-touch-icon" sizes="120x120" href="<%- url_for("/images/icons/apple-icon-120x120.png") %>">
<link rel="apple-touch-icon" sizes="144x144" href="<%- url_for("/images/icons/apple-icon-144x144.png") %>">
<link rel="apple-touch-icon" sizes="152x152" href="<%- url_for("/images/icons/apple-icon-152x152.png") %>">
<link rel="apple-touch-icon" sizes="180x180" href="<%- url_for("/images/icons/apple-icon-180x180.png") %>">
<link rel="icon" type="image/png" sizes="192x192" href="<%- url_for("/images/icons/android-icon-192x192.png") %>">
<link rel="icon" type="image/png" sizes="32x32" href="<%- url_for("/images/icons/favicon-32x32.png") %>">
<link rel="icon" type="image/png" sizes="96x96" href="<%- url_for("/images/icons/favicon-96x96.png") %>">
<link rel="icon" type="image/png" sizes="16x16" href="<%- url_for("/images/icons/favicon-16x16.png") %>">
<meta name="msapplication-TileImage" content="/images/icons/ms-icon-144x144.png">
<link rel="icon" href="<%- url_for("/images/logo.png") %>" type="image/png">

<meta name="msapplication-TileColor" content="#4fc08d">
<meta name="theme-color" content="#4fc08d">
<meta name="msapplication-TileColor" content="#4fc08d">
<meta name="theme-color" content="#4fc08d">

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

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

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

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

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

<!-- ga -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
<!-- ga -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', '<%- theme.google_analytics %>', '<%- theme.root_domain %>');
ga('send', 'pageview');
</script>
</head>
<body class="<%- isIndex ? '' : 'docs' -%>">
<div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="logo" href="/"></a>
</div>
<%- partial('partials/header') %>
<% if (!isIndex) { %>
<div id="main" class="fix-sidebar">
<% if (page.blog_index) { %>
<%- partial('partials/blog') %>
<% } else { %>
<%- body %>
<% } %>
</div>
<script src="<%- url_for("/js/smooth-scroll.min.js") %>"></script>
ga('create', '<%- theme.google_analytics %>', '<%- theme.root_domain %>');
ga('send', 'pageview');
</script>
</head>
<body class="<%- isIndex ? '' : 'docs' -%>">
<div id="mobile-bar" <%- isIndex ? 'class="top"' : '' %>>
<a class="menu-button"></a>
<a class="logo" href="/"></a>
</div>
<%- partial('partials/header') %>
<% if (!isIndex) { %>
<div id="main" class="fix-sidebar">
<% if (page.blog_index) { %>
<%- partial('partials/blog') %>
<% } else { %>
<%- body %>
<%- body %>
<% } %>
</div>
<script src="<%- url_for("/js/smooth-scroll.min.js") %>"></script>
<% } else { %>
<%- body %>
<% } %>

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

<!-- search -->
<link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
<%- css('css/search') %>
<script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
<script>
[
'#search-query-nav',
'#search-query-sidebar',
'#search-query-menu'
].forEach(function (selector) {
if (!document.querySelector(selector)) return
// search index defaults to v2
var match = window.location.pathname.match(/^\/(v\d+)/)
var version = match ? match[1] : 'v2'
docsearch({
appId: 'BH4D9OD16A',
apiKey: '85cc3221c9f23bfbaa4e3913dd7625ea',
indexName: 'vuejs',
inputSelector: selector,
algoliaOptions: { facetFilters: ["version:" + version] }
})
})
</script>
<!-- search -->
<link href="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.css" rel='stylesheet' type='text/css'>
<%- css('css/search') %>
<script src="//cdn.jsdelivr.net/docsearch.js/1/docsearch.min.js"></script>
<script>
[
'#search-query-nav',
'#search-query-sidebar',
'#search-query-menu'
].forEach(function (selector) {
if (!document.querySelector(selector)) return
// search index defaults to v2
var match = window.location.pathname.match(/^\/(v\d+)/)
var version = match ? match[1] : 'v2'
docsearch({
appId: 'BH4D9OD16A',
apiKey: '85cc3221c9f23bfbaa4e3913dd7625ea',
indexName: 'vuejs',
inputSelector: selector,
algoliaOptions: { facetFilters: ["version:" + version] }
})
})
</script>

<!-- fastclick -->
<script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function() {
FastClick.attach(document.body)
}, false)
</script>
</body>
<!-- fastclick -->
<script src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.6/fastclick.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded', function() {
FastClick.attach(document.body)
}, false)
</script>
</body>
</html>
60 changes: 30 additions & 30 deletions themes/vue/layout/page.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if (page.type) { %>
<%- partial('partials/sidebar', { type: page.type === 'menu' ? 'guide' : page.type, index: page.index }) %>
<%- partial('partials/sidebar', { type: page.type === 'menu' ? 'guide' : page.type, index: page.index }) %>
<% } else { %>
<div class="sidebar">
<ul class="main-menu">
Expand All @@ -8,35 +8,35 @@
</div>
<% } %>
<div class="content <%- page.type ? page.type + ' with-sidebar' : '' %> <%- page.type === 'guide' ? page.path.replace(/.+\//, '').replace('.html', '') + '-guide' : '' %>">
<% if (page.type) { %>
<% if (page.type === 'menu') { %>
<form id="search-form">
<input type="text" id="search-query-menu" class="search-query st-default-search-input">
</form>
<%- partial('partials/toc', { type: 'guide' }) %>
<% } else { %>
<%- partial('partials/ad') %>
<% } %>
<% if (page.type) { %>
<% if (page.type === 'menu') { %>
<form id="search-form">
<input type="text" id="search-query-menu" class="search-query st-default-search-input">
</form>
<%- partial('partials/toc', { type: 'guide' }) %>
<% } else { %>
<%- partial('partials/ad') %>
<% } %>
<% if (page.title.trim()) { %>
<h1><%- page.title %><%- page.type === 'examples' ? ' Example' : '' %></h1>
<% } %>
<%- page.content %>
<% if (page.type === 'guide') { %>
<div class="guide-links">
<% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %>
<span>← <a href="<%- url_for(page.path) %>"><%- page.title %></a></span>
<% }) %>
<% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %>
<span style="float: right;"><a href="<%- url_for(page.path) %>"><%- page.title %></a> →</span>
<% }) %>
</div>
<% } %>
<div class="footer">
<%- partial('partials/ad-text') %>
Caught a mistake or want to contribute to the documentation?
<a href="https://github.com/vuejs/vuejs.org/blob/master/src/<%- page.path.replace(/\.html$/, '.md') %>" target="_blank">
Edit this page on Github!
</a>
<% } %>
<% if (page.title.trim()) { %>
<h1><%- page.title %><%- page.type === 'examples' ? ' Example' : '' %></h1>
<% } %>
<%- page.content %>
<% if (page.type === 'guide') { %>
<div class="guide-links">
<% site.pages.find({ type: page.type, order: page.order - 1 }).each(function (page) { %>
<span>← <a href="<%- url_for(page.path) %>"><%- page.title %></a></span>
<% }) %>
<% site.pages.find({ type: page.type, order: page.order + 1 }).each(function (page) { %>
<span style="float: right;"><a href="<%- url_for(page.path) %>"><%- page.title %></a> →</span>
<% }) %>
</div>
<% } %>
<div class="footer">
<%- partial('partials/ad-text') %>
Caught a mistake or want to contribute to the documentation?
<a href="https://github.com/vuejs/vuejs.org/blob/master/src/<%- page.path.replace(/\.html$/, '.md') %>" target="_blank">
Edit this page on Github!
</a>
</div>
</div>
54 changes: 27 additions & 27 deletions themes/vue/layout/partials/sidebar.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<div class="sidebar">
<div class="sidebar-inner">
<ul class="main-menu">
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
</ul>
<div class="list">
<div class="main-sponsor">
<span>Platinum Sponsor</span><br>
<a href="https://stdlib.com" target="_blank" class="logo">
<img src="<%- url_for("/images/stdlib.png") %>">
</a>
</div>
<a class="become-backer" href="<%- url_for("/support-vuejs") %>">
Become a Sponsor
</a>
<h2>
<%- type === 'api' ? 'API' : (type.charAt(0).toUpperCase() + type.slice(1)) %>
<% if (type !== 'cookbook') { %>
<select class="version-select">
<option value="SELF" selected>2.x</option>
<option value="v1">1.0</option>
<option value="012">0.12</option>
<option value="011">0.11</option>
</select>
<% } %>
</h2>
<%- partial('partials/toc', { type: type }) %>
</div>
<div class="sidebar-inner">
<ul class="main-menu">
<%- partial('partials/main_menu', { context: 'sidebar' }) %>
</ul>
<div class="list">
<div class="main-sponsor">
<span>Platinum Sponsor</span><br>
<a href="https://stdlib.com" target="_blank" class="logo">
<img src="<%- url_for("/images/stdlib.png") %>">
</a>
</div>
<a class="become-backer" href="<%- url_for("/support-vuejs") %>">
Become a Sponsor
</a>
<h2>
<%- type === 'api' ? 'API' : (type.charAt(0).toUpperCase() + type.slice(1)) %>
<% if (type !== 'cookbook') { %>
<select class="version-select">
<option value="SELF" selected>2.x</option>
<option value="v1">1.0</option>
<option value="012">0.12</option>
<option value="011">0.11</option>
</select>
<% } %>
</h2>
<%- partial('partials/toc', { type: type }) %>
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions themes/vue/layout/partials/sponsors.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<a href="https://www.xfive.co/" target="_blank" style="width: 65px;">
<img src="<%- url_for("/images/xfive.png") %>" style="width: 65px;">
</a>
<a href="http://www.frontenddevelopermeetups.com/" target="_blank" style="width:100px;">
<img src="<%- url_for("/images/frontend-meetups.png") %>" style="width:100px">
<a href="http://www.frontenddevelopermeetups.com/" target="_blank" style="width: 100px;">
<img src="<%- url_for("/images/frontend-meetups.png") %>" style="width: 100px">
</a>
<br>

Expand Down
Loading