diff --git a/catalog/index.js b/catalog/index.js index 312b8feb3..245a127b2 100644 --- a/catalog/index.js +++ b/catalog/index.js @@ -4,6 +4,7 @@ import { Catalog } from "catalog"; import home from "./pages/home/index"; import colors from "./pages/colors/index"; +import typography from "./pages/typography/index"; import buttons from "./pages/buttons/index"; import grid from "./pages/grid/index"; import icons from "./pages/icons/index"; @@ -11,7 +12,7 @@ import icons from "./pages/icons/index"; const theme = { pageHeadingBackground: "linear-gradient( 124deg, #009cde, #535eb2 )" }; -const pages = [home, colors, buttons, grid, icons]; +const pages = [home, colors, typography, buttons, grid, icons]; const sizes = [ { name: "mobile", width: 480 }, diff --git a/catalog/pages/colors/index.md b/catalog/pages/colors/index.md index 77c8cf4f0..43f6c8030 100644 --- a/catalog/pages/colors/index.md +++ b/catalog/pages/colors/index.md @@ -1,59 +1,41 @@ -### Pacific +### Heliotrope ```color-palette|horizontal -colors: !import pacific +colors: !import heliotrope ``` -### Sierra - -```color-palette|horizontal -colors: !import sierra -``` - -### Cascade - -```color-palette|horizontal -colors: !import cascade -``` - -### Rocky - -```color-palette|horizontal -colors: !import rocky -``` - -### Ridge +### Cruz ```color-palette|horizontal -colors: !import ridge +colors: !import cruz ``` -### Yosemite +### Alert ```color-palette|horizontal -colors: !import yosemite +colors: !import alert ``` -### Helen +### Caution ```color-palette|horizontal -colors: !import helen +colors: !import caution ``` -### Malibu +### positive ```color-palette|horizontal -colors: !import malibu +colors: !import positive ``` -### Catalina +### Onyx ```color-palette|horizontal -colors: !import catalina +colors: !import onyx ``` -### Cruz +### White ```color-palette|horizontal -colors: !import cruz +colors: !import white ``` diff --git a/catalog/pages/grid/index.js b/catalog/pages/grid/index.js index 97d5e627f..e4dfdda21 100644 --- a/catalog/pages/grid/index.js +++ b/catalog/pages/grid/index.js @@ -4,7 +4,7 @@ import { Container, Row, Column } from "../../../src/components/Grid"; import colors from "../../../src/theme/colors"; const contentStyles = { - backgroundColor: colors.pacific.base, + backgroundColor: colors.azure.base, textAlign: "center" }; diff --git a/catalog/pages/icons/index.js b/catalog/pages/icons/index.js index 1f814799b..c440a29fc 100644 --- a/catalog/pages/icons/index.js +++ b/catalog/pages/icons/index.js @@ -9,7 +9,7 @@ import { Container, Row, Column } from "../../../src/components/Grid"; import colors from "../../../src/theme/colors"; const iconStyle = { - backgroundColor: colors.white, + backgroundColor: colors.white.base, padding: "20px", display: "flex", justifyContent: "center", diff --git a/catalog/pages/typography/index.js b/catalog/pages/typography/index.js new file mode 100644 index 000000000..da9ecc5be --- /dev/null +++ b/catalog/pages/typography/index.js @@ -0,0 +1,45 @@ +import { pageLoader } from "catalog"; + +import { colors, typography } from "../../../src/theme"; +import { Container, Row, Column } from "../../../src/components/Grid"; + +const textStyle = { + backgroundColor: colors.white.base, + padding: "20px", + display: "flex", + justifyContent: "center", + alignItems: "center", + fontSize: typography.size.bronto +}; + +const fontWeightLabelStyle = { + padding: "10px", + textAlign: "center" +}; + +const fontSizeRowStyle = { + padding: "20px", + display: "flex", + alignItems: "center" +}; + +const getFontWeightTextStyle = props => ({ + ...textStyle, + ...props +}); + +export default { + path: "/typography", + title: "Typography", + imports: { + colors, + typography, + Container, + Row, + Column, + getFontWeightTextStyle, + fontWeightLabelStyle, + fontSizeRowStyle + }, + content: pageLoader(() => import("./index.md")) +}; diff --git a/catalog/pages/typography/index.md b/catalog/pages/typography/index.md new file mode 100644 index 000000000..3e7ee0f09 --- /dev/null +++ b/catalog/pages/typography/index.md @@ -0,0 +1,98 @@ +### Font Weights + +```react + + + +
Aa
+
Light
+
+ + +
Aa
+
Regular
+
+ + +
Aa
+
Semi Bold
+
+ + +
Aa
+
Extra Bold
+
+
+ +
+``` + +### Font Sizes + +```react +const str = "Better is together"; + + + 12 px + {str} + + + 14 px + {str} + + + 16 px + {str} + + + 20 px + {str} + + + 24 px + {str} + + + 32 px + {str} + + + 46 px + {str} + + + +``` + +### Text Variations + +```react +const str = "Better is together"; + + + Primary + {str} + + + Seconday + {str} + + + Disabled + {str} + + + Alert + {str} + + + Caution + {str} + + + Affirming + {str} + + + +``` diff --git a/src/components/Button/__tests__/__snapshots__/index.spec.js.snap b/src/components/Button/__tests__/__snapshots__/index.spec.js.snap index 9113f1156..5d025cb9e 100644 --- a/src/components/Button/__tests__/__snapshots__/index.spec.js.snap +++ b/src/components/Button/__tests__/__snapshots__/index.spec.js.snap @@ -16,26 +16,26 @@ exports[`