X-dark
/
hugo-orbit-theme
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix config conflict

This commit is contained in:
RGB 2017-03-15 21:33:40 +09:00
parent 4fde2adb2c
commit c4d2a3afac
32 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exampleSite/static/assets/css/styles-2.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/css/styles-3.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/css/styles-4.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/css/styles-5.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/css/styles-6.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/css/styles.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/less/css/styles.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
exampleSite/static/assets/less/default/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
exampleSite/static/assets/less/theme-2/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
exampleSite/static/assets/less/theme-3/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
exampleSite/static/assets/less/theme-4/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
exampleSite/static/assets/less/theme-5/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
exampleSite/static/assets/less/theme-6/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

4
i18n/en.yaml
View File

@ -4,11 +4,11 @@
translation: Experiences translation: Experiences
- id: interests - id: interests
translation: Interests translation: Interests
- id: languages - id: language
translation: Languages translation: Languages
- id: projects - id: projects
translation: Projects translation: Projects
- id: skills - id: skills
translation: Skills & Proficiency translation: Skills & Proficiency
- id: summary - id: summary
translation: Career Profile translation: Career Profile

2
i18n/ja.yaml
View File

@ -4,7 +4,7 @@
translation: 経歴 translation: 経歴
- id: interests - id: interests
translation: 趣味 translation: 趣味
- id: languages - id: language
translation: 言語能力 translation: 言語能力
- id: projects - id: projects
translation: プロジェクト translation: プロジェクト

2
i18n/ko.yaml
View File

@ -4,7 +4,7 @@
translation: 경력 translation: 경력
- id: interests - id: interests
translation: 취미 translation: 취미
- id: languages - id: language
translation: 언어능력 translation: 언어능력
- id: projects - id: projects
translation: 프로젝트 translation: 프로젝트

7
layouts/index.html
View File

@ -26,13 +26,12 @@
{{ if .Site.Params.skills.enable }} {{ if .Site.Params.skills.enable }}
{{ partial "skills.html" . }} {{ partial "skills.html" . }}
{{ end }} {{ end }}
</div><!--//main-body--> </div><!--//main-body-->
</div> </div>
{{ partial "footer.html" . }} {{ partial "footer.html" . }}
{{ partial "scripts.html" . }} {{ partial "scripts.html" . }}
</body> </body>
</html> </html>

8
layouts/partials/languages.html → layouts/partials/language.html
View File

@ -1,8 +1,8 @@
<div class="languages-container container-block"> <div class="language-container container-block">
<h2 class="container-block-title">{{ i18n "languages" }}</h2> <h2 class="container-block-title">{{ i18n "language" }}</h2>
<ul class="list-unstyled interests-list"> <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> <li>{{ .language }} <span class="lang-desc">({{ .level }})</span></li>
{{ end }} {{ end }}
</ul> </ul>
</div><!--//languages--> </div><!--//language-->

6
layouts/partials/sidebar.html
View File

@ -1,7 +1,7 @@
<div class="sidebar-wrapper"> <div class="sidebar-wrapper">
{{ partial "profile.html" . }} {{ partial "profile.html" . }}
{{ if .IsTranslated }} {{ if .IsTranslated }}
{{ partial "translate.html" . }} {{ partial "translate.html" . }}
{{ end }} {{ end }}
@ -14,8 +14,8 @@
{{ partial "education.html" . }} {{ partial "education.html" . }}
{{ end }} {{ end }}
{{ if .Site.Params.languages.enable }} {{ if .Site.Params.language.enable }}
{{ partial "languages.html" . }} {{ partial "language.html" . }}
{{ end }} {{ end }}
{{ if .Site.Params.interests.enable }} {{ if .Site.Params.interests.enable }}

2
static/assets/css/styles-2.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/css/styles-3.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/css/styles-4.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/css/styles-5.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/css/styles-6.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/css/styles.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/less/css/styles.css
View File

@ -131,7 +131,7 @@ p {
font-weight: 500; font-weight: 500;
margin-bottom: 0px; margin-bottom: 0px;
} }
.sidebar-wrapper .languages-container .lang-desc { .sidebar-wrapper .language-container .lang-desc {
color: rgba(255, 255, 255, 0.6); color: rgba(255, 255, 255, 0.6);
} }
.sidebar-wrapper .languages-list { .sidebar-wrapper .languages-list {

2
static/assets/less/default/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
static/assets/less/theme-2/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
static/assets/less/theme-3/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
static/assets/less/theme-4/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
static/assets/less/theme-5/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }

2
static/assets/less/theme-6/base.less
View File

@ -123,7 +123,7 @@ p {
margin-bottom: 0px; margin-bottom: 0px;
} }
} }
.languages-container { .language-container {
.lang-desc { .lang-desc {
color: rgba(256, 256, 256, 0.6); color: rgba(256, 256, 256, 0.6);
} }