diff --git a/public/styles/colors.css b/public/styles/colors.css index d0900dd..ff849b1 100644 --- a/public/styles/colors.css +++ b/public/styles/colors.css @@ -5,6 +5,6 @@ --secondary: #8a5542; --secondary-light: #bd8751; --secondary-dark: #3b1c11; - --light: #f2ebd9; - --dark: #261f0d; + --light: #f8f5ec; + --dark: #131007; } \ No newline at end of file diff --git a/public/styles/header.css b/public/styles/header.css deleted file mode 100644 index 8bdb89f..0000000 --- a/public/styles/header.css +++ /dev/null @@ -1,30 +0,0 @@ -header { - height: 100%; - position: fixed; - background-color: var(--primary-dark); - width: 10em; - box-shadow: 0.2em 0 1em black; - padding-left: 1em; -} - -.header-category { - text-transform: uppercase; - color: var(--secondary); - font-size: 0.75em; - font-weight: normal; - margin-top: 5em; - margin-bottom: 0; -} - -header ul { - color: var(--secondary-light); - font-size: 1em; - font-weight: bold; - margin-top: 0.25em; -} - -header .icon { - display: inline-block; - margin-right: 0.5em; - width: 1em; -} \ No newline at end of file diff --git a/public/styles/main.css b/public/styles/main.css index f1c8b48..c964137 100644 --- a/public/styles/main.css +++ b/public/styles/main.css @@ -4,14 +4,34 @@ line-height: 1.25em; } -h1 { - display: none; +body { + background-color: var(--light); } -h2, h3 { +h1 { + color: var(--primary); + font-weight: bold; + font-size: 1.5em; +} + +h1, h2, h3 { font-family: 'Kanit', sans-serif; } ul { margin-bottom: 0; +} + +container, header { + margin-left: 10em; + padding-left: 1.5em; + padding-right: 1.5em; + padding-top: 0.5em; +} + +header { + display: block; + height: 8em; + background-color: white; + box-shadow: 0 0.2em 1em black; } \ No newline at end of file diff --git a/public/styles/nav.css b/public/styles/nav.css new file mode 100644 index 0000000..31a1c72 --- /dev/null +++ b/public/styles/nav.css @@ -0,0 +1,30 @@ +nav { + height: 100%; + position: fixed; + background-color: var(--primary-dark); + width: 10em; + box-shadow: 0.2em 0 1em black; + padding-left: 1em; +} + +.nav-category { + text-transform: uppercase; + color: var(--secondary); + font-size: 0.75em; + font-weight: normal; + margin-top: 5em; + margin-bottom: 0; +} + +nav ul { + color: var(--secondary-light); + font-size: 1em; + font-weight: bold; + margin-top: 0.25em; +} + +nav .icon { + display: inline-block; + margin-right: 0.5em; + width: 1em; +} \ No newline at end of file diff --git a/templates/_includes/html/base.html.twig b/templates/_includes/html/base.html.twig index b68feb4..0cc9ecc 100644 --- a/templates/_includes/html/base.html.twig +++ b/templates/_includes/html/base.html.twig @@ -5,7 +5,7 @@ "https://fonts.googleapis.com/css2?family=Asap", baseUrl~"icofont/icofont.css", baseUrl~"styles/main.css", - baseUrl~"styles/header.css", + baseUrl~"styles/nav.css", baseUrl~"styles/colors.css", ]|merge(styles) %} @@ -26,11 +26,11 @@ {% endfor %} -

Activity manager

Activités

+ +

+ {% block headerContent %} + {% endblock %}

diff --git a/templates/workspaceSelector.html.twig b/templates/workspaceSelector.html.twig index 06b441c..b556797 100644 --- a/templates/workspaceSelector.html.twig +++ b/templates/workspaceSelector.html.twig @@ -1,4 +1,6 @@ {% extends '_includes/html/base.html.twig' %} +{% set page="Workspaces" %} + {% block pageContent %} {% endblock %} \ No newline at end of file