fix config conflict

2017-03-15 21:33:40 +09:00 · 2017-03-15 21:33:40 +09:00 · c4d2a3afac
commit c4d2a3afac
parent 4fde2adb2c
32 changed files with 40 additions and 41 deletions
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@ -4,7 +4,7 @@
  translation: Experiences
 - id: interests
  translation: Interests
- id: languages
+- id: language
  translation: Languages
 - id: projects
  translation: Projects
--- a/i18n/ja.yaml
+++ b/i18n/ja.yaml
@ -4,7 +4,7 @@
  translation: 経歴
 - id: interests
  translation: 趣味
- id: languages
+- id: language
  translation: 言語能力
 - id: projects
  translation: プロジェクト
--- a/i18n/ko.yaml
+++ b/i18n/ko.yaml
@ -4,7 +4,7 @@
  translation: 경력
 - id: interests
  translation: 취미
- id: languages
+- id: language
  translation: 언어능력
 - id: projects
  translation: 프로젝트
--- a/layouts/index.html
+++ b/layouts/index.html
@ -35,4 +35,3 @@
    {{ partial "scripts.html" . }}
 </body>
 </html>
-
--- a/layouts/partials/languages.html
+++ b/layouts/partials/languages.html
@ -1,8 +1,8 @@
-            <div class="languages-container container-block">
-                <h2 class="container-block-title">{{ i18n "languages" }}</h2>
+            <div class="language-container container-block">
+                <h2 class="container-block-title">{{ i18n "language" }}</h2>
                <ul class="list-unstyled interests-list">
-				{{ range .Site.Params.languages.list }}
+				{{ range .Site.Params.language.list }}
                    <li>{{ .language }} <span class="lang-desc">({{ .level }})</span></li>
 				{{ end }}
                </ul>
-            </div><!--//languages-->
+            </div><!--//language-->
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@ -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 }}
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- 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);
        }
--- 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);
        }