From c4d2a3afac94749dbbad253b08fd6ec7788dd1bd Mon Sep 17 00:00:00 2001 From: RGB Date: Wed, 15 Mar 2017 21:33:40 +0900 Subject: [PATCH] fix config conflict --- exampleSite/static/assets/css/styles-2.css | 2 +- exampleSite/static/assets/css/styles-3.css | 2 +- exampleSite/static/assets/css/styles-4.css | 2 +- exampleSite/static/assets/css/styles-5.css | 2 +- exampleSite/static/assets/css/styles-6.css | 2 +- exampleSite/static/assets/css/styles.css | 2 +- exampleSite/static/assets/less/css/styles.css | 2 +- exampleSite/static/assets/less/default/base.less | 2 +- exampleSite/static/assets/less/theme-2/base.less | 2 +- exampleSite/static/assets/less/theme-3/base.less | 2 +- exampleSite/static/assets/less/theme-4/base.less | 2 +- exampleSite/static/assets/less/theme-5/base.less | 2 +- exampleSite/static/assets/less/theme-6/base.less | 2 +- i18n/en.yaml | 4 ++-- i18n/ja.yaml | 2 +- i18n/ko.yaml | 2 +- layouts/index.html | 7 +++---- layouts/partials/{languages.html => language.html} | 8 ++++---- layouts/partials/sidebar.html | 6 +++--- static/assets/css/styles-2.css | 2 +- static/assets/css/styles-3.css | 2 +- static/assets/css/styles-4.css | 2 +- static/assets/css/styles-5.css | 2 +- static/assets/css/styles-6.css | 2 +- static/assets/css/styles.css | 2 +- static/assets/less/css/styles.css | 2 +- static/assets/less/default/base.less | 2 +- static/assets/less/theme-2/base.less | 2 +- static/assets/less/theme-3/base.less | 2 +- static/assets/less/theme-4/base.less | 2 +- static/assets/less/theme-5/base.less | 2 +- static/assets/less/theme-6/base.less | 2 +- 32 files changed, 40 insertions(+), 41 deletions(-) rename layouts/partials/{languages.html => language.html} (61%) diff --git a/exampleSite/static/assets/css/styles-2.css b/exampleSite/static/assets/css/styles-2.css index 1187403..6839f97 100644 --- a/exampleSite/static/assets/css/styles-2.css +++ b/exampleSite/static/assets/css/styles-2.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/css/styles-3.css b/exampleSite/static/assets/css/styles-3.css index 7080bc0..349e6cc 100644 --- a/exampleSite/static/assets/css/styles-3.css +++ b/exampleSite/static/assets/css/styles-3.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/css/styles-4.css b/exampleSite/static/assets/css/styles-4.css index 3f5025d..1993aae 100644 --- a/exampleSite/static/assets/css/styles-4.css +++ b/exampleSite/static/assets/css/styles-4.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/css/styles-5.css b/exampleSite/static/assets/css/styles-5.css index 6209f35..60e7101 100644 --- a/exampleSite/static/assets/css/styles-5.css +++ b/exampleSite/static/assets/css/styles-5.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/css/styles-6.css b/exampleSite/static/assets/css/styles-6.css index cd1d9ad..4b9a35f 100644 --- a/exampleSite/static/assets/css/styles-6.css +++ b/exampleSite/static/assets/css/styles-6.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/css/styles.css b/exampleSite/static/assets/css/styles.css index 5d50aac..6b9245b 100644 --- a/exampleSite/static/assets/css/styles.css +++ b/exampleSite/static/assets/css/styles.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/less/css/styles.css b/exampleSite/static/assets/less/css/styles.css index 6181473..1e391ea 100644 --- a/exampleSite/static/assets/less/css/styles.css +++ b/exampleSite/static/assets/less/css/styles.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/exampleSite/static/assets/less/default/base.less b/exampleSite/static/assets/less/default/base.less index 9ebc6aa..d860e96 100644 --- a/exampleSite/static/assets/less/default/base.less +++ b/exampleSite/static/assets/less/default/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/exampleSite/static/assets/less/theme-2/base.less b/exampleSite/static/assets/less/theme-2/base.less index 9ebc6aa..d860e96 100644 --- a/exampleSite/static/assets/less/theme-2/base.less +++ b/exampleSite/static/assets/less/theme-2/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/exampleSite/static/assets/less/theme-3/base.less b/exampleSite/static/assets/less/theme-3/base.less index 9ebc6aa..d860e96 100644 --- a/exampleSite/static/assets/less/theme-3/base.less +++ b/exampleSite/static/assets/less/theme-3/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/exampleSite/static/assets/less/theme-4/base.less b/exampleSite/static/assets/less/theme-4/base.less index 9ebc6aa..d860e96 100644 --- a/exampleSite/static/assets/less/theme-4/base.less +++ b/exampleSite/static/assets/less/theme-4/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/exampleSite/static/assets/less/theme-5/base.less b/exampleSite/static/assets/less/theme-5/base.less index 9ebc6aa..d860e96 100644 --- a/exampleSite/static/assets/less/theme-5/base.less +++ b/exampleSite/static/assets/less/theme-5/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/exampleSite/static/assets/less/theme-6/base.less b/exampleSite/static/assets/less/theme-6/base.less index 9ebc6aa..d860e96 100644 --- a/exampleSite/static/assets/less/theme-6/base.less +++ b/exampleSite/static/assets/less/theme-6/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/i18n/en.yaml b/i18n/en.yaml index e1c4508..66007b5 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -4,11 +4,11 @@ translation: Experiences - id: interests translation: Interests -- id: languages +- id: language translation: Languages - id: projects translation: Projects - id: skills translation: Skills & Proficiency - id: summary - translation: Career Profile \ No newline at end of file + translation: Career Profile diff --git a/i18n/ja.yaml b/i18n/ja.yaml index d4fd461..d3adb59 100644 --- a/i18n/ja.yaml +++ b/i18n/ja.yaml @@ -4,7 +4,7 @@ translation: 経歴 - id: interests translation: 趣味 -- id: languages +- id: language translation: 言語能力 - id: projects translation: プロジェクト diff --git a/i18n/ko.yaml b/i18n/ko.yaml index 269d487..482b091 100644 --- a/i18n/ko.yaml +++ b/i18n/ko.yaml @@ -4,7 +4,7 @@ translation: 경력 - id: interests translation: 취미 -- id: languages +- id: language translation: 언어능력 - id: projects translation: 프로젝트 diff --git a/layouts/index.html b/layouts/index.html index ef0e509..728fd60 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -26,13 +26,12 @@ {{ if .Site.Params.skills.enable }} {{ partial "skills.html" . }} {{ end }} - + - + {{ partial "footer.html" . }} {{ partial "scripts.html" . }} - - + diff --git a/layouts/partials/languages.html b/layouts/partials/language.html similarity index 61% rename from layouts/partials/languages.html rename to layouts/partials/language.html index 5eee153..dcac74a 100644 --- a/layouts/partials/languages.html +++ b/layouts/partials/language.html @@ -1,8 +1,8 @@ -
-

