Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs/v2.vuejs.org
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: vuejs-ru/old.ru.vuejs.org
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: lang-ru
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Oct 18, 2016

  1. initial 2.0

    iJackUA committed Oct 18, 2016
    Copy the full SHA
    4d57c4b View commit details
  2. index page

    iJackUA committed Oct 18, 2016
    Copy the full SHA
    35e090f View commit details
  3. Merge pull request #19 from iJackUA/lang-ru

    index page
    iJackUA authored Oct 18, 2016
    Copy the full SHA
    4e604d0 View commit details
  4. menu

    iJackUA committed Oct 18, 2016
    Copy the full SHA
    5905d9e View commit details
  5. Merge pull request #20 from iJackUA/lang-ru

    menu
    iJackUA authored Oct 18, 2016
    Copy the full SHA
    91bc85f View commit details

Commits on Nov 14, 2016

  1. Update _config.yml

    gbezyuk authored Nov 14, 2016
    Copy the full SHA
    d30ee38 View commit details
Showing with 15 additions and 14 deletions.
  1. +2 −2 _config.yml
  2. +5 −5 themes/vue/layout/index.ejs
  3. +5 −4 themes/vue/layout/partials/community_dropdown.ejs
  4. +3 −3 themes/vue/layout/partials/main_menu.ejs
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -5,14 +5,14 @@
# Site
title: Vue.js
subtitle:
description: "Reactive Components for Modern Web Interfaces"
description: "Реактивные Компоненты для Современных Web Интерфейсов"
author: Evan You
email:
language:

# URL
## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
url: http://vuejs.org
url: http://vuejs-ru.github.io/old.ru.vuejs.org/
root: /
permalink: :year/:month/:day/:title/
tag_dir: tags
10 changes: 5 additions & 5 deletions themes/vue/layout/index.ejs
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
</div><div class="right">
<h2 class="vue">Vue.js</h2>
<h1>
The Progressive<br>JavaScript Framework
Прогрессивный<br>JavaScript Фрэймворк
</h1>
<p>
<a class="button" href="/guide/">GET STARTED</a>
@@ -24,17 +24,17 @@
<div id="highlights">
<div class="inner">
<div class="point">
<h2>Approachable</h2>
<p>Already know HTML, CSS and JavaScript? Read the guide and start building things in no time!</p>
<h2>Доступный</h2>
<p>Уже знаешь HTML, CSS и JavaScript? Прочти руководство и сразу же начинай делать проекты!</p>
</div>

<div class="point">
<h2>Versatile</h2>
<h2>Гибкий</h2>
<p>Simple, minimal core with an incrementally adoptable stack that can handle apps of any scale.</p>
</div>

<div class="point">
<h2>Performant</h2>
<h2>Производительный</h2>
<p>
16kb min+gzip Runtime<br>
Blazing Fast Virtual DOM<br>
9 changes: 5 additions & 4 deletions themes/vue/layout/partials/community_dropdown.ejs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<li class="nav-dropdown-container">
<a class="nav-link">Community</a><span class="arrow"></span>
<a class="nav-link">Сообщество</a><span class="arrow"></span>
<ul class="nav-dropdown">
<li><a href="https://github.com/vuejs/vue" class="nav-link" target="_blank">GitHub</a></li>
<li><a href="http://forum.vuejs.org" class="nav-link" target="_blank">Forum</a></li>
<li><a href="https://gitter.im/vuejs/vue" class="nav-link" target="_blank">Chat</a></li>
<li><a href="https://twitter.com/vuejs" class="nav-link" target="_blank">Twitter</a></li>
<li><a href="http://forum.vuejs.org" class="nav-link" target="_blank">Форум&nbsp;(En)</a></li>
<li><a href="https://gitter.im/vuejs/vue" class="nav-link" target="_blank">Чат&nbsp;(En)</a></li>
<li><a href="https://gitter.im/vuejs-ru/Discussion" class="nav-link" target="_blank">Чат&nbsp;(<b>Ru</b>)</a></li>
<li><a href="https://twitter.com/vuejs" class="nav-link" target="_blank">Twitter&nbsp;(En)</a></li>
</ul>
</li>
6 changes: 3 additions & 3 deletions themes/vue/layout/partials/main_menu.ejs
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
<input type="text" id="search-query-<%- context %>" class="search-query st-default-search-input">
</form>
</li>
<li><a href="/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">Guide</a></li>
<li><a href="/guide/" class="nav-link<%- page.path.match(/guide/) ? ' current' : '' %>">Руководство</a></li>
<li><a href="/api/" class="nav-link<%- page.path.match(/api/) ? ' current' : '' %>">API</a></li>
<li><a href="/examples/" class="nav-link<%- page.path.match(/examples/) ? ' current' : '' %>">Examples</a></li>
<li><a href="https://medium.com/the-vue-point" target="_blank" class="nav-link<%- page.path.match(/blog/) ? ' current' : '' %>">Blog</a></li>
<li><a href="/examples/" class="nav-link<%- page.path.match(/examples/) ? ' current' : '' %>">Примеры</a></li>
<li><a href="https://medium.com/the-vue-point" target="_blank" class="nav-link<%- page.path.match(/blog/) ? ' current' : '' %>">Блог (En)</a></li>
<%- partial('partials/community_dropdown') %>