diff --git a/.gitignore b/.gitignore index 0dd847e..6ea0c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ *.iml *.gem *.lock -.repo_*.sh +.repo_* diff --git a/DIRECTORY-TREE.md b/DIRECTORY_TREE.md similarity index 69% rename from DIRECTORY-TREE.md rename to DIRECTORY_TREE.md index 5c2e71d..4b1e46e 100644 --- a/DIRECTORY-TREE.md +++ b/DIRECTORY_TREE.md @@ -1,7 +1,7 @@ ## Дерево каталогов 
-.
+.
 ├─ jekyll_theme
 │  ├─ _includes
 │  │  ├─ article_brief.html
@@ -15,8 +15,7 @@
 │  │  ├─ page_toolbar.html
 │  │  ├─ picture.html
 │  │  └─ seo.html
-│  ├─ _layouts
-│  │  └─ default.html
+│  ├─ _layouts/default.html
 │  ├─ assets
 │  │  ├─ css
 │  │  │  ├─ code-highlighting.css
@@ -29,26 +28,27 @@
 │  │  │  ├─ older-tomato.png
 │  │  │  ├─ older-tomato.svg
 │  │  │  └─ typewriter.svg
-│  │  ├─ resources
-│  │  │  └─ fonts
-│  │  │     ├─ JBMono
-│  │  │     │  ├─ JetBrainsMono-Bold.woff
-│  │  │     │  ├─ JetBrainsMono-Italic.woff
-│  │  │     │  ├─ JetBrainsMono-Medium.woff
-│  │  │     │  └─ JetBrainsMono-Regular.woff
-│  │  │     └─ Roboto
-│  │  │        ├─ Roboto-Bold.woff
-│  │  │        ├─ Roboto-Italic.woff
-│  │  │        ├─ Roboto-Medium.woff
-│  │  │        └─ Roboto-Regular.woff
+│  │  ├─ resources/fonts
+│  │  │  ├─ JBMono
+│  │  │  │  ├─ JetBrainsMono-Bold.woff
+│  │  │  │  ├─ JetBrainsMono-Italic.woff
+│  │  │  │  ├─ JetBrainsMono-Medium.woff
+│  │  │  │  └─ JetBrainsMono-Regular.woff
+│  │  │  └─ Roboto
+│  │  │     ├─ Roboto-Bold.woff
+│  │  │     ├─ Roboto-Italic.woff
+│  │  │     ├─ Roboto-Medium.woff
+│  │  │     └─ Roboto-Regular.woff
 │  │  ├─ 404.html
 │  │  ├─ favicon.ico
 │  │  └─ pagesmap.xml
 │  ├─ Gemfile
 │  ├─ install.sh
 │  └─ older-tomato-theme.gemspec
+├─ .gitattributes
+├─ .gitignore
 ├─ CONTRIBUTING.md
-├─ DIRECTORY-TREE.md
+├─ DIRECTORY_TREE.md
 ├─ LICENSE.md
 ├─ OPEN_LICENSE.txt
 ├─ README.en.md
diff --git a/README.en.md b/README.en.md
index e90d175..cde8184 100644
--- a/README.en.md
+++ b/README.en.md
@@ -9,7 +9,6 @@ are marked in the list of features.
 
 - [Color tomato](https://hub.mos.ru/golovin.gg/color-tomato-theme/blob/master/README.en.md) — color selection during the build.
 - Older tomato — lightweight decoration theme.
-- [Pomodori](https://hub.mos.ru/golovin.gg/pomodoro/blob/master/README.en.md) — series of static websites.
 
 ### Features
 
@@ -167,6 +166,7 @@ find . -type f -name '*.html' | sort -r | while read -r file; do
   sed -i 's/ class="language-java highlighter-rouge"//g' "$file"
   sed -i 's/ class="language-html highlighter-rouge"//g' "$file"
   sed -i 's/ class="language-js highlighter-rouge"//g' "$file"
+  sed -i 's/ class="language-bash highlighter-rouge"//g' "$file"
   sed -i 's/
/
/g' "$file"
   sed -i 's/<\/code><\/pre><\/div><\/div>/<\/code><\/pre><\/div>/g' "$file"
   sed -i 's/
/
/g' "$file"
diff --git a/README.md b/README.md
index 772ab4f..69bf4f4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@
 
 - [Цветной помидор](https://hub.mos.ru/golovin.gg/color-tomato-theme/blob/master/README.md) — выбор цвета во время сборки.
 - Старый помидор — легковесная тема оформления.
-- [Помидоры](https://hub.mos.ru/golovin.gg/pomodoro/blob/master/README.md) — серия статических вёб-сайтов.
 
 ### Свойства
 
@@ -166,6 +165,7 @@ find . -type f -name '*.html' | sort -r | while read -r file; do
   sed -i 's/ class="language-java highlighter-rouge"//g' "$file"
   sed -i 's/ class="language-html highlighter-rouge"//g' "$file"
   sed -i 's/ class="language-js highlighter-rouge"//g' "$file"
+  sed -i 's/ class="language-bash highlighter-rouge"//g' "$file"
   sed -i 's/
/
/g' "$file"
   sed -i 's/<\/code><\/pre><\/div><\/div>/<\/code><\/pre><\/div>/g' "$file"
   sed -i 's/
/
/g' "$file"
diff --git a/jekyll_theme/assets/css/code-highlighting.css b/jekyll_theme/assets/css/code-highlighting.css
index fccb467..a571429 100644
--- a/jekyll_theme/assets/css/code-highlighting.css
+++ b/jekyll_theme/assets/css/code-highlighting.css
@@ -3,7 +3,7 @@ pre, code { font-family: JBMono, monospace; font-variant: none; }
 /* keyword */
 .k, .kc, .kd, .kt, .kn { color: #2452bc; }
 /* keyword */
-.na, .nb { color: #5f2d6e; }
+.na, .nb, .nv, .si { color: #5f2d6e; }
 /* keyword */
 .nl, .nt, .cp, .m { color: #0550ae; }
 /* keyword */