summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locales/ru.json4
-rw-r--r--webpackBaseConfig.js32
2 files changed, 26 insertions, 10 deletions
diff --git a/locales/ru.json b/locales/ru.json
index a1a95aaf..f87f7c69 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -1,7 +1,7 @@
{
"Collaborative markdown notes": "Совместные markdown заметки",
"Realtime collaborative markdown notes on all platforms.": "Совместные markdown заметки в режиме реального времени на всех платформах.",
- "Best way to write and share your knowledge in markdown.": "Лучший способ, чтобы записывать и делиться своими знаниями markdown.",
+ "Best way to write and share your knowledge in markdown.": "Лучший способ записывать свои знания и делиться ими в формате markdown.",
"Intro": "Введение",
"History": "История",
"New guest note": "Новая гостевая заметка",
@@ -101,4 +101,4 @@
"OR": "ИЛИ",
"Export to Snippet": "Экспорт фрагмента кода",
"Select Visibility Level": "Выберите уровень видимости"
-} \ No newline at end of file
+}
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 8279005c..9ab4c06a 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -132,22 +132,33 @@ module.exports = {
{
context: path.join(__dirname, 'node_modules/emojify.js'),
from: {
- glob: '**/*',
+ glob: 'dist/**/*',
dot: false
},
to: 'emojify.js/'
},
{
context: path.join(__dirname, 'node_modules/reveal.js'),
- from: {
- glob: '**/*',
- dot: false
- },
- to: 'reveal.js/'
+ from: 'js',
+ to: 'reveal.js/js'
+ },
+ {
+ context: path.join(__dirname, 'node_modules/reveal.js'),
+ from: 'css',
+ to: 'reveal.js/css'
+ },
+ {
+ context: path.join(__dirname, 'node_modules/reveal.js'),
+ from: 'lib',
+ to: 'reveal.js/lib'
+ },
+ {
+ context: path.join(__dirname, 'node_modules/reveal.js'),
+ from: 'plugin',
+ to: 'reveal.js/plugin'
}
])
],
-
entry: {
font: path.join(__dirname, 'public/css/google-font.css'),
'font-pack': path.join(__dirname, 'public/css/font.css'),
@@ -416,8 +427,13 @@ module.exports = {
loader: 'url?limit=10000&mimetype=image/gif'
}]
},
-
node: {
fs: 'empty'
+ },
+
+ quiet: false,
+ noInfo: false,
+ stats: {
+ assets: false
}
}