bender/c35c8b9f-d5c3-43cf-a8c6-7800b7be044b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #22

Merged
bender merged 3 commits from version_5 into main 2026-03-05 15:00:09 +00:00
Conversation 0 Commits 3 Files Changed 3 +11 -11
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/about/page.tsx
View File

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import MediaAbout from '@/components/sections/about/MediaAbout';
import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
import TestimonialAboutCard from '@/components/sections/testimonial/TestimonialAboutCard';
import FaqBase from '@/components/sections/faq/FaqBase';
import FooterCard from '@/components/sections/footer/FooterCard';
import { CheckCircle, Phone, MapPin, Clock } from 'lucide-react';
@@ -101,7 +101,7 @@ export default function AboutPage() {
</div>
<div id="testimonials" data-section="testimonials">
<TestimonialCardTwo
<TestimonialAboutCard
title="Što kažu naši pacijenti"
description="Autentične recenzije od zadovoljnih pacijenata"
tag="Recenzije"
@@ -180,4 +180,4 @@ export default function AboutPage() {
</div>
</ThemeProvider>
);
}
}

14
src/app/layout.tsx
View File

@@ -1,10 +1,12 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./styles/variables.css";
import "./globals.css";
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "Dentlife - Stomatološka ordinacija u Sarajevu", description: "Pouzdana i moderna stomatološka ordinacija u Sarajevu sa iskusnim doktorima, modernom opremom i individualnim pristupom."
};
title: "Dentlife - Stomatološka ordinacija", description: "Moderna stomatološka ordinacija u Sarajevu sa iskusnim doktorima i najnovijom tehnologijom."};
export default function RootLayout({
children,
@@ -12,10 +14,8 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
<html lang="bs">
<body>
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1385,4 +1385,4 @@ export default function RootLayout({
</body>
</html>
);
}
}

2
src/app/page.tsx
View File

@@ -264,4 +264,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}