Skip to content

Commit 3210c59

Browse files
cotes2020cotes2020
committed
feat(ui): new design footer content layout
1 parent 83f1c34 commit 3210c59

22 files changed

+76
-74
lines changed

‎_data/locales/ar.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
ما لم يذكر خلاف ذلك ، يتم ترخيص منشورات المدونة على هذا الموقع
4141
بموجب ترخيص Creative Commons Attribution 4.0 International (CC BY 4.0) من قبل المؤلف.
4242
43-
meta: باستخدام :PLATFORM السمة :THEME.
43+
meta: باستخدام :PLATFORM السمة :THEME
4444

4545
not_found:
4646
statment: عذرا, الرابط التالي غير صالح أو انه يشير إلى صفحة غير موجودة.

‎_data/locales/bg-BG.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Освен ако не е посочено друго, публикациите в блога на този сайт са лицензирани
4141
под лиценза Creative Commons Attribution 4.0 (CC BY 4.0) от автора.
4242
43-
meta: Създадено чрез :PLATFORM и :THEME тема.
43+
meta: Създадено чрез :PLATFORM и :THEME тема
4444

4545
not_found:
4646
statment: Съжалявам, но на този URL адрес няма налично съдържание.

‎_data/locales/cs-CZ.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Pokud není uvedeno jinak, jsou příspěvky na tomto webu licencovány
4141
pod licencí Creative Commons Attribution 4.0 International (CC BY 4.0) Licence autora.
4242
43-
meta: Použití :PLATFORM s motivem :THEME.
43+
meta: Použití :PLATFORM s motivem :THEME
4444

4545
not_found:
4646
statment: Omlouváme se, adresu URL jsme špatně umístili nebo odkazuje na něco, co neexistuje.

‎_data/locales/de-DE.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ copyright:
3939
verbose: >-
4040
Alle Einträge auf dieser Seite stehen, soweit nicht anders angegeben, unter der Lizenz Creative Commons Attribution 4.0 (CC BY 4.0).
4141
42-
meta: Powered by :PLATFORM with :THEME theme.
42+
meta: Powered by :PLATFORM with :THEME theme
4343

4444
not_found:
4545
statment: Entschuldigung, dieser Link verweist auf keine vorhandene Ressource.

‎_data/locales/el-GR.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Εκτός αλλού ή οπουδήποτε αλλού, τα blog posts σε αυτήν την σελίδα βρίσκονται υπο την άδεια
4141
Creative Commons Attribution 4.0 International (CC BY 4.0) του δημιουργού.
4242
43-
meta: Αξιοποιώντας την :PLATFORM theme :THEME.
43+
meta: Αξιοποιώντας την :PLATFORM theme :THEME
4444

4545
not_found:
4646
statment: Συγνώμη, έχουμε τοποθετήσει λάθος αυτήν την διεύθυνση URL ή υποδεικνύει κάτι που δεν υπάρχει.

‎_data/locales/en.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Except where otherwise noted, the blog posts on this site are licensed
4141
under the Creative Commons Attribution 4.0 International (CC BY 4.0) License by the author.
4242
43-
meta: Using the :PLATFORM theme :THEME.
43+
meta: Using the :PLATFORM theme :THEME
4444

4545
not_found:
4646
statment: Sorry, we've misplaced that URL or it's pointing to something that doesn't exist.

‎_data/locales/es-ES.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Salvo que se indique explícitamente, las entradas de este blog están licenciadas
4141
bajo la Creative Commons Attribution 4.0 International (CC BY 4.0) License por el autor.
4242
43-
meta: Hecho con :PLATFORM usando el tema :THEME.
43+
meta: Hecho con :PLATFORM usando el tema :THEME
4444

4545
not_found:
4646
statment: Lo sentimos, hemos perdido esa URL o apunta a algo que no existe.

‎_data/locales/fi-FI.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ copyright:
3939
verbose: >-
4040
Paitsi jos erikseen mainitaan on kaikki sisältö Creative Commons Attribution 4.0 International (CC BY 4.0) Lisensoitu kirjoittajan toimesta.
4141
42-
meta: Käytetään :PLATFORM iä Teema :THEME.
42+
meta: Käytetään :PLATFORM iä Teema :THEME
4343

