From cdf24cb159390e68933e84800bd2d59327d85000 Mon Sep 17 00:00:00 2001 From: liuboaibc Date: Tue, 23 Jun 2020 14:34:50 +0800 Subject: [PATCH] update header --- assets/scss/common.scss | 4 +++ assets/scss/content.scss | 3 +-- assets/scss/header.scss | 44 +++++++++++++++++++++++++++---- config/upstream-zh/config.toml | 1 + layouts/404.html | 6 ++--- layouts/_default/baseof.html | 2 +- layouts/_default/scenario.html | 12 ++++----- layouts/blogs/list.html | 2 +- layouts/blogs/single.html | 2 +- layouts/case/list.html | 8 +++--- layouts/case/single.html | 8 +++--- layouts/conferences/list.html | 6 ++--- layouts/conferences/single.html | 2 +- layouts/contribution/list.html | 22 ++++++++-------- layouts/contribution/request.html | 2 +- layouts/docs/list.html | 2 +- layouts/docs/single.html | 2 +- layouts/index.html | 38 +++++++++++++------------- layouts/partials/footer.html | 8 +++--- layouts/partials/header.html | 30 ++++++++++++++++----- layouts/partials/openSource.html | 2 +- layouts/partner/list.html | 16 +++++------ layouts/partner/request.html | 14 +++++----- layouts/projects/list.html | 2 +- layouts/videos/list.html | 2 +- static/images/header/close.svg | 5 ++++ 26 files changed, 153 insertions(+), 92 deletions(-) create mode 100644 static/images/header/close.svg diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 3bd1de527..bb0a2ff41 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -23,6 +23,10 @@ section { } } +.padding { + padding-top: 40px; +} + .common-layout { width: 1160px; margin: 0 auto; diff --git a/assets/scss/content.scss b/assets/scss/content.scss index 8f1da5419..ef52fbdea 100644 --- a/assets/scss/content.scss +++ b/assets/scss/content.scss @@ -6,10 +6,9 @@ } .main-section { - padding-top: 93px; - & > div { position: relative; + padding-top: 93px; .breadcrumb { margin: 30px 0; diff --git a/assets/scss/header.scss b/assets/scss/header.scss index 17876dfba..2170faf69 100644 --- a/assets/scss/header.scss +++ b/assets/scss/header.scss @@ -5,17 +5,51 @@ top: 0; left: 0; right: 0; - height: 93px; color: #ffffff; border-bottom: 1px solid rgba($color: #e3e9ef, $alpha: 0.4); background-image: linear-gradient(to top, rgba(23, 188, 133, 0.18), rgba(0, 169, 113, 0.18)); + + .join-div { + padding: 10px 0; + background-image: linear-gradient(to left, #e7d44e 100%, #ecaf24 0%); + .content { + position: relative; + width: 900px; + margin: 0 auto; + text-align: center; + line-height: 20px; + font-size: 12px; + font-weight: 600; + color: #3d3e49; + @media only screen and (max-width: $mobile-max-width) { + box-sizing: border-box; + width: 100%; + padding: 0 40px; + } - @media only screen and (max-width: $mobile-max-width) { - height: 74px; + a { + color: #3d3e49; + + &:hover { + color: #55bc8a; + } + } + + img { + position: absolute; + top: 50%; + right: 10px; + transform: translateY(-50%); + cursor: pointer; + } + } } - .common-layout { - height: 100%; + & > .common-layout { + height: 93px; + @media only screen and (max-width: $mobile-max-width) { + height: 74px; + } } .header-container { diff --git a/config/upstream-zh/config.toml b/config/upstream-zh/config.toml index d1438f54b..360a50552 100644 --- a/config/upstream-zh/config.toml +++ b/config/upstream-zh/config.toml @@ -1 +1,2 @@ baseURL = "https://kubesphere.com.cn" +defaultContentLanguage = "zh" \ No newline at end of file diff --git a/layouts/404.html b/layouts/404.html index 1fe92e336..130a2d21a 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,9 +1,9 @@ {{ define "main" }}
- icon - background image + icon + background image
- 404 image + 404 image

{{ i18n "We can’t find the page that you’re looking for :(" }}

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 07631fbed..31fb78714 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,7 +4,7 @@ {{- partial "header.html" . -}} -
+
{{- block "main" . }}{{- end }}
{{- partial "footer.html" . -}} diff --git a/layouts/_default/scenario.html b/layouts/_default/scenario.html index 20bef2049..a2c552b4c 100644 --- a/layouts/_default/scenario.html +++ b/layouts/_default/scenario.html @@ -9,9 +9,9 @@ {{ end }}
- {{ .Title }} + {{ .Title }} {{ if .Params.bg }} - + {{ end }}
@@ -35,7 +35,7 @@ {{ end }}
- {{ .title }} + {{ .title }} {{ end }} @@ -45,8 +45,8 @@
{{ with .Params.section3 }} - {{ i18n - {{ i18n + {{ i18n + {{ i18n

{{ .title }}

{{ if .videoLink }} @@ -60,7 +60,7 @@ allowfullscreen> {{ else }} - + {{ end }}

{{ .content }}

 diff --git a/layouts/blogs/list.html b/layouts/blogs/list.html index 2f247ec4e..4466a77ef 100644 --- a/layouts/blogs/list.html +++ b/layouts/blogs/list.html @@ -17,7 +17,7 @@ {{ range .Data.Pages }}
  • - {{ .Title }} + {{ .Title }}

    {{ .Params.createTime }}

    diff --git a/layouts/blogs/single.html b/layouts/blogs/single.html index be762fce6..c209ea7c9 100644 --- a/layouts/blogs/single.html +++ b/layouts/blogs/single.html @@ -10,7 +10,7 @@ {{- partial "header.html" . -}} -
    +
    {{ i18n "introduction1"}} > diff --git a/layouts/case/list.html b/layouts/case/list.html index 0787999a1..329a2fa14 100644 --- a/layouts/case/list.html +++ b/layouts/case/list.html @@ -15,7 +15,7 @@
      {{ range .caseList }}
    • - {{ .content }} + {{ .content }}

      {{ .content }}

      {{ $tip }} @@ -23,7 +23,7 @@
      • {{ end }}
    - {{ i18n + {{ i18n {{ end }}
    @@ -42,7 +42,7 @@ {{ $name := .name }} {{ range .children }}
  • - {{ .name }} + {{ .name }}
    • {{ end }} {{ end }} @@ -51,7 +51,7 @@

    {{ .content }} {{ .linkContent }}

    {{ end }}
    - {{ i18n + {{ i18n {{ end }}
    • \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 7ad9df8af..181bdb230 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,9 +1,18 @@
    + {{ if eq .Site.Language.Lang "zh"}} +
    +
    + 👏 6 月 30 日 KubeSphere 3.0 发布会！带你一键解锁容器混合云！ + 免费报名线上直播 → + close +
    +
    + {{ end }}
    - +
      @@ -49,7 +58,7 @@
      • - + {{ .Site.Language.LanguageName }}
          @@ -74,7 +83,7 @@
        • - +
    @@ -118,13 +127,13 @@
    - + - + - +
    @@ -179,6 +188,15 @@ var bindClickModalLi = function() { }) } +var bindClickClose = function() { + $('#close-join').click(function() { + $('.navigation .join-div').hide() + $('.main-section').removeClass('padding') + }) +} + +bindClickClose() + bindScrollChangeHeader() bindNavMouseEvent('.header-container .menu-li') diff --git a/layouts/partials/openSource.html b/layouts/partials/openSource.html index b289f6039..52895df1e 100644 --- a/layouts/partials/openSource.html +++ b/layouts/partials/openSource.html @@ -20,7 +20,7 @@ {{ $menus := (index .Site.Menus.main 1).Children }} {{ range $menus }}
  • - {{ .Name }} + {{ .Name }}
    • {{ end }} diff --git a/layouts/partner/list.html b/layouts/partner/list.html index da6fdb702..8a684c867 100644 --- a/layouts/partner/list.html +++ b/layouts/partner/list.html @@ -15,32 +15,32 @@
    {{ .title }}

    {{ .content }}

    - {{ i18n - {{ i18n + {{ i18n + {{ i18n
    - {{ .title }} + {{ .title }}

    {{ .name1 }}

    - {{ .name1 }} + {{ .name1 }}

    {{ .name2 }}

    - {{ .name2 }} + {{ .name2 }}

    {{ .name3 }}

    - {{ .name3 }} + {{ .name3 }}
    - {{ i18n + {{ i18n {{ end }}
    @@ -71,7 +71,7 @@