From 5b6a8fed0d3263ace27aabbdfbdb85bdad7c8127 Mon Sep 17 00:00:00 2001 From: Librahang <245462755@qq.com> Date: Tue, 31 Dec 2019 21:44:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=9A=90=E8=97=8Fversions=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8B=E8=BD=BD=E9=A1=B5=E9=9D=A2=203.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BB=A3=E7=A0=81=E4=BB=93=E5=BA=93=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.toml | 79 +++---------------- i18n/en.toml | 18 +++++ i18n/zh.toml | 19 +++++ themes/project/layouts/download/list.html | 84 +++++---------------- themes/project/layouts/partials/cards.html | 4 +- themes/project/layouts/partials/nav.html | 30 ++++++++ themes/project/static/css/custom.css | 27 ++++++- themes/project/static/css/style.blue.css | 4 + themes/project/static/img/gitee-logo.ico | Bin 0 -> 41566 bytes 9 files changed, 128 insertions(+), 137 deletions(-) create mode 100644 themes/project/static/img/gitee-logo.ico diff --git a/config.toml b/config.toml index 3f055de..7ee882f 100644 --- a/config.toml +++ b/config.toml @@ -30,32 +30,6 @@ paginate = 10 url = "/en" weight = 1 -# [[menu.main]] -# identifier = "user" -# name = "User" -# url = "/en/introduction.html" -# weight = 2 -# -# [[menu.main]] -# identifier = "intro" -# name = "Brief Introduction" -# url = "/en/introduction.html" -# parent = "user" -# weight = 1 -# -# [[menu.main]] -# identifier = "story" -# name = "User Story" -# url = "/en/story.html" -# parent = "user" -# weight = 2 -# [[menu.main]] -# identifier = "contribution" -# name = "Contribution" -# url = "/en/contribution.html" -# weight = 1 -# parent = "developer" - [[menu.main]] identifier = "community" name = "Community" @@ -124,11 +98,11 @@ paginate = 10 url = "/en/news.html" weight = 1 -[[menu.main]] - identifier = "versions" - name = "Versions" - url = "/en/versions.html" - weight = 4 +#[[menu.main]] +# identifier = "versions" +# name = "Versions" +# url = "/en/versions.html" +# weight = 4 [[menu.main]] identifier = "docs" @@ -140,7 +114,7 @@ paginate = 10 [[menu.main]] identifier = "download" name = "Download" - url = "/en/building/download.html" + url = "/en/download.html" weight = 6 [[menu.main]] @@ -161,35 +135,6 @@ paginate = 10 url = "/zh" weight = 1 -# [[languages.zh.menu.main]] -# identifier = "user" -# name = "用户" -# url = "/zh/introduction.html" -# weight = 2 -# -# [[languages.zh.menu.main]] -# identifier = "intro" -# name = "软件介绍" -# url = "/zh/introduction.html" -# parent = "user" -# weight = 1 -# -# [[languages.zh.menu.main]] -# identifier = "story" -# name = "用户故事" -# url = "/zh/story.html" -# parent = "user" -# weight = 2 - - - -# [[languages.zh.menu.main]] -# identifier = "contribution" -# name = "如何贡献" -# url = "/zh/contribution.html" -# weight = 1 -# parent = "developer" - [[languages.zh.menu.main]] identifier = "community" name = "社区" @@ -260,11 +205,11 @@ paginate = 10 url = "/zh/news.html" weight = 2 -[[languages.zh.menu.main]] - identifier = "versions" - name = "版本" - url = "/zh/versions.html" - weight = 4 +#[[languages.zh.menu.main]] +# identifier = "versions" +# name = "版本" +# url = "/zh/versions.html" +# weight = 4 [[languages.zh.menu.main]] identifier = "docs" @@ -312,7 +257,7 @@ paginate = 10 [[languages.zh.menu.main]] identifier = "download" name = "下载" - url = "/zh/building/download.html" + url = "/zh/download.html" weight = 6 [[languages.zh.menu.main]] diff --git a/i18n/en.toml b/i18n/en.toml index 60f77fd..2875bb0 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -20,6 +20,15 @@ other = "openEuler builds an innovative platform and a unified and open OS that [main_cards_title_second] other = "iSula" +[main_cards_title_enter_repository] +other = ">>More" + +[main_nav_repository] +other = "Repository" + +[main_nav_packageSources] +other = "Package Sources" + [main_cards_description_second] other = "A cloud-native lightweight container solution that can meet the needs of device, edge, and cloud scenarios in ICT domain with a unified and flexible architecture." @@ -80,3 +89,12 @@ other = "Back to Home" [docs_nav_menu_name] other = "MENU" + +[download_title] +other = "Download ISO" + +[download_issues] +other = "Submit issues: " + +[download_iso_button] +other = "Get openEuler ISO" diff --git a/i18n/zh.toml b/i18n/zh.toml index b84c893..de03f02 100644 --- a/i18n/zh.toml +++ b/i18n/zh.toml @@ -20,6 +20,15 @@ other = "openEuler通过社区合作，打造创新平台，构建支持多处 [main_cards_title_second] other = "iSula" +[main_cards_title_enter_repository] +other = ">>更多" + +[main_nav_repository] +other = "代码仓" + +[main_nav_packageSources] +other = "软件包仓" + [main_cards_description_second] other = "iSula是一种云原生轻量级容器解决方案，可通过统一、灵活的架构满足ICT领域端、边、云场景的多种需求。" @@ -79,3 +88,13 @@ other = "返回首页" [docs_nav_menu_name] other = "目录" + +[download_title] +other = "下载ISO" + +[download_issues] +other = "如果您遇到问题，请在此提交问题：" + +[download_iso_button] +other = "下载openEuler ISO" + diff --git a/themes/project/layouts/download/list.html b/themes/project/layouts/download/list.html index 1debb79..b7b4fc0 100644 --- a/themes/project/layouts/download/list.html +++ b/themes/project/layouts/download/list.html @@ -1,82 +1,35 @@ - - {{ partial "head.html" . }} - - - +{{ partial "head.html" . }} +
-
- - {{ partial "nav.html" . }} - + {{ partial "nav.html" . }}
- - {{ partial "breadcrumbs.html" . }} - + {{ partial "breadcrumbs.html" . }} +
- - -
- - {{ $paginator := .Paginate (where .Data.Pages "Type" "download") }} - {{ range $paginator.Pages }} -
-
-
-