4444
not_found:
4545
statment: Valitettavasti tällä URL-osoitteella ei ole saatavilla sisältöä.

‎_data/locales/hu-HU.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ copyright:
4242
Creative Commons Attribution 4.0 International (CC BY 4.0) licenccel rendelkeznek,
4343
hacsak másképp nincs jelezve.
4444
45-
meta: Készítve :PLATFORM motorral :THEME témával.
45+
meta: Készítve :PLATFORM motorral :THEME témával
4646

4747
not_found:
4848
statment: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat.

‎_data/locales/id-ID.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Kecuali jika dinyatakan, Postingan blog di situs ini dilisensikan
4141
di bawah Lisensi Creative Commons Attribution 4.0 International (CC BY 4.0) oleh penulis.
4242
43-
meta: Didukung oleh :PLATFORM dengan tema :THEME.
43+
meta: Didukung oleh :PLATFORM dengan tema :THEME
4444

4545
not_found:
4646
statment: Maaf, kami gagal menemukan URL itu atau memang mengarah ke sesuatu yang tidak ada.

‎_data/locales/it-IT.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Eccetto quando esplicitamente menzionato, i post di questo blog sono da ritenersi sotto
4141
i termini di licenza Creative Commons Attribution 4.0 International (CC BY 4.0).
4242
43-
meta: Servizio offerto da :PLATFORM con tema :THEME.
43+
meta: Servizio offerto da :PLATFORM con tema :THEME
4444
not_found:
4545
statment: Ci scusiamo, non è stato possibile trovare l'URL in questione. Potrebbe puntare ad una pagina non esistente.
4646

‎_data/locales/ko-KR.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
명시되지 않는 한 이 사이트의 블로그 게시물은 작성자의
4141
Creative Commons Attribution 4.0 International(CC BY 4.0) 라이선스에 따라 사용이 허가되었습니다.
4242
43-
meta: Powered by :PLATFORM with :THEME theme.
43+
meta: Powered by :PLATFORM with :THEME theme
4444

4545
not_found:
4646
statment: 해당 URL은 존재하지 않습니다.

‎_data/locales/my-MM.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
အခြားမှတ်သားထားချက်များမှလွဲ၍ ဤဆိုက်ရှိ ဘလော့ဂ်ပို့စ်များသည် စာရေးသူ၏
4141
Creative Commons Attribution 4.0 International (CC BY 4.0) အောက်တွင် လိုင်စင်ရထားပါသည်။
4242
43-
meta: Powered by :PLATFORM with :THEME theme.
43+
meta: Powered by :PLATFORM with :THEME theme
4444

4545
not_found:
4646
statment: ဝမ်းနည်းပါသည်၊ ကျွန်ုပ်တို့သည် အဆိုပါ URL ကို မှားယွင်းစွာ နေရာချထားခြင်း သို့မဟုတ် ၎င်းသည် မရှိသောအရာကို ညွှန်ပြနေပါသည်။

‎_data/locales/pt-BR.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Exceto onde indicado de outra forma, as postagens do blog neste site são licenciadas sob a
4141
Creative Commons Attribution 4.0 International (CC BY 4.0) License pelo autor.
4242
43-
meta: Feito com :PLATFORM usando o tema :THEME.
43+
meta: Feito com :PLATFORM usando o tema :THEME
4444

4545
not_found:
4646
statment: Desculpe, a página não foi encontrada.

‎_data/locales/ru-RU.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Публикации на сайте защищены лицензией Creative Commons Attribution 4.0 International (CC BY 4.0),
4141
если в тексте публикации не указано иное.
4242
43-
meta: Powered by :PLATFORM with :THEME theme.
43+
meta: Powered by :PLATFORM with :THEME theme
4444

4545
not_found:
4646
statment: Извините, эта ссылка указывает на ресурс который не существует.

