Commit 75792691 authored by Andgel Brissaud's avatar Andgel Brissaud
Browse files

Merge branch 'master' of https://forge.info.unicaen.fr/git/but-info-sae3-2024-groupe3

parents 19688b67 a66adc03

public/logo.png

0 → 100644
+0 −0

Empty file added.

resources/img/logo_allonge.png

0 → 100644
+34.8 KiB
Loading image diff...

resources/views/components/button.blade.php

+1 −1
Original line number Diff line number Diff line 
<button class="m-1 bg-gray-300 hover:bg-gray-400 text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center">

<button class="m-1 @if (isset($color) && $color != "") {{ $color }} @else bg-gray-400 @endif @if (isset($colorHover) && $colorHover != "") {{ $colorHover }} @else hover:bg-gray-500 @endif text-gray-800 font-bold py-2 px-4 rounded inline-flex items-center">

    {{ $slot }}

</button>

resources/views/components/header.blade.php

+4 −4
Original line number Diff line number Diff line 
<nav x-data="{ open: false }" class="bg-white border-b border-gray-100">

<nav x-data="{ open: false }" class="bg-[#002550] border-b border-gray-100">

    <!-- Primary Navigation Menu -->

    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">

        <div class="flex justify-between h-16">
@@ -6,14 +6,14 @@ 
                <!-- Logo -->

                <div class="shrink-0 flex items-center">

                    <a href="{{ route('homepage') }}">

                        <img class="block h-9 w-auto fill-current text-gray-800" src="resources/img/logo.png" alt="Nautilus logo"/>

                        <img class="block h-9 w-auto fill-current text-gray-800" src="{{ asset('resources/img/logo.png') }}" alt="Nautilus logo"/>

                    </a>

                </div>



                <!-- Navigation Links -->

                <div class="hidden space-x-8 sm:-my-px sm:ms-10 sm:flex">

                <div class="hidden text-[#EBEBEB] space-x-8 sm:-my-px sm:ms-10 sm:flex">

                    <x-nav-link :href="route('homepage')" :active="request()->routeIs('homepage')">

                        {{ __('Page d\'accueil') }}

                        {{ __('Accueil') }}

                    </x-nav-link>

                    <x-nav-link :href="route('dives')" :active="request()->routeIs('dives')">

                        {{ __('Plongées') }}

resources/views/components/layout.blade.php

+2 −2
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
  <script src="https://cdn.tailwindcss.com"></script>

    <style>* {box-sizing: border-box}</style>

</head>

<body>

<body class="min-h-[100vh] flex justify-between flex-col">

  <x-header/>

  <main class="mx-auto max-w-[1028px] p-4">

  <main class="mx-auto max-w-[1028px] p-4 min-h-[80vh]">

    {{ $slot }}

  </main>

  <x-footer/>