From 1631bc295d7f30dde985aaeed176911706f7c488 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 20 Apr 2024 14:33:01 +0300 Subject: [PATCH 1/6] feat: upgrade theme --- go.mod | 5 ++--- go.sum | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 1000f68..295f845 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/google/docsy-example go 1.12 require ( - github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f // indirect - github.com/google/docsy v0.5.1 // indirect - github.com/twbs/bootstrap v4.6.2+incompatible // indirect + github.com/google/docsy v0.9.1 // indirect + github.com/google/docsy/dependencies v0.5.1 // indirect ) diff --git a/go.sum b/go.sum index 796b137..46e1425 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,8 @@ -github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f h1:bvkUptSRPZBr3Kxuk+bnWCEmQ5MtEJX5fjezyV0bC3g= github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= -github.com/google/docsy v0.5.1 h1:D/ZdFKiE29xM/gwPwQzmkyXhcbQGkReRS6aGrF7lnYk= -github.com/google/docsy v0.5.1/go.mod h1:maoUAQU5H/d+FrZIB4xg1EVWAx7RyFMGSDJyWghm31E= +github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= +github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984= +github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U= +github.com/google/docsy/dependencies v0.5.1 h1:JVVLjnjC5i7GN2ZXKJ0QDa8UY71JMoqkeKK8CS6R/C4= github.com/google/docsy/dependencies v0.5.1/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE= -github.com/twbs/bootstrap v4.6.2+incompatible h1:TDa+R51BTiy1wEHSYjmqDb8LxNl/zaEjAOpRE9Hwh/o= github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= +github.com/twbs/bootstrap v5.2.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= -- 2.42.0 From 74853440a183dfa7172c64e210429a183bc4a7df Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 20 Apr 2024 15:02:09 +0300 Subject: [PATCH 2/6] fix(bs): upgrade carousel --- content/en/_index.html | 30 +++++++++++++++--------------- content/ru/_index.html | 30 ++++++++++++++---------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/content/en/_index.html b/content/en/_index.html index 1f03327..26b3548 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -8,7 +8,7 @@ linkTitle = "SelfPrivacy"
-
diff --git a/content/ru/_index.html b/content/ru/_index.html index d1762a8..900a199 100644 --- a/content/ru/_index.html +++ b/content/ru/_index.html @@ -8,7 +8,7 @@ linkTitle = "SelfPrivacy"
-
-- 2.42.0 From ed411ab23594c130e5ad5f057ca3b5b70019b068 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 20 Apr 2024 15:11:45 +0300 Subject: [PATCH 3/6] fix(bs): lang selector --- layouts/partials/navbar-lang-selector.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/layouts/partials/navbar-lang-selector.html b/layouts/partials/navbar-lang-selector.html index 33eca94..12fa215 100644 --- a/layouts/partials/navbar-lang-selector.html +++ b/layouts/partials/navbar-lang-selector.html @@ -1,10 +1,12 @@ {{/* Link directly to documentation etc., if possible. */}} {{ $langPage := cond (gt (len .Translations) 0) . .Site.Home }} - -
- {{ range $langPage.AllTranslations }} - {{ .Language.LanguageName }} - {{ end }} +
+ +
\ No newline at end of file -- 2.42.0 From cbaf922ff855b87370de0cc9db819317a1fc7a1e Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 20 Apr 2024 18:30:05 +0300 Subject: [PATCH 4/6] fix(bs): upgrade to new defaults --- assets/scss/_styles_project.scss | 6 +++++- layouts/partials/footer.html | 2 +- layouts/partials/navbar-lang-selector.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 84c0d5f..4eb4eef 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -119,7 +119,7 @@ a.nav-link.sp-coming-soon { } } -html, body { +html { max-width: 100%; overflow-x: hidden; } @@ -128,6 +128,10 @@ body { background-color: $bg-color; } +a, a.btn-link { + text-decoration: none; +} + .sp-advantages { row-gap: 0px; } diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index a77b83c..f2f8f3b 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,7 +1,7 @@ {{ $links := .Site.Params.links }}
-
+
    {{ range $langPage.AllTranslations }} -- 2.42.0 From df204d424a5528dc6e7373d16f135f995c1df3b0 Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 20 Apr 2024 18:57:25 +0300 Subject: [PATCH 5/6] fix: optimize svg --- content/en/coolhack3r.svg | 2 +- content/en/zerotrust.svg | 99 +-------------------------------------- content/ru/coolhack3r.svg | 2 +- content/ru/zerotrust.svg | 99 +-------------------------------------- 4 files changed, 6 insertions(+), 196 deletions(-) diff --git a/content/en/coolhack3r.svg b/content/en/coolhack3r.svg index 36adc5e..3261614 100755 --- a/content/en/coolhack3r.svg +++ b/content/en/coolhack3r.svg @@ -1,2 +1,2 @@ - + diff --git a/content/en/zerotrust.svg b/content/en/zerotrust.svg index 4d05618..8283884 100755 --- a/content/en/zerotrust.svg +++ b/content/en/zerotrust.svg @@ -1,97 +1,2 @@ - - + + diff --git a/content/ru/coolhack3r.svg b/content/ru/coolhack3r.svg index 36adc5e..3261614 100755 --- a/content/ru/coolhack3r.svg +++ b/content/ru/coolhack3r.svg @@ -1,2 +1,2 @@ - + diff --git a/content/ru/zerotrust.svg b/content/ru/zerotrust.svg index 4d05618..8283884 100755 --- a/content/ru/zerotrust.svg +++ b/content/ru/zerotrust.svg @@ -1,97 +1,2 @@ - - + + -- 2.42.0 From 3b1ae9321c542b87146815e930d0817353d6a54b Mon Sep 17 00:00:00 2001 From: nevfy Date: Sat, 20 Apr 2024 20:15:12 +0300 Subject: [PATCH 6/6] fix(bs): download --- content/en/download/_index.html | 20 +++--- content/ru/download/_index.html | 104 ++++++++++++++------------------ 2 files changed, 54 insertions(+), 70 deletions(-) diff --git a/content/en/download/_index.html b/content/en/download/_index.html index 4562398..1cda708 100644 --- a/content/en/download/_index.html +++ b/content/en/download/_index.html @@ -2,8 +2,6 @@ title: Downloads --- - - {{< blocks/lead >}}

    Downloads

    @@ -12,7 +10,6 @@ title: Downloads

    Get the latest version of SelfPrivacy app for your operating system.

    - {{< /blocks/lead >}} {{< blocks/section color="white" type="section" >}} @@ -23,26 +20,25 @@ title: Downloads
    - + F-Droid - + Our F-Droid repository
    - + APK File
    - + Google Play
    - {{< /blocks/section >}} {{< blocks/section color="white" type="section" >}} @@ -63,17 +59,17 @@ title: Downloads
    - + Windows
    - + GNU/Linux
    - + MacOS
    @@ -84,7 +80,7 @@ title: Downloads {{< blocks/section type="section" >}} {{< landing-feature book "What to do next?" "right" >}} - }}"> + }}"> Setup guide {{< /landing-feature >}} diff --git a/content/ru/download/_index.html b/content/ru/download/_index.html index 17c2a0f..7e35a21 100644 --- a/content/ru/download/_index.html +++ b/content/ru/download/_index.html @@ -2,8 +2,6 @@ title: Скачать --- - - {{< blocks/lead>}}

    Загрузки

    @@ -23,86 +21,76 @@ title: Скачать
    - F-Droid
    - APK файл
    - Google Play
    - Наш F-Droid репозиторий
    - - {{< /blocks/section>}} - {{< blocks/section color="white" type="section">}} -
    -

    iOS

    -
    - -
    -

    Ждите скоро...

    -
    - - {{< /blocks/section>}} - - {{< blocks/section type="section" color="dark">}} -
    -

    Компьютер

    + {{< blocks/section color="white" type="section">}} +
    +

    iOS

    +
    +
    +

    Ждите скоро...

    +
    + {{< /blocks/section>}} + {{< blocks/section type="section" color="dark">}} +
    +

    Компьютер

    +
    +
    +
    + + Windows +
    - -
    -
    - - Windows - -
    -
    - - GNU/Linux - -
    -
    - - MacOS - -
    +
    + + GNU/Linux +
    - - {{< /blocks/section>}} - - {{< blocks/section type="section">}} - - {{< landing-feature book "Что делать дальше то?" "right">}} - }}"> - Гайд по установке - - {{< /landing-feature>}} - - {{< /blocks/section>}} +
    + + MacOS + +
    +
    + {{< /blocks/section>}} + {{< blocks/section type="section">}} + {{< landing-feature book "Что делать дальше то?" "right">}} + }}"> + Гайд по установке + + {{< /landing-feature>}} + {{< /blocks/section>}} -- 2.42.0