diff --git a/.storybook/addons.js b/.storybook/addons.js index 08b86201fa..e90c392698 100644 --- a/.storybook/addons.js +++ b/.storybook/addons.js @@ -3,11 +3,11 @@ import "@storybook/addon-actions/register"; import "@storybook/addon-links/register"; import { create } from "@storybook/theming/create"; import { addons } from "@storybook/addons"; +import logo from "./logo.png"; const theme = create({ base: "light", - brandImage: - "https://dapulse-res.cloudinary.com/image/upload/f_auto,q_auto/remote_mondaycom_static/img/monday-logo-x2.png", + brandImage: logo, brandUrl: "https://monday.com" }); diff --git a/.storybook/logo.png b/.storybook/logo.png new file mode 100644 index 0000000000..9c4cf7c3d0 Binary files /dev/null and b/.storybook/logo.png differ diff --git a/.storybook/preview.js b/.storybook/preview.js index 2afd0a4ca5..04f296d0b1 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -12,7 +12,6 @@ import { RelatedComponents, DocFooter, MultipleStoryElementsWrapper, - Link, Paragraph } from "../src/storybook/components"; import LinkComponent from "../src/storybook/components/link-component/link-component"; diff --git a/src/storybook/components/component-name/assets/component-background.png b/src/storybook/components/component-name/assets/component-background.png new file mode 100644 index 0000000000..ce18b27b73 Binary files /dev/null and b/src/storybook/components/component-name/assets/component-background.png differ diff --git a/src/storybook/components/component-name/assets/foundation-background.png b/src/storybook/components/component-name/assets/foundation-background.png new file mode 100644 index 0000000000..97a39956c8 Binary files /dev/null and b/src/storybook/components/component-name/assets/foundation-background.png differ diff --git a/src/storybook/components/component-name/component-name.jsx b/src/storybook/components/component-name/component-name.jsx index 8cd06ff0aa..63dff4a9df 100644 --- a/src/storybook/components/component-name/component-name.jsx +++ b/src/storybook/components/component-name/component-name.jsx @@ -1,6 +1,14 @@ import cx from "classnames"; import "./component-name.scss"; -export const ComponentName = ({ children, className }) => { - return

{children}

; +export const ComponentName = ({ children, className, withFoundationBackground = false }) => { + return ( +

+ {children} +

+ ); }; diff --git a/src/storybook/components/component-name/component-name.scss b/src/storybook/components/component-name/component-name.scss index 38b397d9c1..9e4c37c2d3 100644 --- a/src/storybook/components/component-name/component-name.scss +++ b/src/storybook/components/component-name/component-name.scss @@ -6,7 +6,6 @@ width: 100%; margin-top: 0; margin-bottom: $spacing-between-section-items; - @include theme-prop(background-color, primary-selected-color); @include basic-text; font-family: $header-primary-font; font-size: $h1-font-size; @@ -17,5 +16,11 @@ display: grid; border-radius: $border-radius-small; padding: 40px 24px; + background-image: url('./assets/component-background.png'); + background-repeat: no-repeat; + background-size: cover; + &--foundation { + background-image: url('./assets/foundation-background.png'); + } } \ No newline at end of file diff --git a/src/storybook/components/paragraph/paragraph.jsx b/src/storybook/components/paragraph/paragraph.jsx index 2a5bcc7925..1401ba1862 100644 --- a/src/storybook/components/paragraph/paragraph.jsx +++ b/src/storybook/components/paragraph/paragraph.jsx @@ -1 +1,5 @@ -export const Paragraph = ({ children }) =>

{children}

