Skip to content

Commit

Permalink
Merge pull request #9 from deco-sites/feat/servicos
Browse files Browse the repository at this point in the history 
style: add style parte serviços e evolução + atualização de font
  • Loading branch information
@RodolfoN1
RodolfoN1 authored Mar 20, 2024
2 parents a97a5d4 + 7d9cc13 commit b95ae05
Show file tree
Hide file tree
Showing 44 changed files with 591 additions and 224 deletions.
2 changes: 1 addition & 1 deletion components/footer/Copyright.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ interface Props{

function Email( {copyrightText}:Props ){
return(
<span class="text-14 text-base-150 font-noto-sans tracking-[0.98px]"> {copyrightText} </span>
<span class="text-14 text-base-150 font-noto-sans-thin tracking-[0.98px]"> {copyrightText} </span>
)

}
Expand Down
2 changes: 1 addition & 1 deletion components/footer/FooterItems.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function FooterItems(
(
<li>
<a href={item.href}
class={clx(`text-[14px] leading-[21.6px] block py-1 link link-hover md:text-16 font-noto-sans font-normal text-base-150`)}>
class={clx(`text-[14px] leading-[21.6px] block py-1 link link-hover md:text-16 font-noto-sans-thin font-normal text-base-150`)}>
{item.label}
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions components/footer/Newsletter.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function Newsletter(
)}
{content?.description &&
<div class={clx(`pt-[10px] pb-[24px] md:pb-[30px] max-w-[90%] mobile:max-w-[100%] xl:max-w-[80%]
font-noto-sans mobile:text-14 md:text-16 text-base-150 md:leading-[25.6px]`)}>{content?.description}</div>
font-noto-sans-thin mobile:text-14 md:text-16 text-base-150 md:leading-[25.6px]`)}>{content?.description}</div>
}
</div>
<div class="flex flex-col">
Expand All @@ -68,7 +68,7 @@ function Newsletter(
<div class="flex flex-wrap gap-[18px]">
<input
name="email"
class="bg-[#ffffff] flex-auto md:flex-none input input-bordered md:w-[273px] bg-white text-base-content font-noto-sans rounded-[90px] text-14 n1-text-base-400"
class="bg-[#ffffff] flex-auto md:flex-none input input-bordered md:w-[273px] bg-white text-base-content font-noto-sans-thin rounded-[90px] text-14 n1-text-base-400"
placeholder={content?.form?.placeholder || "Digite seu email"}
/>
<button
Expand Down
2 changes: 1 addition & 1 deletion components/footer/Social.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function Social(
<span class="block p-1 rounded-full n1-footer__bg-social">
<Icon size={40} id={item.label} />
</span>
<span class="text-14 font-noto-sans font-normal text-base-150 tracking-[0.98px]"> {item.link} </span>
<span class="text-14 font-noto-sans-thin font-normal text-base-150 tracking-[0.98px]"> {item.link} </span>
{vertical && (
<div class="text-sm hidden lg:block">{item.label}</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion components/header/Legend.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function Legend({ nameItemScape, mobile }: Props){
{!mobile &&(
<>
<img class="w-[20px] h-[20px] mr-[10px] ml-[20px]" src={`/image/header-sub-menu-${code}.png`} />
<span class="text-14 font-noto-sans">{language}</span>
<span class="text-14 font-noto-sans-thin">{language}</span>
</>
)}
</a>
Expand Down
2 changes: 1 addition & 1 deletion components/header/NavItem.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function NavItem({ item, btnTextMenu, btnUrlMenu }: Props) {
}

{activePropsText && descriptionSubMenu &&(
<div class="font-noto-sans text-16 n1-header__navlink-children-description normal-case"
<div class="font-noto-sans-thin text-16 n1-header__navlink-children-description normal-case"
dangerouslySetInnerHTML={{ __html: descriptionSubMenu || "" }}>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion components/ui/CasesComponentTextWithButton.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function CasesComponentTextWithButton({ subtitle, text, textButton, hrefButton,
dangerouslySetInnerHTML={{__html: subtitle}}> </h2>
)}
{text && (
<span class="hidden md:flex font-noto-sans text-20 leading-[26px]"> {text} </span>
<span class="hidden md:flex font-noto-sans-thin text-20 leading-[26px]"> {text} </span>
)}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/ui/CategoryBanner.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Picture, Source } from "apps/website/components/Picture.tsx";
import type { SectionProps } from "deco/types.ts";
import type { ImageWidget } from "apps/admin/widgets.ts";
import Image from "apps/website/components/Image.tsx";

/** @titleBy alt */
interface ImageGeneric{
Expand Down Expand Up @@ -96,6 +95,7 @@ function Banner(props: SectionProps<ReturnType<typeof loader>>) {
}

export interface Props {
/**@maxItems 1 */
banners?: Banner[];
}

Expand Down
176 changes: 90 additions & 86 deletions manifest.gen.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,49 +20,51 @@ import * as $$$$$$12 from "./sections/Content/CasesComponent.tsx";
import * as $$$$$$13 from "./sections/Content/Faq.tsx";
import * as $$$$$$14 from "./sections/Content/Features.tsx";
import * as $$$$$$15 from "./sections/Content/Hero.tsx";
import * as $$$$$$16 from "./sections/Content/ImageSection.tsx";
import * as $$$$$$17 from "./sections/Content/Intro.tsx";
import * as $$$$$$18 from "./sections/Content/Logos.tsx";
import * as $$$$$$19 from "./sections/Content/Mosaic.tsx";
import * as $$$$$$20 from "./sections/Content/Partners.tsx";
import * as $$$$$$21 from "./sections/Content/RichText.tsx";
import * as $$$$$$22 from "./sections/Content/Table.tsx";
import * as $$$$$$23 from "./sections/Content/Testimonials.tsx";
import * as $$$$$$24 from "./sections/Content/TextIconAndImage.tsx";
import * as $$$$$$25 from "./sections/Content/TextTopWidthCarousel.tsx";
import * as $$$$$$26 from "./sections/Content/TextWithImage.tsx";
import * as $$$$$$27 from "./sections/Content/TextWithImageAnimation.tsx";
import * as $$$$$$28 from "./sections/Content/TextWithImageCustom.tsx";
import * as $$$$$$29 from "./sections/Footer/Footer.tsx";
import * as $$$$$$30 from "./sections/Gallery.tsx";
import * as $$$$$$31 from "./sections/Header/Header.tsx";
import * as $$$$$$32 from "./sections/Images/BannerGrid.tsx";
import * as $$$$$$33 from "./sections/Images/Carousel.tsx";
import * as $$$$$$34 from "./sections/Images/ImageGallery.tsx";
import * as $$$$$$35 from "./sections/Images/ShoppableBanner.tsx";
import * as $$$$$$36 from "./sections/Layout/Container.tsx";
import * as $$$$$$37 from "./sections/Layout/Flex.tsx";
import * as $$$$$$38 from "./sections/Layout/Grid.tsx";
import * as $$$$$$39 from "./sections/Layout/GridItem.tsx";
import * as $$$$$$40 from "./sections/Links/LinkTree.tsx";
import * as $$$$$$41 from "./sections/Links/Shortcuts.tsx";
import * as $$$$$$42 from "./sections/Miscellaneous/CampaignTimer.tsx";
import * as $$$$$$43 from "./sections/Miscellaneous/CookieConsent.tsx";
import * as $$$$$$44 from "./sections/Miscellaneous/Slide.tsx";
import * as $$$$$$45 from "./sections/Newsletter/Newsletter.tsx";
import * as $$$$$$46 from "./sections/Product/ImageGalleryFrontBack.tsx";
import * as $$$$$$47 from "./sections/Product/ImageGallerySlider.tsx";
import * as $$$$$$48 from "./sections/Product/NotFound.tsx";
import * as $$$$$$49 from "./sections/Product/NotFoundChallenge.tsx";
import * as $$$$$$50 from "./sections/Product/ProductInfo.tsx";
import * as $$$$$$51 from "./sections/Product/ProductShelf.tsx";
import * as $$$$$$52 from "./sections/Product/ProductShelfTabbed.tsx";
import * as $$$$$$53 from "./sections/Product/SearchResult.tsx";
import * as $$$$$$54 from "./sections/Product/ShelfWithImage.tsx";
import * as $$$$$$55 from "./sections/Product/Wishlist.tsx";
import * as $$$$$$56 from "./sections/Social/InstagramPosts.tsx";
import * as $$$$$$57 from "./sections/Social/WhatsApp.tsx";
import * as $$$$$$58 from "./sections/Theme/Theme.tsx";
import * as $$$$$$16 from "./sections/Content/IconText.tsx";
import * as $$$$$$17 from "./sections/Content/IconTitleAndTex.tsx";
import * as $$$$$$18 from "./sections/Content/ImageSection.tsx";
import * as $$$$$$19 from "./sections/Content/Intro.tsx";
import * as $$$$$$20 from "./sections/Content/Logos.tsx";
import * as $$$$$$21 from "./sections/Content/Mosaic.tsx";
import * as $$$$$$22 from "./sections/Content/Partners.tsx";
import * as $$$$$$23 from "./sections/Content/RichText.tsx";
import * as $$$$$$24 from "./sections/Content/Table.tsx";
import * as $$$$$$25 from "./sections/Content/Testimonials.tsx";
import * as $$$$$$26 from "./sections/Content/TextIconAndImage.tsx";
import * as $$$$$$27 from "./sections/Content/TextTopWidthCarousel.tsx";
import * as $$$$$$28 from "./sections/Content/TextWithImage.tsx";
import * as $$$$$$29 from "./sections/Content/TextWithImageAnimation.tsx";
import * as $$$$$$30 from "./sections/Content/TextWithImageCustom.tsx";
import * as $$$$$$31 from "./sections/Footer/Footer.tsx";
import * as $$$$$$32 from "./sections/Gallery.tsx";
import * as $$$$$$33 from "./sections/Header/Header.tsx";
import * as $$$$$$34 from "./sections/Images/BannerGrid.tsx";
import * as $$$$$$35 from "./sections/Images/Carousel.tsx";
import * as $$$$$$36 from "./sections/Images/ImageGallery.tsx";
import * as $$$$$$37 from "./sections/Images/ShoppableBanner.tsx";
import * as $$$$$$38 from "./sections/Layout/Container.tsx";
import * as $$$$$$39 from "./sections/Layout/Flex.tsx";
import * as $$$$$$40 from "./sections/Layout/Grid.tsx";
import * as $$$$$$41 from "./sections/Layout/GridItem.tsx";
import * as $$$$$$42 from "./sections/Links/LinkTree.tsx";
import * as $$$$$$43 from "./sections/Links/Shortcuts.tsx";
import * as $$$$$$44 from "./sections/Miscellaneous/CampaignTimer.tsx";
import * as $$$$$$45 from "./sections/Miscellaneous/CookieConsent.tsx";
import * as $$$$$$46 from "./sections/Miscellaneous/Slide.tsx";
import * as $$$$$$47 from "./sections/Newsletter/Newsletter.tsx";
import * as $$$$$$48 from "./sections/Product/ImageGalleryFrontBack.tsx";
import * as $$$$$$49 from "./sections/Product/ImageGallerySlider.tsx";
import * as $$$$$$50 from "./sections/Product/NotFound.tsx";
import * as $$$$$$51 from "./sections/Product/NotFoundChallenge.tsx";
import * as $$$$$$52 from "./sections/Product/ProductInfo.tsx";
import * as $$$$$$53 from "./sections/Product/ProductShelf.tsx";
import * as $$$$$$54 from "./sections/Product/ProductShelfTabbed.tsx";
import * as $$$$$$55 from "./sections/Product/SearchResult.tsx";
import * as $$$$$$56 from "./sections/Product/ShelfWithImage.tsx";
import * as $$$$$$57 from "./sections/Product/Wishlist.tsx";
import * as $$$$$$58 from "./sections/Social/InstagramPosts.tsx";
import * as $$$$$$59 from "./sections/Social/WhatsApp.tsx";
import * as $$$$$$60 from "./sections/Theme/Theme.tsx";
import * as $$$$$$$$$$$0 from "./apps/decohub.ts";
import * as $$$$$$$$$$$1 from "./apps/site.ts";

Expand Down Expand Up @@ -90,50 +92,52 @@ const manifest = {
"deco-sites/agencian1/sections/Content/Faq.tsx": $$$$$$13,
"deco-sites/agencian1/sections/Content/Features.tsx": $$$$$$14,
"deco-sites/agencian1/sections/Content/Hero.tsx": $$$$$$15,
"deco-sites/agencian1/sections/Content/ImageSection.tsx": $$$$$$16,
"deco-sites/agencian1/sections/Content/Intro.tsx": $$$$$$17,
"deco-sites/agencian1/sections/Content/Logos.tsx": $$$$$$18,
"deco-sites/agencian1/sections/Content/Mosaic.tsx": $$$$$$19,
"deco-sites/agencian1/sections/Content/Partners.tsx": $$$$$$20,
"deco-sites/agencian1/sections/Content/RichText.tsx": $$$$$$21,
"deco-sites/agencian1/sections/Content/Table.tsx": $$$$$$22,
"deco-sites/agencian1/sections/Content/Testimonials.tsx": $$$$$$23,
"deco-sites/agencian1/sections/Content/TextIconAndImage.tsx": $$$$$$24,
"deco-sites/agencian1/sections/Content/TextTopWidthCarousel.tsx": $$$$$$25,
"deco-sites/agencian1/sections/Content/TextWithImage.tsx": $$$$$$26,
"deco-sites/agencian1/sections/Content/IconText.tsx": $$$$$$16,
"deco-sites/agencian1/sections/Content/IconTitleAndTex.tsx": $$$$$$17,
"deco-sites/agencian1/sections/Content/ImageSection.tsx": $$$$$$18,
"deco-sites/agencian1/sections/Content/Intro.tsx": $$$$$$19,
"deco-sites/agencian1/sections/Content/Logos.tsx": $$$$$$20,
"deco-sites/agencian1/sections/Content/Mosaic.tsx": $$$$$$21,
"deco-sites/agencian1/sections/Content/Partners.tsx": $$$$$$22,
"deco-sites/agencian1/sections/Content/RichText.tsx": $$$$$$23,
"deco-sites/agencian1/sections/Content/Table.tsx": $$$$$$24,
"deco-sites/agencian1/sections/Content/Testimonials.tsx": $$$$$$25,
"deco-sites/agencian1/sections/Content/TextIconAndImage.tsx": $$$$$$26,
"deco-sites/agencian1/sections/Content/TextTopWidthCarousel.tsx": $$$$$$27,
"deco-sites/agencian1/sections/Content/TextWithImage.tsx": $$$$$$28,
"deco-sites/agencian1/sections/Content/TextWithImageAnimation.tsx":
$$$$$$27,
"deco-sites/agencian1/sections/Content/TextWithImageCustom.tsx": $$$$$$28,
"deco-sites/agencian1/sections/Footer/Footer.tsx": $$$$$$29,
"deco-sites/agencian1/sections/Gallery.tsx": $$$$$$30,
"deco-sites/agencian1/sections/Header/Header.tsx": $$$$$$31,
"deco-sites/agencian1/sections/Images/BannerGrid.tsx": $$$$$$32,
"deco-sites/agencian1/sections/Images/Carousel.tsx": $$$$$$33,
"deco-sites/agencian1/sections/Images/ImageGallery.tsx": $$$$$$34,
"deco-sites/agencian1/sections/Images/ShoppableBanner.tsx": $$$$$$35,
"deco-sites/agencian1/sections/Layout/Container.tsx": $$$$$$36,
"deco-sites/agencian1/sections/Layout/Flex.tsx": $$$$$$37,
"deco-sites/agencian1/sections/Layout/Grid.tsx": $$$$$$38,
"deco-sites/agencian1/sections/Layout/GridItem.tsx": $$$$$$39,
"deco-sites/agencian1/sections/Links/LinkTree.tsx": $$$$$$40,
"deco-sites/agencian1/sections/Links/Shortcuts.tsx": $$$$$$41,
"deco-sites/agencian1/sections/Miscellaneous/CampaignTimer.tsx": $$$$$$42,
"deco-sites/agencian1/sections/Miscellaneous/CookieConsent.tsx": $$$$$$43,
"deco-sites/agencian1/sections/Miscellaneous/Slide.tsx": $$$$$$44,
"deco-sites/agencian1/sections/Newsletter/Newsletter.tsx": $$$$$$45,
"deco-sites/agencian1/sections/Product/ImageGalleryFrontBack.tsx": $$$$$$46,
"deco-sites/agencian1/sections/Product/ImageGallerySlider.tsx": $$$$$$47,
"deco-sites/agencian1/sections/Product/NotFound.tsx": $$$$$$48,
"deco-sites/agencian1/sections/Product/NotFoundChallenge.tsx": $$$$$$49,
"deco-sites/agencian1/sections/Product/ProductInfo.tsx": $$$$$$50,
"deco-sites/agencian1/sections/Product/ProductShelf.tsx": $$$$$$51,
"deco-sites/agencian1/sections/Product/ProductShelfTabbed.tsx": $$$$$$52,
"deco-sites/agencian1/sections/Product/SearchResult.tsx": $$$$$$53,
"deco-sites/agencian1/sections/Product/ShelfWithImage.tsx": $$$$$$54,
"deco-sites/agencian1/sections/Product/Wishlist.tsx": $$$$$$55,
"deco-sites/agencian1/sections/Social/InstagramPosts.tsx": $$$$$$56,
"deco-sites/agencian1/sections/Social/WhatsApp.tsx": $$$$$$57,
"deco-sites/agencian1/sections/Theme/Theme.tsx": $$$$$$58,
$$$$$$29,
"deco-sites/agencian1/sections/Content/TextWithImageCustom.tsx": $$$$$$30,
"deco-sites/agencian1/sections/Footer/Footer.tsx": $$$$$$31,
"deco-sites/agencian1/sections/Gallery.tsx": $$$$$$32,
"deco-sites/agencian1/sections/Header/Header.tsx": $$$$$$33,
"deco-sites/agencian1/sections/Images/BannerGrid.tsx": $$$$$$34,
"deco-sites/agencian1/sections/Images/Carousel.tsx": $$$$$$35,
"deco-sites/agencian1/sections/Images/ImageGallery.tsx": $$$$$$36,
"deco-sites/agencian1/sections/Images/ShoppableBanner.tsx": $$$$$$37,
"deco-sites/agencian1/sections/Layout/Container.tsx": $$$$$$38,
"deco-sites/agencian1/sections/Layout/Flex.tsx": $$$$$$39,
"deco-sites/agencian1/sections/Layout/Grid.tsx": $$$$$$40,
"deco-sites/agencian1/sections/Layout/GridItem.tsx": $$$$$$41,
"deco-sites/agencian1/sections/Links/LinkTree.tsx": $$$$$$42,
"deco-sites/agencian1/sections/Links/Shortcuts.tsx": $$$$$$43,
"deco-sites/agencian1/sections/Miscellaneous/CampaignTimer.tsx": $$$$$$44,
"deco-sites/agencian1/sections/Miscellaneous/CookieConsent.tsx": $$$$$$45,
"deco-sites/agencian1/sections/Miscellaneous/Slide.tsx": $$$$$$46,
"deco-sites/agencian1/sections/Newsletter/Newsletter.tsx": $$$$$$47,
"deco-sites/agencian1/sections/Product/ImageGalleryFrontBack.tsx": $$$$$$48,
"deco-sites/agencian1/sections/Product/ImageGallerySlider.tsx": $$$$$$49,
"deco-sites/agencian1/sections/Product/NotFound.tsx": $$$$$$50,
"deco-sites/agencian1/sections/Product/NotFoundChallenge.tsx": $$$$$$51,
"deco-sites/agencian1/sections/Product/ProductInfo.tsx": $$$$$$52,
"deco-sites/agencian1/sections/Product/ProductShelf.tsx": $$$$$$53,
"deco-sites/agencian1/sections/Product/ProductShelfTabbed.tsx": $$$$$$54,
"deco-sites/agencian1/sections/Product/SearchResult.tsx": $$$$$$55,
"deco-sites/agencian1/sections/Product/ShelfWithImage.tsx": $$$$$$56,
"deco-sites/agencian1/sections/Product/Wishlist.tsx": $$$$$$57,
"deco-sites/agencian1/sections/Social/InstagramPosts.tsx": $$$$$$58,
"deco-sites/agencian1/sections/Social/WhatsApp.tsx": $$$$$$59,
"deco-sites/agencian1/sections/Theme/Theme.tsx": $$$$$$60,
},
"apps": {
"deco-sites/agencian1/apps/decohub.ts": $$$$$$$$$$$0,
Expand Down
50 changes: 47 additions & 3 deletions routes/_app.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default defineApp(async (_req, ctx) => {
dangerouslySetInnerHTML={{ __html: `(${sw})();` }}
/>

<style
{/* <style
dangerouslySetInnerHTML={{
__html:`
@font-face{
Expand Down Expand Up @@ -71,10 +71,54 @@ export default defineApp(async (_req, ctx) => {
font-weight: normal;
font-style: normal;
font-display: swap;
};
};
@font-face{
font-family: 'NotoSans-Thin';
src: url(${asset("/fonts/NotoSans-Thin.ttf")}) format('woff2');
font-weight: normal;
font-style: normal;
font-display: swap;
};
@font-face{
font-family: 'NotoSans-Regular';
src: url(${asset("/fonts/NotoSans-Regular.ttf")}) format('woff2');
font-weight: normal;
font-style: normal;
font-display: swap;
};
@font-face{
font-family: 'NotoSans-Medium';
src: url(${asset("/fonts/NotoSans-Medium.ttf")}) format('woff2');
font-weight: normal;
font-style: normal;
font-display: swap;
};
@font-face{
font-family: 'NotoSans-Light';
src: url(${asset("/fonts/NotoSans-Light.ttf")}) format('woff2');
font-weight: normal;
font-style: normal;
font-display: swap;
};
@font-face{
font-family: 'NotoSans-Bold';
src: url(${asset("/fonts/NotoSans-Bold.ttf")}) format('woff2');
font-weight: normal;
font-style: normal;
font-display: swap;
};
@font-face{
font-family: 'Montserrat-ExtraLight';
src: url(${asset("/fonts/Montserrat-ExtraLight.ttf")}) format('woff2');
font-weight: normal;
font-style: normal;
font-display: swap;
};
`
}}
/>
/> */}
</>
);
});
Loading

0 comments on commit b95ae05

Please sign in to comment.