aboutsummaryrefslogtreecommitdiffstats
path: root/code
diff options
context:
space:
mode:
Diffstat (limited to 'code')
-rw-r--r--code/api/src/Services/VaultService.cs2
-rw-r--r--code/frontpage/assets/js/mermaid.js2
-rw-r--r--code/frontpage/config/_default/menus/menus.en.toml5
-rw-r--r--code/frontpage/config/_default/params.toml2
-rw-r--r--code/frontpage/layouts/index.html16
-rw-r--r--code/frontpage/layouts/partials/head/resource-hints.html7
-rw-r--r--code/frontpage/layouts/partials/header/header.html18
7 files changed, 23 insertions, 29 deletions
diff --git a/code/api/src/Services/VaultService.cs b/code/api/src/Services/VaultService.cs
index 3745096..14fb3fb 100644
--- a/code/api/src/Services/VaultService.cs
+++ b/code/api/src/Services/VaultService.cs
@@ -71,10 +71,10 @@ public class VaultService
DB_PORT = "5432",
DB_NAME = "greatoffice_ivar_dev",
DB_PASSWORD = "ivar123",
+ DB_USER = "postgres",
CANONICAL_FRONTEND_URL = "http://localhost:5173",
CANONICAL_BACKEND_URL = "http://localhost:5000",
POSTMARK_TOKEN = "b530c311-45c7-43e5-aa48-f2c992886e51",
- DB_USER = "postgres",
QUARTZ_DB_HOST = "localhost",
QUARTZ_DB_PORT = "5432",
QUARTZ_DB_NAME = "greatoffice_quartz_ivar_dev",
diff --git a/code/frontpage/assets/js/mermaid.js b/code/frontpage/assets/js/mermaid.js
index b214d5f..98d67e1 100644
--- a/code/frontpage/assets/js/mermaid.js
+++ b/code/frontpage/assets/js/mermaid.js
@@ -2,7 +2,7 @@ import mermaid from 'mermaid';
var config = {
theme: 'default',
- fontFamily: '"Jost", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, "Helvetica Neue", arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";',
+ fontFamily: '-apple-system, blinkmacsystemfont, "Segoe UI", roboto, "Helvetica Neue", arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";',
};
document.addEventListener('DOMContentLoaded', () => {
diff --git a/code/frontpage/config/_default/menus/menus.en.toml b/code/frontpage/config/_default/menus/menus.en.toml
index 467bcdb..59e8fbb 100644
--- a/code/frontpage/config/_default/menus/menus.en.toml
+++ b/code/frontpage/config/_default/menus/menus.en.toml
@@ -4,11 +4,6 @@
weight = 10
[[main]]
- name = "Blog"
- url = "/blog/"
- weight = 20
-
-[[main]]
name = "Contact"
url = "/contact/"
weight = 20
diff --git a/code/frontpage/config/_default/params.toml b/code/frontpage/config/_default/params.toml
index 4e4f045..476fe7e 100644
--- a/code/frontpage/config/_default/params.toml
+++ b/code/frontpage/config/_default/params.toml
@@ -4,7 +4,7 @@
title = "Greatoffice"
titleSeparator = "-"
titleAddition = "Great"
-description = "Greatoffice is a set of useful tools you can use to manage your business."
+description = "Greatoffice is a set of tools you can use to manage your business."
## Documentation
# docsVersion = "0.3"
diff --git a/code/frontpage/layouts/index.html b/code/frontpage/layouts/index.html
index 62abf7f..ca44125 100644
--- a/code/frontpage/layouts/index.html
+++ b/code/frontpage/layouts/index.html
@@ -1,14 +1,18 @@
{{ define "main" }}
<section class="section container-fluid mt-n3 pb-3">
- <div class="row justify-content-center">
- <div class="col-lg-12 text-center">
+ <div class="row">
+ <div class="col-lg-12">
<h1 class="mt-0">{{ .Title }}</h1>
</div>
- <div class="col-lg-9 col-xl-8 text-center">
+ <div class="col-lg-9 col-xl-8">
<p class="lead">{{ .Params.lead | safeHTML }}</p>
<p class="meta">GPLv3 Licensed.
<a href="https://git.ivar.systems/greatoffice/tree/COPYING">
- License file
+ License
+ </a>
+ -
+ <a href="https://git.ivar.systems/greatoffice/about">
+ Source
</a>
</p>
</div>
@@ -20,7 +24,7 @@
{{ if eq $.Site.Language.LanguageName "English" }}
<section class="section section-sm">
<div class="container">
- <div class="row justify-content-center text-center">
+ <div class="row">
<div class="col-lg-5">
<h2 class="h4">Projects</h2>
<p>Manage your projects with time tracking, planning and ecomnomics all built-in.</p>
@@ -55,7 +59,7 @@
{{ define "sidebar-footer" }}
<section class="section section-sm container-fluid">
- <div class="row justify-content-center text-center">
+ <div class="row">
<div class="col-lg-9">
{{- .Content -}}
</div>
diff --git a/code/frontpage/layouts/partials/head/resource-hints.html b/code/frontpage/layouts/partials/head/resource-hints.html
index 73bccd9..6ebcdeb 100644
--- a/code/frontpage/layouts/partials/head/resource-hints.html
+++ b/code/frontpage/layouts/partials/head/resource-hints.html
@@ -1,7 +1,4 @@
-<link rel="preload" as="font" href="{{ "fonts/vendor/jost/jost-v4-latin-regular.woff2" | absURL }}" type="font/woff2" crossorigin>
-<link rel="preload" as="font" href="{{ "fonts/vendor/jost/jost-v4-latin-500.woff2" | absURL }}" type="font/woff2" crossorigin>
-<link rel="preload" as="font" href="{{ "fonts/vendor/jost/jost-v4-latin-700.woff2" | absURL }}" type="font/woff2" crossorigin>
{{ if .Site.Params.options.kaTex -}}
- <link rel="preload" as="font" href="{{ "fonts/KaTeX_Main-Regular.woff2" | absURL }}" type="font/woff2" crossorigin>
- <link rel="preload" as="font" href="{{ "fonts/KaTeX_Math-Italic.woff2" | absURL }}" type="font/woff2" crossorigin>
+<link rel="preload" as="font" href="{{ " fonts/KaTeX_Main-Regular.woff2" | absURL }}" type="font/woff2" crossorigin>
+<link rel="preload" as="font" href="{{ " fonts/KaTeX_Math-Italic.woff2" | absURL }}" type="font/woff2" crossorigin>
{{ end -}} \ No newline at end of file
diff --git a/code/frontpage/layouts/partials/header/header.html b/code/frontpage/layouts/partials/header/header.html
index b835635..7869784 100644
--- a/code/frontpage/layouts/partials/header/header.html
+++ b/code/frontpage/layouts/partials/header/header.html
@@ -6,7 +6,7 @@
<div class="sticky-top">
{{ end -}}
- <header class="navbar navbar-expand-lg navbar-light doks-navbar">
+ <header class="navbar navbar-expand-md navbar-light doks-navbar">
<nav class="container-{{ if .Site.Params.options.fullWidth }}fluid{{ else }}xxl{{ end }} flex-wrap flex-lg-nowrap"
aria-label="Main navigation">
@@ -15,7 +15,7 @@
</a>
{{ if (in .Site.Params.sections.sectionNav .Section) -}}
- <button class="btn btn-link order-0 ms-auto d-lg-none" type="button" data-bs-toggle="offcanvas"
+ <button class="btn btn-link order-0 ms-auto d-md-none" type="button" data-bs-toggle="offcanvas"
data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
@@ -25,9 +25,8 @@
<circle cx="5" cy="12" r="1"></circle>
</svg>
</button>
- <div class="offcanvas offcanvas-start d-lg-none" tabindex="-1" id="offcanvasExample"
+ <div class="offcanvas offcanvas-start d-md-none" tabindex="-1" id="offcanvasExample"
aria-labelledby="offcanvasExampleLabel">
- <div class="header-bar"></div>
<div class="offcanvas-header">
<h5 class="offcanvas-title" id="offcanvasExampleLabel">{{ i18n "browse" }} {{ .Section }}</h5>
<button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
@@ -42,7 +41,7 @@
</div>
{{ end -}}
- <button class="btn btn-menu order-2 d-block d-lg-none" type="button" data-bs-toggle="offcanvas"
+ <button class="btn btn-menu order-2 d-block d-md-none" type="button" data-bs-toggle="offcanvas"
data-bs-target="#offcanvasDoks" aria-controls="offcanvasDoks" aria-label="Open main menu">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
@@ -52,17 +51,16 @@
<line x1="3" y1="18" x2="21" y2="18"></line>
</svg>
</button>
- <div class="offcanvas offcanvas-end border-0 py-lg-1" tabindex="-1" id="offcanvasDoks" data-bs-backdrop="true"
+ <div class="offcanvas offcanvas-end border-0 py-md-1" tabindex="-1" id="offcanvasDoks" data-bs-backdrop="true"
aria-labelledby="offcanvasDoksLabel">
- <div class="header-bar d-lg-none"></div>
- <div class="offcanvas-header d-lg-none">
+ <div class="offcanvas-header d-md-none">
<h2 class="h5 offcanvas-title ps-2" id="offcanvasDoksLabel"><a class="text-dark" href="{{ " /" | relLangURL
}}">{{ .Site.Params.Title }}</a></h2>
<button type="button" class="btn-close text-reset me-2" data-bs-dismiss="offcanvas"
aria-label="Close main menu"></button>
</div>
- <div class="offcanvas-body p-4 p-lg-0">
- <ul class="nav flex-column flex-lg-row align-items-lg-center mt-2 mt-lg-0 ms-lg-2 me-lg-auto">
+ <div class="offcanvas-body p-4 p-md-0">
+ <ul class="nav flex-column flex-md-row align-items-md-center mt-2 mt-md-0 ms-md-2 me-md-auto">
{{- $current := . -}}
{{- $section := $current.Section -}}
{{ range .Site.Menus.main -}}