diff --git a/public/styles/main.css b/public/styles/main.css index 65e15d1..19d1a29 100644 --- a/public/styles/main.css +++ b/public/styles/main.css @@ -1,9 +1,21 @@ * { + color: var(--dark); font-family: 'Asap', sans-serif; text-decoration: none; line-height: 1.25em; } +a, a * { + color: var(--secondary); + font-weight: bold; + margin: 0; +} + +a:hover, a:hover * { + text-decoration: none; + color: var(--secondary-light); +} + body { background-color: var(--light); } @@ -23,11 +35,12 @@ margin-bottom: 0; } -container, header { +.container, header { margin-left: 10em; - padding-left: 1.5em; - padding-right: 1.5em; + padding-left: 3em; + padding-right: 3em; padding-top: 0.5em; + max-width: none; } header { diff --git a/public/styles/nav.css b/public/styles/nav.css index 31a1c72..4374fc7 100644 --- a/public/styles/nav.css +++ b/public/styles/nav.css @@ -5,6 +5,7 @@ width: 10em; box-shadow: 0.2em 0 1em black; padding-left: 1em; + padding-right: 1em; } .nav-category { @@ -16,11 +17,23 @@ margin-bottom: 0; } -nav ul { +nav li { + list-style-type: none; +} + +nav ul, nav ul *, nav ul *:hover { color: var(--secondary-light); font-size: 1em; font-weight: bold; margin-top: 0.25em; + padding: 0.1em; + border-radius: 0.2em; + transition: background-color 0.25s linear; +} + +nav ul:hover { + background-color: var(--primary); + transition: none; } nav .icon { diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index 6abc6b1..4374ca8 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -16,6 +16,6 @@ */ public function workspaceSelector(): Response { - return $this->render("workspaceSelector.html.twig"); + return $this->render("workspaceSelector.html.twig", []); } } \ No newline at end of file diff --git a/templates/_includes/html/base.html.twig b/templates/_includes/html/base.html.twig index 891f8ee..092712d 100644 --- a/templates/_includes/html/base.html.twig +++ b/templates/_includes/html/base.html.twig @@ -7,12 +7,12 @@ baseUrl~"styles/main.css", baseUrl~"styles/nav.css", baseUrl~"styles/colors.css", -]|merge(styles) %} +]|merge(styles|default([])) %} {% set scripts=[ -]|merge(scripts) %} +]|merge(scripts|default([])) %} -{% set page="N/A" %} +{% set page=page|default("N/A") %} @@ -44,14 +44,18 @@
  • -

    {{ page }}

    +
    +

    + {{ page }} +