‎_data/locales/tr-TR.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Aksi belirtilmediği sürece, bu sitedeki gönderiler Creative Commons Atıf 4.0 Uluslararası (CC BY 4.0) Lisansı altındadır.
4141
Kısaca sayfa linkini de vererek paylaşabilir veya düzenleyip paylaşabilirsin.
4242
43-
meta: :PLATFORM ve :THEME teması.
43+
meta: :PLATFORM ve :THEME teması
4444

4545
not_found:
4646
statment: Üzgünüz, bu linki yanlış yerleştirdik veya var olmayan bir şeye işaret ediyor.

‎_data/locales/uk-UA.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ copyright:
4040
Публікації на сайті захищено ліцензією Creative Commons Attribution 4.0 International (CC BY 4.0),
4141
якщо інше не вказано в тексті.
4242
43-
meta: Powered by :PLATFORM with :THEME theme.
43+
meta: Powered by :PLATFORM with :THEME theme
4444

4545
not_found:
4646
statment: Вибачте, це посилання вказує на ресурс, що не існує.

‎_data/locales/vi-VN.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ copyright:
3838
brief: Một số quyền được bảo lưu.
3939
verbose: >-
4040
Trừ khi có ghi chú khác, các bài viết đăng trên trang này được cấp phép bởi tác giả theo giấy phép Creative Commons Attribution 4.0 International (CC BY 4.0).
41-
meta: Trang web này được tạo bởi :PLATFORM với chủ đề :THEME.
41+
42+
meta: Trang web này được tạo bởi :PLATFORM với chủ đề :THEME
43+
4244
not_found:
4345
statment: Xin lỗi, chúng tôi đã đặt nhầm URL hoặc đường dẫn trỏ đến một trang nào đó không tồn tại.
4446

‎_data/locales/zh-CN.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ copyright:
3939
verbose: >-
4040
除非另有说明，本网站上的博客文章均由作者按照知识共享署名 4.0 国际 (CC BY 4.0) 许可协议进行授权。
4141
42-
meta: 本站由 :PLATFORM 生成，采用 :THEME 主题。
42+
meta: 本站采用 :PLATFORM 主题 :THEME
4343

4444
not_found:
4545
statment: 抱歉，我们放错了该 URL，或者它指向了不存在的内容。

‎_includes/footer.html

+23-31
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,33 @@
22

33
<footer>
44
<div class="container pl-lg-4 pr-lg-4">
5-
<div class="d-flex justify-content-between align-items-center text-muted ml-md-3 mr-md-3">
6-
<div class="footer-left">
7-
<p class="mb-0">
8-
© {{ 'now' | date: '%Y' }}
9-
<a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>.
10-
{% if site.data.locales[include.lang].copyright.brief %}
11-
<span
12-
data-toggle="tooltip"
13-
data-placement="top"
14-
title="{{ site.data.locales[include.lang].copyright.verbose }}"
15-
>
16-
{{- site.data.locales[include.lang].copyright.brief -}}
17-
</span>
18-
{% endif %}
19-
</p>
20-
</div>
21-
22-
<div class="footer-right">
23-
<p class="mb-0">
24-
{%- capture _platform -%}
5+
<div class="d-flex justify-content-center align-items-center text-muted ml-md-3 mr-md-3">
6+
<p>
7+
{%- capture _platform -%}
258
<a href="https://jekyllrb.com" target="_blank" rel="noopener">Jekyll</a>
26-
{%- endcapture -%}
9+
{%- endcapture -%}
2710

28-
{%- capture _theme -%}
11+
{%- capture _theme -%}
2912
<a href="https://github.com/cotes2020/jekyll-theme-chirpy" target="_blank" rel="noopener">Chirpy</a>
30-
{%- endcapture -%}
13+
{%- endcapture -%}
14+
15+
{{ site.data.locales[include.lang].meta | replace: ':PLATFORM', _platform | replace: ':THEME', _theme }}
16+
</p>
3117

