Skip to content

Commit

Permalink
Styles updates
Browse files Browse the repository at this point in the history
  • Loading branch information
fgatti675 committed Feb 2, 2024
1 parent 752d223 commit 223965a
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 20 deletions.
2 changes: 1 addition & 1 deletion examples/example_pro/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ a {
:root {
--fcms-primary: #0070F4;
--fcms-primary-dark: #0061e6;
--fcms-primary-bg: #0061e620;
--fcms-primary-bg: #0061e610;
--fcms-secondary: #FF5B79;
}
2 changes: 1 addition & 1 deletion examples/example_v3/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ body {
:root {
--fcms-primary: #0070F4;
--fcms-primary-dark: #0061e6;
--fcms-primary-bg: #0061e620;
--fcms-primary-bg: #0061e610;
--fcms-secondary: #FF5B79;
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function PropertyFieldPreview({

const borderColorClass = hasError
? "border-red-500"
: (selected ? "border-blue-500" : "border-transparent");
: (selected ? "border-primary" : "border-transparent");

return <ErrorBoundary>
<div
Expand Down Expand Up @@ -141,7 +141,7 @@ export function NonEditablePropertyPreview({
onClick ? cardClickableMixin : "",
selected ? cardSelectedMixin : "",
"flex-grow p-4 border transition-colors duration-200",
selected ? "border-blue-500" : "border-transparent")}
selected ? "border-primary" : "border-transparent")}
>

<div className="w-full flex flex-col">
Expand Down
4 changes: 2 additions & 2 deletions packages/firecms/src/hooks/useBuildProjectConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ export function useBuildProjectConfig({
if (primaryColor) {
document.documentElement.style.setProperty("--fcms-primary", primaryColor);
document.documentElement.style.setProperty("--fcms-primary-dark", darkenColor(primaryColor, 10));
document.documentElement.style.setProperty("--fcms-primary-bg", hexToRgbaWithOpacity(primaryColor, 20));
document.documentElement.style.setProperty("--fcms-primary-bg", hexToRgbaWithOpacity(primaryColor, 10));
} else {
document.documentElement.style.setProperty("--fcms-primary", darkenColor(DEFAULT_PRIMARY_COLOR, 10));
document.documentElement.style.setProperty("--fcms-primary-dark", darkenColor(DEFAULT_PRIMARY_COLOR, 10));
document.documentElement.style.setProperty("--fcms-primary-bg", hexToRgbaWithOpacity(DEFAULT_PRIMARY_COLOR, 20));
document.documentElement.style.setProperty("--fcms-primary-bg", hexToRgbaWithOpacity(DEFAULT_PRIMARY_COLOR, 10));
}
if (secondaryColor) {
document.documentElement.style.setProperty("--fcms-secondary", secondaryColor);
Expand Down
2 changes: 1 addition & 1 deletion packages/firecms_cli/templates/template_pro/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ a {
:root {
--fcms-primary: #0070F4;
--fcms-primary-dark: #0061e6;
--fcms-primary-bg: #0061e620;
--fcms-primary-bg: #0061e610;
--fcms-secondary: #FF5B79;
}
2 changes: 1 addition & 1 deletion packages/firecms_cli/templates/template_v3/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ body {
:root {
--fcms-primary: #0070F4;
--fcms-primary-dark: #0061e6;
--fcms-primary-bg: #0061e620;
--fcms-primary-bg: #0061e610;
--fcms-secondary: #FF5B79;
}
23 changes: 22 additions & 1 deletion website/src/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ h6 {
:root {
--fcms-primary: #0070F4;
--fcms-primary-dark: #0061e6;
--fcms-primary-bg: #0061e620;
--fcms-primary-bg: #0061e610;
--fcms-secondary: #FF5B79;
}

Expand Down Expand Up @@ -106,12 +106,33 @@ h6 {
--docsearch-primary-color: #0070f4;
--docsearch-modal-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.0);
--docsearch-searchbox-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.0);
--docsearch-muted-color: #7f8497;
--docsearch-hit-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.0);
--docsearch-key-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.0);
--docsearch-footer-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.0);
--docsearch-logo-color: #0070f4;
}

.DocSearch-Button {
background: #FFFFFFCC;
}
html[data-theme=dark] .DocSearch-Button {
background: rgba(59, 59, 59, 0.8);
}
.DocSearch-Button:hover {
background: #FFFFFF;
}
html[data-theme=dark] .DocSearch-Button:hover {
background: rgba(59, 59, 59);
}

.footer__link-item {
display: flex;
gap: 4px;
flex-direction: row;
align-items: center;
}

[role="banner"] {
font-family: "IBM Plex Mono";
}
Expand Down
4 changes: 2 additions & 2 deletions website/src/partials/general/Hero.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import { Panel } from "./Panel";
import { PagesBackground } from "./PagesBackground";
import { PagesHeroBackground } from "./PagesHeroBackground";

export function Hero({
title,
Expand All @@ -16,7 +16,7 @@ export function Hero({
return (
<>
<div className={"w-full relative bg-blue-800 -mt-20"}>
<PagesBackground color={color}/>
<PagesHeroBackground color={color}/>
<Panel includeMargin={false}
includePadding={false}
color={"transparent"}
Expand Down
18 changes: 18 additions & 0 deletions website/src/partials/general/MainHeroBackground.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React, { Suspense } from "react";
import BrowserOnly from "@docusaurus/BrowserOnly";

const LazyHomeHeroNeatGradient = React.lazy(() => import("../../shape/HomeHeroNeatGradient"));

export function MainHeroBackground() {

return <>
<BrowserOnly
fallback={<div className={"absolute"}/>}>
{() => (
<Suspense fallback={<div/>}>
<LazyHomeHeroNeatGradient/>
</Suspense>
)}
</BrowserOnly>
</>
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import BrowserOnly from "@docusaurus/BrowserOnly";
const LazyHomeHeroNeatGradient = React.lazy(() => import("../../shape/HomeHeroNeatGradient"));
const LazyHeroNeatGradient = React.lazy(() => import("../../shape/HeroNeatGradient"));

export function PagesBackground({ color = "grey" }: { color?: "grey" | "primary" | "secondary" }) {
export function PagesHeroBackground({ color = "primary" }: { color?: "primary" | "secondary" }) {

return <>
<BrowserOnly
fallback={<div className={"absolute"}/>}>
{() => (
<Suspense fallback={<div/>}>
{color === "grey" && <LazyHomeHeroNeatGradient/>}
{color !== "grey" && <LazyHeroNeatGradient color={color}/>}
<LazyHeroNeatGradient color={color}/>
</Suspense>
)}
</BrowserOnly>
Expand Down
7 changes: 4 additions & 3 deletions website/src/partials/home/HeroHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import { defaultBorderMixin } from "../styles";
import { Panel } from "../general/Panel";
import clsx from "clsx";
import { LinedSpace } from "../layout/LinedSpace";
import { PagesBackground } from "../general/PagesBackground";
import { PagesHeroBackground } from "../general/PagesHeroBackground";
import { MainHeroBackground } from "../general/MainHeroBackground";

function HeroHome({}) {

Expand Down Expand Up @@ -66,8 +67,8 @@ function HeroHome({}) {

return (
<div
className={clsx("w-full relative border-0 border-b -mt-20 bg-gray-800 dark:bg-gray-900", defaultBorderMixin)}>
<PagesBackground/>
className={clsx("w-full relative border-0 border-b -mt-20 bg-black bg-opacity-80 dark:bg-gray-900 dark:bg-opacity-90", defaultBorderMixin)}>
<MainHeroBackground/>
<Panel includeMargin={false}
includePadding={false}
color={"transparent"}
Expand Down
2 changes: 1 addition & 1 deletion website/src/shape/HeroNeatGradient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NeatGradient } from "@firecms/neat";

function getAmplitude(scroll: number) {
const min = 10;
const max = 30;
const max = 40;
return Math.min(max, Math.max(min, min + scroll / 50));
}

Expand Down
4 changes: 2 additions & 2 deletions website/src/shape/HomeHeroNeatGradient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NeatGradient } from "@firecms/neat";
import { easeInOut } from "../partials/styles";

function getBrightnessFrom(scroll: number) {
const min = .5;
const min = .4;
const max = .8;
return Math.min(max, Math.max(min, min + scroll / 1000));
}
Expand All @@ -21,7 +21,7 @@ function getSaturateFrom(scroll: number) {
}

function getAmplitude(scroll: number) {
const min = 2;
const min = 4;
const max = 40;
return Math.min(max, Math.max(min, min + scroll / 50));
}
Expand Down

0 comments on commit 223965a

Please sign in to comment.