diff --git a/web/flamenco-io-site/config.toml b/web/flamenco-io-site/config.toml index 3d405863..3fbd8a76 100644 --- a/web/flamenco-io-site/config.toml +++ b/web/flamenco-io-site/config.toml @@ -113,5 +113,5 @@ enableRobotsTXT = true # (Optional, default none) Adds a "Content licensed under " line to the footer. # Could be used if you want to define a default license for your content. [params.geekdocContentLicense] - name = "CC BY-SA 4.0" - link = "https://creativecommons.org/licenses/by-sa/4.0/" + name = "CC BY 4.0" + link = "https://creativecommons.org/licenses/by/4.0/" diff --git a/web/flamenco-io-site/content/_index.md b/web/flamenco-io-site/content/_index.md index 1f927f0c..53d59db6 100644 --- a/web/flamenco-io-site/content/_index.md +++ b/web/flamenco-io-site/content/_index.md @@ -1,49 +1,77 @@ --- -title: "Flamenco 3" geekdocNav: false -geekdocAlign: center +geekdocAlign: left geekdocAnchor: false geekdocBreadcrumb: false --- +{{< columns >}} + +# Free & Open Source
Render Management + Take control of your computing infrastructure and get things done.
-Flamenco is used in production at Blender Institute. +Flamenco is used in production at [Blender Studio](https://studio.blender.org). **Disclaimer:** this site describes Flamenco 3, which is still under heavy -development. For information on its predecessor, see [Flamenco 2][F2]. +development. For information on its predecessor, see [Flamenco 2](/v2/). {{< button size="large" relref="usage/getting-started/" >}}Getting Started{{< /button >}} +<---> + +![Flamenco Screenshot](/images/flamenco_screenshot_01.webp) + +{{}} + ## Feature overview {{< columns >}} -### Free and Private +### Free and Open Source -Flamenco runs on your own hardware.
+Released under GPL 3.0, every component of Flamenco is Free and Open Source +software. Development is supported by the Blender project. + +<---> + +### Simple and Portable + +Flamenco consists of a few components and requires almost no configuration +to be used in production. + +<---> + +### Easy Customization + +Designed to be customizable, Flamenco allows TDs to specify +Job Types using the JavaScript language and seamlessly fit into the pipeline. + +{{< /columns >}} + +{{< columns >}} + +### Cross-platform and Self-hosted + +Flamenco runs on all major operating system, and is fully hosted on your own hardware. Your data is yours, and yours alone. <---> -### Simple +### Robust Technology -Flamenco v3 is the simplest version of Flamenco so far, consisting of less -components, and requiring less configuration, than any of its predecessors. +The core of Flamenco is build using Go and SQLite. Check out the sources on +[developer.blender.org](https://developer.blender.org/project/profile/58/). <---> -### Easy customization +### In Development -The available job types, and how these are turned into concrete tasks for -Workers, are all defined in JavaScript.
-Designed to customise to your specific needs. +Getting close to Beta release, Flamenco v3 is in active development at Blender +Studio. Join [the chat](https://blender.chat/channel/flamenco) to see what's happening! {{< /columns >}} -Released under GPL 3.0, every component of Flamenco is Free and Open Source -software. We use Go and SQLite, and host the sources on -[developer.blender.org](https://developer.blender.org/project/profile/58/) ------------------- diff --git a/web/flamenco-io-site/data/menu/extra.yaml b/web/flamenco-io-site/data/menu/extra.yaml new file mode 100644 index 00000000..c4ac1749 --- /dev/null +++ b/web/flamenco-io-site/data/menu/extra.yaml @@ -0,0 +1,8 @@ +--- +header: + - name: Getting Started + ref: /usage/getting-started + external: false + - name: Development + ref: /development + external: false diff --git a/web/flamenco-io-site/layouts/partials/menu-extra.html b/web/flamenco-io-site/layouts/partials/menu-extra.html new file mode 100644 index 00000000..1b16ea48 --- /dev/null +++ b/web/flamenco-io-site/layouts/partials/menu-extra.html @@ -0,0 +1,46 @@ +{{ $current := .current }} +{{ template "menu-extra" dict "sect" .source "current" $current "site" $current.Site "target" .target }} + + + +{{ define "menu-extra" }} + {{ $current := .current }} + {{ $site := .site }} + {{ $target := .target }} + {{ $sect := .sect }} + + {{ range sort (default (seq 0) $sect) "weight" }} + {{ if isset . "ref" }} + {{ $this := $site.GetPage .ref }} + {{ $isCurrent := eq $current $this }} + {{ $icon := default false .icon }} + + {{ $name := .name }} + {{ if reflect.IsMap .name }} + {{ $name = (index .name $site.Language.Lang) }} + {{ end }} + + {{ if eq $target "header" }} + + + {{ if .icon }} + + {{ $name }} + + + {{ else }} + {{ $name }} + {{ end }} + + + {{ end }} + {{ end }} + {{ end }} +{{ end }} diff --git a/web/flamenco-io-site/layouts/partials/site-footer.html b/web/flamenco-io-site/layouts/partials/site-footer.html new file mode 100644 index 00000000..adfd730f --- /dev/null +++ b/web/flamenco-io-site/layouts/partials/site-footer.html @@ -0,0 +1,42 @@ + diff --git a/web/flamenco-io-site/static/brand.svg b/web/flamenco-io-site/static/brand.svg index 26175b72..d4db8c0a 100644 --- a/web/flamenco-io-site/static/brand.svg +++ b/web/flamenco-io-site/static/brand.svg @@ -27,5 +27,5 @@ id="path1158" d="M -80.252426,22.923923 A 410.55118,410.55118 0 0 1 326.03894,437.29024 410.55118,410.55118 0 0 1 -87.926529,843.99002 410.55118,410.55118 0 0 1 -495.03432,430.4258 410.55118,410.55118 0 0 1 -81.871764,22.910384" /> diff --git a/web/flamenco-io-site/static/custom.css b/web/flamenco-io-site/static/custom.css index c00b9ac8..f3e9f968 100644 --- a/web/flamenco-io-site/static/custom.css +++ b/web/flamenco-io-site/static/custom.css @@ -1,87 +1,75 @@ /* Global customization */ +@font-face { + font-family: 'Heebo'; + src: url('fonts/Heebo-VariableFont_wght.woff'); + font-weight: normal; + font-style: normal; +} + :root { --code-max-height: 60rem; + --font-family: "Heebo",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Oxygen,Ubuntu,Cantarell,"Open Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji" } /* Light mode theming */ :root, :root[color-theme="light"] { - --header-background: #513c6b; - --header-font-color: #ffffff; + --header-background: none; + --header-font-color: #333; --body-background: #ffffff; --body-font-color: #343a40; --mark-color: #ffab00; - --button-background: #7d6897; - --button-border-color: #513c6b; + --button-background: #827bc6; + --button-border-color: #827bc6; - --link-color: #513c6b; - --link-color-visited: #c54e8a; - - --code-background: #f5f6f8; - --code-accent-color: #e3e7eb; - --code-accent-color-lite: #eff1f3; - --code-font-color: #5f5f5f; - - --code-copy-background: #f5f6f8; - --code-copy-font-color: #6b7784; - --code-copy-border-color: #adb4bc; - --code-copy-success-color: #a170e2; + --link-color: #8982c9; + --link-color-visited: #8982c9; --accent-color: #e9ecef; - --accent-color-lite: #f8f9fa; + --accent-color-lite: #ebedef; --control-icons: #b2bac1; --footer-background: #2f333e; --footer-font-color: #ffffff; - --footer-link-color: #ffcc5c; - --footer-link-color-visited: #ffcc5c; + --footer-link-color: #9f95e6; + --footer-link-color-visited: #9f95e6; } @media (prefers-color-scheme: light) { :root { - --header-background: #513c6b; - --header-font-color: #ffffff; + --header-background: none; + --header-font-color: #333; --body-background: #ffffff; --body-font-color: #343a40; --mark-color: #ffab00; - --button-background: #7d6897; - --button-border-color: #513c6b; + --button-background: #827bc6; + --button-border-color: #827bc6; - --link-color: #518169; - --link-color-visited: #c54e8a; - - --code-background: #f5f6f8; - --code-accent-color: #e3e7eb; - --code-accent-color-lite: #eff1f3; - --code-font-color: #5f5f5f; - - --code-copy-background: #f5f6f8; - --code-copy-font-color: #6b7784; - --code-copy-border-color: #adb4bc; - --code-copy-success-color: #a170e2; + --link-color: #8982c9; + --link-color-visited: #8982c9; --accent-color: #e9ecef; - --accent-color-lite: #f8f9fa; + --accent-color-lite: #ebedef; --control-icons: #b2bac1; --footer-background: #2f333e; --footer-font-color: #ffffff; - --footer-link-color: #ffcc5c; - --footer-link-color-visited: #ffcc5c; + --footer-link-color: #9f95e6; + --footer-link-color-visited: #9f95e6; } } /* Dark mode theming */ :root[color-theme="dark"] { - --header-background: #513c6b; + --header-background: none; --header-font-color: #ffffff; --body-background: #343a40; @@ -89,35 +77,25 @@ --mark-color: #ffab00; - --button-background: #7d6897; - --button-border-color: #513c6b; + --button-background: #827bc6; + --button-border-color: #827bc6; - --link-color: #a170e2; - --link-color-visited: #c27a9e; - - --code-background: #2f353a; - --code-accent-color: #262b2f; - --code-accent-color-lite: #2b3035; - --code-font-color: #b9b9b9; - - --code-copy-background: #343a40; - --code-copy-font-color: #6b7784; - --code-copy-border-color: #6b7784; - --code-copy-success-color: #37905c; + --link-color: #8982c9; + --link-color-visited: #8982c9; --accent-color: #2b3035; - --accent-color-lite: #2f353a; + --accent-color-lite: #3d454d; --control-icons: #b2bac1; --footer-background: #2f333e; --footer-font-color: #ffffff; - --footer-link-color: #ffcc5c; - --footer-link-color-visited: #ffcc5c; + --footer-link-color: #9f95e6; + --footer-link-color-visited: #9f95e6; } @media (prefers-color-scheme: dark) { :root { - --header-background: #513c6b; + --header-background: none; --header-font-color: #ffffff; --body-background: #343a40; @@ -125,30 +103,60 @@ --mark-color: #ffab00; - --button-background: #7d6897; - --button-border-color: #513c6b; + --button-background: #827bc6; + --button-border-color: #827bc6; - --link-color: #a170e2; - --link-color-visited: #c27a9e; - - --code-background: #2f353a; - --code-accent-color: #262b2f; - --code-accent-color-lite: #2b3035; - --code-font-color: #b9b9b9; - - --code-copy-background: #343a40; - --code-copy-font-color: #6b7784; - --code-copy-border-color: #6b7784; - --code-copy-success-color: #37905c; + --link-color: #8982c9; + --link-color-visited: #8982c9; --accent-color: #2b3035; - --accent-color-lite: #2f353a; + --accent-color-lite: #3d454d; --control-icons: #b2bac1; --footer-background: #2f333e; --footer-font-color: #ffffff; - --footer-link-color: #ffcc5c; - --footer-link-color-visited: #ffcc5c; + --footer-link-color: #9f95e6; + --footer-link-color-visited: #9f95e6; } } + + + +body { + font-family: var(--font-family); +} + + +.gdoc-header { + border-bottom: none; + font-family: var(--font-family); + font-weight: bold; +} + +.gdoc-button { + border-radius: 0.33rem; + background: var(--button-background); + border: var(--button-border-color) 1px solid; +} + +.gdoc-button a { + border-bottom: none; + color: #EEE !important; +} + +.gdoc-search__input { + background: none; +} + +.gdoc-page__header { + background: none; +} + +.gdoc-menu-header__items { + align-items: center; +} + +.gdoc-menu-header__items>span { + padding-left: 1rem; +} diff --git a/web/flamenco-io-site/static/favicon/favicon-16x16.png b/web/flamenco-io-site/static/favicon/favicon-16x16.png index c8af1dab..7da727f7 100644 Binary files a/web/flamenco-io-site/static/favicon/favicon-16x16.png and b/web/flamenco-io-site/static/favicon/favicon-16x16.png differ diff --git a/web/flamenco-io-site/static/favicon/favicon-32x32.png b/web/flamenco-io-site/static/favicon/favicon-32x32.png index 2afc6d10..30a250a0 100644 Binary files a/web/flamenco-io-site/static/favicon/favicon-32x32.png and b/web/flamenco-io-site/static/favicon/favicon-32x32.png differ diff --git a/web/flamenco-io-site/static/favicon/favicon.svg b/web/flamenco-io-site/static/favicon/favicon.svg index 26175b72..d4db8c0a 100644 --- a/web/flamenco-io-site/static/favicon/favicon.svg +++ b/web/flamenco-io-site/static/favicon/favicon.svg @@ -27,5 +27,5 @@ id="path1158" d="M -80.252426,22.923923 A 410.55118,410.55118 0 0 1 326.03894,437.29024 410.55118,410.55118 0 0 1 -87.926529,843.99002 410.55118,410.55118 0 0 1 -495.03432,430.4258 410.55118,410.55118 0 0 1 -81.871764,22.910384" /> diff --git a/web/flamenco-io-site/static/fonts/Heebo-VariableFont_wght.woff b/web/flamenco-io-site/static/fonts/Heebo-VariableFont_wght.woff new file mode 100644 index 00000000..69cef7e4 Binary files /dev/null and b/web/flamenco-io-site/static/fonts/Heebo-VariableFont_wght.woff differ diff --git a/web/flamenco-io-site/static/images/flamenco_screenshot_01.webp b/web/flamenco-io-site/static/images/flamenco_screenshot_01.webp new file mode 100644 index 00000000..3addad7d Binary files /dev/null and b/web/flamenco-io-site/static/images/flamenco_screenshot_01.webp differ