32-
{{
33-
site.data.locales[include.lang].meta
34-
| default: 'Using the :PLATFORM theme :THEME.'
35-
| replace: ':PLATFORM', _platform
36-
| replace: ':THEME', _theme
37-
}}
38-
</p>
39-
</div>
18+
<p>
19+
{{- '©' }}
20+
{{ 'now' | date: '%Y' }}
21+
<a href="{{ site.social.links[0] }}">{{ site.social.name }}</a>.
22+
{% if site.data.locales[include.lang].copyright.brief %}
23+
<span
24+
data-toggle="tooltip"
25+
data-placement="top"
26+
title="{{ site.data.locales[include.lang].copyright.verbose }}"
27+
>
28+
{{- site.data.locales[include.lang].copyright.brief -}}
29+
</span>
30+
{% endif %}
31+
</p>
4032
</div>
4133
</div>
4234
</footer>

‎_sass/addon/commons.scss

+31-23
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,7 @@ footer {
194194
line-height: 1.2rem;
195195
padding-bottom: 1rem;
196196
border-top: 1px solid var(--main-border-color);
197-
198-
> div {
199-
width: 350px;
200-
}
197+
flex-wrap: wrap;
201198
}
202199

203200
a {
@@ -213,8 +210,10 @@ footer {
213210
}
214211
}
215212

216-
.footer-right {
217-
text-align: right;
213+
p {
214+
width: 100%;
215+
text-align: center;
216+
margin-bottom: 0;
218217
}
219218
}
220219

@@ -1185,7 +1184,7 @@ $btn-mb: 0.5rem;
11851184
#main-wrapper {
11861185
background-color: var(--main-bg);
11871186
position: relative;
1188-
min-height: calc(100vh - #{$footer-height});
1187+
min-height: calc(100vh - $footer-height-mobile);
11891188

11901189
@include pl-pr(0);
11911190
}
@@ -1294,22 +1293,6 @@ $btn-mb: 0.5rem;
12941293
*/
12951294

12961295
@media all and (max-width: 576px) {
1297-
footer {
1298-
height: $footer-height-mobile;
1299-
1300-
div.d-flex {
1301-
padding: 1.5rem 0;
1302-
line-height: 1.65;
1303-
flex-wrap: wrap;
1304-
justify-content: space-around !important;
1305-
}
1306-
1307-
.footer-left,
1308-
.footer-right {
1309-
text-align: center;
1310-
}
1311-
}
1312-
13131296
#main-wrapper {
13141297
min-height: calc(100vh - #{$footer-height-mobile});
13151298
}
@@ -1369,6 +1352,14 @@ $btn-mb: 0.5rem;
13691352

13701353
footer {
13711354
@include slide;
1355+
1356+
height: $footer-height-mobile;
1357+
1358+
div.d-flex {
1359+
padding: 1.5rem 0;
1360+
line-height: 1.65;
1361+
flex-wrap: wrap;
1362+
}
13721363
}
13731364

13741365
[#{$sidebar-display}] {
@@ -1470,6 +1461,23 @@ $btn-mb: 0.5rem;
14701461
margin-left: $sidebar-width;
14711462
}
14721463

1464+
#main-wrapper {
1465+
min-height: calc(100vh - $footer-height);
1466+
}
1467+
1468+
footer {
1469+
p {
1470+
width: auto;
1471+
&:last-child {
1472+
&::before {
1473+
content: '-';
1474+
margin: 0 0.75rem;
1475+
opacity: 0.8;
1476+
}
1477+
}
1478+
}
1479+
}
1480+
14731481
#sidebar {
14741482
.profile-wrapper {
14751483
margin-top: 3rem;

‎_sass/addon/variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $sidebar-width-large: 300px !default; /* screen width: >= 1650px */
1212
$topbar-height: 3rem !default;
1313
$search-max-width: 210px !default;
1414
$footer-height: 5rem !default;
15-
$footer-height-mobile: 6rem !default; /* screen width: <= 576px */
15+
$footer-height-mobile: 6rem !default; /* screen width: < 850px */
1616
$main-content-max-width: 1250px !default;
1717
$bottom-min-height: 35rem !default;
1818
$base-radius: 0.5rem;

0 commit comments

Comments
 (0)