; +import cx from "classnames"; + +export const Paragraph = ({ children, className }) => ( +

{children}

+); diff --git a/src/storybook/stand-alone-documentaion/colors/content-color-cell/content-color-cell.module.scss b/src/storybook/stand-alone-documentaion/colors/content-color-cell/content-color-cell.module.scss index 8736fee194..46a912eb53 100644 --- a/src/storybook/stand-alone-documentaion/colors/content-color-cell/content-color-cell.module.scss +++ b/src/storybook/stand-alone-documentaion/colors/content-color-cell/content-color-cell.module.scss @@ -1,4 +1,6 @@ .content-colors-cell { height: 40px; width: 25%; + padding: 0; + margin: 0; } \ No newline at end of file diff --git a/src/storybook/stand-alone-documentaion/colors/content-colors/content-colors.jsx b/src/storybook/stand-alone-documentaion/colors/content-colors/content-colors.jsx index 29571affff..4db2e2863a 100644 --- a/src/storybook/stand-alone-documentaion/colors/content-colors/content-colors.jsx +++ b/src/storybook/stand-alone-documentaion/colors/content-colors/content-colors.jsx @@ -13,7 +13,7 @@ export const ContentColors = () => { return ( - +
Default diff --git a/src/storybook/stand-alone-documentaion/shadow/shadow.stories.mdx b/src/storybook/stand-alone-documentaion/shadow/shadow.stories.mdx index a941a03579..2c76ad78af 100644 --- a/src/storybook/stand-alone-documentaion/shadow/shadow.stories.mdx +++ b/src/storybook/stand-alone-documentaion/shadow/shadow.stories.mdx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/addon-docs"; -import { Frame } from "../../components"; +import { ComponentName, Frame } from "../../components"; import { ShadowLevels } from "./shadow-levels/shadow-levels"; import { shadowsSketch } from "./assets"; import "./shadow.stories.scss"; @@ -12,7 +12,10 @@ import { DragShadowExample } from "./drag-shadow-example/drag-shadow-example"; -# Shadow + + Shadow + + - [Overview](#overview) - [Shadow levels](#shadow-levels) - [Usage and examples](#usage-and-examples) diff --git a/src/storybook/stand-alone-documentaion/spacing/spacing.stories.mdx b/src/storybook/stand-alone-documentaion/spacing/spacing.stories.mdx index 8b79dd666c..b7968438a3 100644 --- a/src/storybook/stand-alone-documentaion/spacing/spacing.stories.mdx +++ b/src/storybook/stand-alone-documentaion/spacing/spacing.stories.mdx @@ -1,6 +1,6 @@ import { Meta } from "@storybook/addon-docs"; import { SpacingSizes } from "./spacing-sizes/spacing-sizes"; -import { Frame } from "../../components"; +import { ComponentName, Frame } from "../../components"; import {menuExample, tipseenExample, toolbarExample} from "./assets"; import "./spacing.stories.scss"; @@ -10,7 +10,10 @@ import "./spacing.stories.scss"; -# Spacing + + Spacing + + - [Overview](#overview) - [Spacing sizes](#spacing-sizes) - [Usage and examples](#usage-and-examples) diff --git a/src/storybook/stand-alone-documentaion/typography/typography.stories.mdx b/src/storybook/stand-alone-documentaion/typography/typography.stories.mdx index dc40ca75fe..379a51e9b7 100644 --- a/src/storybook/stand-alone-documentaion/typography/typography.stories.mdx +++ b/src/storybook/stand-alone-documentaion/typography/typography.stories.mdx @@ -1,5 +1,5 @@ import { Meta } from "@storybook/addon-docs"; -import { Frame, Link, RelatedComponents } from "../../components"; +import { ComponentName, Frame, Link, RelatedComponents } from "../../components"; import { TextStyles } from "./text-styles/text-styles"; import { TextColors } from "../../components/text-colors/text-colors"; import { COLORS } from "../../components/related-components/component-description-map"; @@ -12,7 +12,10 @@ import "./typography.scss"; -# Typography + + Typography + + - [Overview](#overview) - [Text styles](#text-styles) - [Text colors](#text-colors) diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/EvgeniyBackground.png b/src/storybook/stand-alone-documentaion/welcome/assets/EvgeniyBackground.png new file mode 100644 index 0000000000..d2d9bb5fc2 Binary files /dev/null and b/src/storybook/stand-alone-documentaion/welcome/assets/EvgeniyBackground.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/HadasBackground.png b/src/storybook/stand-alone-documentaion/welcome/assets/HadasBackground.png new file mode 100644 index 0000000000..43128ccc59 Binary files /dev/null and b/src/storybook/stand-alone-documentaion/welcome/assets/HadasBackground.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/MosheBackground.png b/src/storybook/stand-alone-documentaion/welcome/assets/MosheBackground.png new file mode 100644 index 0000000000..edb7623e96 Binary files /dev/null and b/src/storybook/stand-alone-documentaion/welcome/assets/MosheBackground.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/OrrBackground.png b/src/storybook/stand-alone-documentaion/welcome/assets/OrrBackground.png new file mode 100644 index 0000000000..d80ccaa4de Binary files /dev/null and b/src/storybook/stand-alone-documentaion/welcome/assets/OrrBackground.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/SaharBackground.png b/src/storybook/stand-alone-documentaion/welcome/assets/SaharBackground.png new file mode 100644 index 0000000000..23acf369ad Binary files /dev/null and b/src/storybook/stand-alone-documentaion/welcome/assets/SaharBackground.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/WelcomePageCover.png b/src/storybook/stand-alone-documentaion/welcome/assets/WelcomePageCover.png new file mode 100644 index 0000000000..2d90ca082c Binary files /dev/null and b/src/storybook/stand-alone-documentaion/welcome/assets/WelcomePageCover.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/clarity.png b/src/storybook/stand-alone-documentaion/welcome/assets/clarity.png index 703ef9b88d..980efda47c 100644 Binary files a/src/storybook/stand-alone-documentaion/welcome/assets/clarity.png and b/src/storybook/stand-alone-documentaion/welcome/assets/clarity.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/delight.png b/src/storybook/stand-alone-documentaion/welcome/assets/delight.png index a1895d060b..7fe6f260e0 100644 Binary files a/src/storybook/stand-alone-documentaion/welcome/assets/delight.png and b/src/storybook/stand-alone-documentaion/welcome/assets/delight.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/path.png b/src/storybook/stand-alone-documentaion/welcome/assets/path.png index 3e66efc0cf..ba9433232f 100644 Binary files a/src/storybook/stand-alone-documentaion/welcome/assets/path.png and b/src/storybook/stand-alone-documentaion/welcome/assets/path.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/assets/speed.png b/src/storybook/stand-alone-documentaion/welcome/assets/speed.png index a743dd6328..b185425ef2 100644 Binary files a/src/storybook/stand-alone-documentaion/welcome/assets/speed.png and b/src/storybook/stand-alone-documentaion/welcome/assets/speed.png differ diff --git a/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.jsx b/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.jsx index 3c20ea34b0..46932a61a3 100644 --- a/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.jsx +++ b/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.jsx @@ -1,16 +1,12 @@ -import { useMemo } from "react"; +import cx from "classnames"; import { InformationBox } from "../../../components/information-box/information-box"; -import { getElementColor, elementColorsNames } from "../../../../general-stories/colors/colors-vars-map"; +import { elementColorsNames } from "../../../../general-stories/colors/colors-vars-map"; import "./contributor.scss"; const BASE_CLASS = "monday-storybook-welcome-contributor"; -export const Contributor = ({ imgSrc, color, fullName, title }) => { - const backgroundColorStyle = useMemo(() => { - return { backgroundColor: getElementColor(color) }; - }, [color]); - +export const Contributor = ({ imgSrc, className, fullName, title }) => { const contributorVisualImage = ( -
+
); diff --git a/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.scss b/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.scss index 9f0330e328..f16e5334e7 100644 --- a/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.scss +++ b/src/storybook/stand-alone-documentaion/welcome/contributor/contributor.scss @@ -5,7 +5,9 @@ position: relative; width: 100%; height: 182px; - border-radius: $border-radius-small;; + border-radius: $border-radius-small; + background-repeat: no-repeat; + background-size: cover; } &_image { position: absolute; diff --git a/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.jsx b/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.jsx index af6bd6e681..3bed0ae368 100644 --- a/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.jsx +++ b/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.jsx @@ -1,24 +1,42 @@ import { Contributor } from "../contributor/contributor"; -import { Rotem, Evgeniy, Hadas, Orr, Sahar, Moshe } from "../assets"; +import { Evgeniy, Hadas, Orr, Sahar, Moshe } from "../assets"; import "./contributors.scss"; export const Contributors = () => (
- + + + - - -
); diff --git a/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.scss b/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.scss index 1fcd364ddb..a4c2761b5d 100644 --- a/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.scss +++ b/src/storybook/stand-alone-documentaion/welcome/contributors/contributors.scss @@ -7,4 +7,26 @@ grid-template-columns: 1fr 1fr 1fr; grid-gap: $spacing-large; grid-row-gap: 90px; + + &_contributor { + &--orr { + background-image: url('../assets/OrrBackground.png'); + } + + &--evgeniy { + background-image: url('../assets/EvgeniyBackground.png'); + } + + &--hadas { + background-image: url('../assets/HadasBackground.png'); + } + + &--moshe { + background-image: url('../assets/MosheBackground.png'); + } + + &--sahar { + background-image: url('../assets/SaharBackground.png'); + } + } } \ No newline at end of file diff --git a/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.jsx b/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.jsx index 22b52ac185..19ed866ac7 100644 --- a/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.jsx +++ b/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.jsx @@ -5,11 +5,7 @@ import "./other-contributors-list.scss"; const BASE_CLASS = "monday-other-contributors-list"; const excludedDevelopers = new Set(); -/** excludedDevelopers.add(60314759); // Orr Gotlieb -excludedDevelopers.add(72390374); // Hadas Farhi -excludedDevelopers.add(35146205); // Moshe Zemah * */ excludedDevelopers.add(41898282); // github-actions[bot] -// excludedDevelopers.add(9280709); // Sahar Brodbeker excludedDevelopers.add(49699333); // dependabot[bot] export const OtherContributorsList = () => { @@ -21,14 +17,26 @@ export const OtherContributorsList = () => { }, []); const contributors = useMemo(() => { + const finalContributors = []; if (contributorsJson) { - return contributorsJson + // designer contributors + finalContributors.push( + + Rotem Dekel + + ); + + // developer contributors + const developerContributors = contributorsJson .filter(contributor => !excludedDevelopers.has(contributor.id)) .map(contributor => ( {contributor.login} )); + + finalContributors.push(...developerContributors); + return finalContributors; } }, [contributorsJson]); diff --git a/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.scss b/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.scss index 4e330bda10..af04418c1b 100644 --- a/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.scss +++ b/src/storybook/stand-alone-documentaion/welcome/other-contributors-list/other-contributors-list.scss @@ -1,7 +1,8 @@ @import "../../../styles/typography.scss"; +@import "../../../styles/content-spacing"; .monday-other-contributors-list { - @include small-text; + margin-top: $spacing-between-section-items; &_developer:not(:last-child):after { @include small-text; content: "," diff --git a/src/storybook/stand-alone-documentaion/welcome/principle/principle.jsx b/src/storybook/stand-alone-documentaion/welcome/principle/principle.jsx index 9565f221db..01b9767b7d 100644 --- a/src/storybook/stand-alone-documentaion/welcome/principle/principle.jsx +++ b/src/storybook/stand-alone-documentaion/welcome/principle/principle.jsx @@ -4,10 +4,6 @@ import "./principle.scss"; const PRINCIPLE_VISUAL_ELEMENT = `monday-storybook-principle`; export const Principle = ({ imgSrc, title, description }) => { - const principleVisualElement = ( -
- -
- ); + const principleVisualElement = ; return ; }; diff --git a/src/storybook/stand-alone-documentaion/welcome/principle/principle.scss b/src/storybook/stand-alone-documentaion/welcome/principle/principle.scss index 26435c19ae..849cd398f7 100644 --- a/src/storybook/stand-alone-documentaion/welcome/principle/principle.scss +++ b/src/storybook/stand-alone-documentaion/welcome/principle/principle.scss @@ -11,8 +11,4 @@ justify-content: center; align-items: center; } - &_image { - height: 126px; - width: 173px; - } } \ No newline at end of file diff --git a/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.jsx b/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.jsx index d9e539a729..4b602ede6d 100644 --- a/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.jsx +++ b/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.jsx @@ -1,11 +1,9 @@ import { ComponentName } from "../../../components"; -import { headerBanner } from "../assets"; import "./welcome-header.scss"; const BASE_CLASS = "monday-storybook-welcome-header"; export const WelcomeHeader = () => ( Welcome to the monday.com Work OS Design System - ); diff --git a/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.scss b/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.scss index 39d1be9b4e..d931b14623 100644 --- a/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.scss +++ b/src/storybook/stand-alone-documentaion/welcome/welcome-header/welcome-header.scss @@ -6,9 +6,11 @@ height: 294px; display: flex; align-items: center; - @include theme-prop(background-color, dark-background-color); min-width: 650px; padding-left: 40px; + background-repeat: no-repeat; + background-size: cover; + background-image: url('../assets/WelcomePageCover.png'); &_text { width: 461px; diff --git a/src/storybook/stand-alone-documentaion/welcome/welcome.stories.mdx b/src/storybook/stand-alone-documentaion/welcome/welcome.stories.mdx index 6d1385a525..960a368a35 100644 --- a/src/storybook/stand-alone-documentaion/welcome/welcome.stories.mdx +++ b/src/storybook/stand-alone-documentaion/welcome/welcome.stories.mdx @@ -33,9 +33,9 @@ Our design principles were developed based on best practices to ensure top-notch ## Contributors monday.com’s designers, developers, and writers provide teams with universal assets—elements, components, patterns, and code—and the guidance on how to design and build with them. We welcome contributions to monday.com design system! - Read our contributing guide and help us build and improve our components. ### Meet the client foundations team - \ No newline at end of file + +