{{ i18n "languages" }}

+
+

{{ i18n "language" }}

    - {{ range .Site.Params.languages.list }} + {{ range .Site.Params.language.list }}
  • {{ .language }} ({{ .level }})
    • {{ end }}
-
+
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 3bbdaf1..22499e8 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,7 +1,7 @@
{{ partial "profile.html" . }} - + {{ if .IsTranslated }} {{ partial "translate.html" . }} {{ end }} @@ -14,8 +14,8 @@ {{ partial "education.html" . }} {{ end }} - {{ if .Site.Params.languages.enable }} - {{ partial "languages.html" . }} + {{ if .Site.Params.language.enable }} + {{ partial "language.html" . }} {{ end }} {{ if .Site.Params.interests.enable }} diff --git a/static/assets/css/styles-2.css b/static/assets/css/styles-2.css index 75a6725..c9806f3 100644 --- a/static/assets/css/styles-2.css +++ b/static/assets/css/styles-2.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/css/styles-3.css b/static/assets/css/styles-3.css index 5f18f94..e09eede 100644 --- a/static/assets/css/styles-3.css +++ b/static/assets/css/styles-3.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/css/styles-4.css b/static/assets/css/styles-4.css index ccc0809..cdcd16e 100644 --- a/static/assets/css/styles-4.css +++ b/static/assets/css/styles-4.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/css/styles-5.css b/static/assets/css/styles-5.css index bc7a999..adb68d7 100644 --- a/static/assets/css/styles-5.css +++ b/static/assets/css/styles-5.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/css/styles-6.css b/static/assets/css/styles-6.css index 7adc5be..83864aa 100644 --- a/static/assets/css/styles-6.css +++ b/static/assets/css/styles-6.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/css/styles.css b/static/assets/css/styles.css index da3a674..96e1355 100644 --- a/static/assets/css/styles.css +++ b/static/assets/css/styles.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/less/css/styles.css b/static/assets/less/css/styles.css index 6181473..1e391ea 100644 --- a/static/assets/less/css/styles.css +++ b/static/assets/less/css/styles.css @@ -131,7 +131,7 @@ p { font-weight: 500; margin-bottom: 0px; } -.sidebar-wrapper .languages-container .lang-desc { +.sidebar-wrapper .language-container .lang-desc { color: rgba(255, 255, 255, 0.6); } .sidebar-wrapper .languages-list { diff --git a/static/assets/less/default/base.less b/static/assets/less/default/base.less index 9ebc6aa..d860e96 100644 --- a/static/assets/less/default/base.less +++ b/static/assets/less/default/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/static/assets/less/theme-2/base.less b/static/assets/less/theme-2/base.less index 9ebc6aa..d860e96 100644 --- a/static/assets/less/theme-2/base.less +++ b/static/assets/less/theme-2/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/static/assets/less/theme-3/base.less b/static/assets/less/theme-3/base.less index 9ebc6aa..d860e96 100644 --- a/static/assets/less/theme-3/base.less +++ b/static/assets/less/theme-3/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/static/assets/less/theme-4/base.less b/static/assets/less/theme-4/base.less index 9ebc6aa..d860e96 100644 --- a/static/assets/less/theme-4/base.less +++ b/static/assets/less/theme-4/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/static/assets/less/theme-5/base.less b/static/assets/less/theme-5/base.less index 9ebc6aa..d860e96 100644 --- a/static/assets/less/theme-5/base.less +++ b/static/assets/less/theme-5/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); } diff --git a/static/assets/less/theme-6/base.less b/static/assets/less/theme-6/base.less index 9ebc6aa..d860e96 100644 --- a/static/assets/less/theme-6/base.less +++ b/static/assets/less/theme-6/base.less @@ -123,7 +123,7 @@ p { margin-bottom: 0px; } } - .languages-container { + .language-container { .lang-desc { color: rgba(256, 256, 256, 0.6); }