{{ .Content }}

-

{{ i18n "downloadImage" }} -

-
+
+
+
+

{{ i18n "download_title"}}

+
{{ i18n "download_issues"}}
+
https://gitee.com/openeuler/community-issue
-
-
- {{ end }} - - +
+ +
+
+
- - - - - -
- - - - {{ partial "sidebar.html" (dict "context" . "downloadPage" "true") }} - - - -
- - - -
- - {{ partial "footer.html" . }} @@ -84,5 +37,8 @@ {{ partial "scripts.html" . }} - + + + + diff --git a/themes/project/layouts/partials/cards.html b/themes/project/layouts/partials/cards.html index 08a45c8..f7f9c5b 100644 --- a/themes/project/layouts/partials/cards.html +++ b/themes/project/layouts/partials/cards.html @@ -25,14 +25,14 @@
-

{{ i18n "main_cards_title_second" }}

+

{{ i18n "main_cards_title_second" }} {{ i18n "main_cards_title_enter_repository"}}

{{ i18n "main_cards_description_second" }}

-

{{ i18n "main_cards_title_third" }}

+

{{ i18n "main_cards_title_third" }} {{ i18n "main_cards_title_enter_repository"}}

{{ i18n "main_cards_description_third" }}

diff --git a/themes/project/layouts/partials/nav.html b/themes/project/layouts/partials/nav.html index 3409a0e..cc911eb 100644 --- a/themes/project/layouts/partials/nav.html +++ b/themes/project/layouts/partials/nav.html @@ -41,6 +41,18 @@ {{ end }} {{ end }} {{ end }} +

+ +

+ +

@@ -76,6 +88,7 @@ {{ $isChildren = true }} {{ end }} {{ end }} + {{ if ne .Identifier "lang" }}
  • {{ if .HasChildren }} @@ -91,6 +104,23 @@ {{ end }}
    • {{ end }} + {{ if eq .Identifier "lang" }} +
  • + {{ .Name }} +
    • + {{ end }} + {{ end }} +
  • + + +
    • + + + diff --git a/themes/project/static/css/custom.css b/themes/project/static/css/custom.css index c644abd..07166fd 100644 --- a/themes/project/static/css/custom.css +++ b/themes/project/static/css/custom.css @@ -94,9 +94,6 @@ position: relative; top: -160px; line-height: 120%; - /* margin-left: 0; */ - /* margin-right: 0 !important; */ - /* text-align: center; */ width: 100%; } @@ -144,6 +141,9 @@ font-size: 20px !important; top: -40px; } + .wrapper>div>div>p:nth-child(1)>a { + font-size: 10px !important; + } .wrapper>div>div>p:nth-child(2) { font-size: 12px !important; top: -30px; @@ -1078,4 +1078,23 @@ html,body { .cards a{ width:25%; } - +#downloadBlock{ + border-radius:10px; + border:1px solid rgba(221,221,221,2); + min-height:290px; +} +.downloadButtonBlock{ + width:100%; + height:70px; + background-color:rgba(242,242,242,2.5); + text-align: center; +} +.downloadContentBlock{ + min-height:220px; + text-align: left; + padding:10px; + padding-left:40px; +} +.downloadWholeBlock{ + margin-bottom: 30px; +} diff --git a/themes/project/static/css/style.blue.css b/themes/project/static/css/style.blue.css index c738447..0e17f50 100644 --- a/themes/project/static/css/style.blue.css +++ b/themes/project/static/css/style.blue.css @@ -523,6 +523,10 @@ body.boxed .navbar-affixed-top.affix { line-height: 1.42857143; border-radius: 0; } +.btn-download { + text-transform: none; + margin-top:15px; +} .input-group .btn { font-size: 14px; } diff --git a/themes/project/static/img/gitee-logo.ico b/themes/project/static/img/gitee-logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..74846e716fcc9d60026bc3e738922b3083552e5f GIT binary patch literal 41566 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