Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(fluid-inputs): update branch with latest changes from main #3203

Merged
merged 32 commits into from
Oct 14, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a6bf633
chore(release): update carbon deps (#3159)
carbon-automation[bot] Sep 16, 2022
6b5e381
feat(website): add accessibility link, update common js (#3155)
tay1orjones Sep 16, 2022
2cf9d87
fix: mdx formatting inside component demo (#3160)
alisonjoseph Sep 16, 2022
835651e
docs: contained-list (#3145)
laurenmrice Sep 16, 2022
00c3c22
docs(grid): updated with API docs and example (#3136)
sstrubberg Sep 16, 2022
75d038d
fix(typography): fix controls bug (#3130)
aledavila Sep 19, 2022
e0059b2
Updated outdated links to storybook (#3164)
aagonzales Sep 20, 2022
94d7e1e
Change tab text of typography from "Styling strategies" to "Style str…
abhilipsasahoo03 Sep 20, 2022
1821a88
Update accessibility.mdx (#3143)
mbgower Sep 21, 2022
7ea3965
Correct verbiage on ibm commerce platform page (#3157)
francinelucca Sep 21, 2022
34f3b22
Compressed Images (#3162)
github-actions[bot] Sep 23, 2022
85db97a
docs(Theme): update Theme docs with new guidance/usage (#2998)
dakahn Sep 26, 2022
cf56acd
docs(team): removed team page and removed photos from partners (#3170)
sstrubberg Sep 26, 2022
0cc48b8
fix(content): broken links (#3167)
alisonjoseph Sep 27, 2022
62338df
docs(meetups): added office hours) (#3165)
sstrubberg Sep 27, 2022
b3416d2
update dataviz meeting time (#3177)
theiliad Sep 28, 2022
8b0bafa
chore(release): update carbon deps (#3178)
carbon-automation[bot] Sep 30, 2022
30d826f
docs: figma v11 release content updates (#3176)
laurenmrice Sep 30, 2022
d6d2b50
Compressed Images (#3184)
github-actions[bot] Oct 3, 2022
5d881e4
docs(Accordion): match Accordion to ken to code (#3180)
tw15egan Oct 4, 2022
f2ff211
Ecosystem updates (#3150)
mzuliani-ibm Oct 4, 2022
a3326c0
feat: add crosslink banner to carbon platform on homepage (#3185)
alisonjoseph Oct 5, 2022
4f6b0ab
docs: add flush accordion content (#3168)
laurenmrice Oct 5, 2022
fee6747
docs(progress-bar): add component live demo (#3182)
janhassel Oct 6, 2022
e280be0
docs(svelte): update resources and intro (#3183)
metonym Oct 7, 2022
b6ebe8e
Compressed Images (#3189)
github-actions[bot] Oct 11, 2022
5a8054e
docs(contact-us): minor updates to contact us page (#3186)
jeffchew Oct 12, 2022
e9bb1ba
chore(release): update carbon deps (#3194)
carbon-automation[bot] Oct 12, 2022
8591c2d
fix(tutorial): remove optimize sass from step 5 (#3192)
tay1orjones Oct 13, 2022
a06adb9
refactor(tutorial): remove badging (#3197)
tay1orjones Oct 13, 2022
9cffd78
chore(release): update carbon deps (#3200)
carbon-automation[bot] Oct 13, 2022
c73744d
fix(Icons): fix broken link (#3196)
tw15egan Oct 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change tab text of typography from "Styling strategies" to "Style str…
…ategies" (#3163)

* fix: Change tab text from "Styling strategies" to "Style Strategies"

* fix: Change tab text from "Styling strategies" to "Style strategies"

* fix: Change tab text from "Styling strategies" to "Style strategies"

* fix: Change tab text from "Styling strategies" to "Style strategies"

* fix: Update links in page to "Style Strategies"

* fix: Update link in page to "Style strategies"

* fix: rectify verbiage

* fix: fix minor typo

* fix: fix typo

* fix: fix the link to "Style Strategies"

* fix: fix the link to "Style strategies"

* fix: create redirect to "Style strategies"

* Update gatsby-node.js

Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com>
  • Loading branch information
abhilipsasahoo03 and tay1orjones authored Sep 20, 2022
commit 94d7e1eedcaf9f7017aaf03ed0a25b8d455f0504
5 changes: 5 additions & 0 deletions gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,9 @@ exports.createPages = ({ actions }) => {
toPath: '/developing/vue-tutorial/overview',
isPermanent: true,
});
createRedirect({
fromPath: '/guidelines/typography/styling-strategies',
toPath: '/guidelines/typography/style-strategies',
isPermanent: true,
});
};
2 changes: 1 addition & 1 deletion src/pages/guidelines/typography/code.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ title: Typography
description:
Typography can help create clear hierarchies, organize information, and guide
users through a product or experience.
tabs: ['Overview', 'Styling strategies', 'Type sets', 'Code']
tabs: ['Overview', 'Style strategies', 'Type sets', 'Code']
---

<PageDescription>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/guidelines/typography/overview.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Typography
description:
Typography can help create clear hierarchies, organize information, and guide
users through a product or experience.
tabs: ['Overview', 'Styling strategies', 'Type sets', 'Code']
tabs: ['Overview', 'Style strategies', 'Type sets', 'Code']
---

import TypeScaleTable from '../../../../src/components/TypeScaleTable';
Expand Down Expand Up @@ -51,7 +51,7 @@ The productive styles work together to support the hierarchy of information and
set user expectations. On the other hand, the larger expressive type styles
allow for a more dramatic, graphic use of type in editorial and marketing
design. These type styles are excellent for long form reading and scanning, but
would be distracting for use in product.
would be distracting if used in product.

Within **Body styles** and **Utility styles**, the same set of styles are
offered. Productive styles are named with a suffix of `-01` and expressive style
Expand All @@ -63,7 +63,7 @@ headings are responsive and the type styles change size at different
breakpoints.

For more detail, see
[Styling strategies](/guidelines/typography/styling-strategies/) and
[Style strategies](/guidelines/typography/style-strategies/) and
[Type sets](/guidelines/typography/type-sets/).

## Typeface: IBM Plex
Expand Down Expand Up @@ -134,7 +134,7 @@ long text.
### Italic

Each weight has an italic style, which should only be used when you need to
emphasize certain words in a sentence (titles of works, technical terms, names
emphasize certain words in a sentence (i.e., titles of works, technical terms, names
of devices, and captions).

<TypeWeight type="italic" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: Typography
description:
Carbon provides designers with two type sets that support productive and
expressive experiences.
tabs: ['Overview', 'Styling strategies', 'Type sets', 'Code']
tabs: ['Overview', 'Style strategies', 'Type sets', 'Code']
---

<PageDescription>
Expand Down Expand Up @@ -129,7 +129,7 @@ facilitate focus.

### Using productive moments within IBM.com pages

Here are some of the places the Dotcom team use productive moments:
Here are some of the places the Dotcom team uses productive moments:

- The global masthead mega menu
- IBM.com search
Expand Down
12 changes: 6 additions & 6 deletions src/pages/guidelines/typography/type-sets.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Typography
description:
The productive and expressive type sets support designers creating for a full
range of user needs and activities across product and web pages.
tabs: ['Overview', 'Styling strategies', 'Type sets', 'Code']
tabs: ['Overview', 'Style strategies', 'Type sets', 'Code']
---

import TypesetStyle from 'components/TypesetStyle';
Expand Down Expand Up @@ -50,7 +50,7 @@ Carbon uses type tokens to manage typography, and these tokens sit within two
type sets. The productive and expressive type sets support designers creating
for a full range of user needs and activities across product and web pages. To
understand when to use styles from each set, see
[Styling strategies](/guidelines/typography/styling-strategies).
[Style strategies](/guidelines/typography/style-strategies).

#### Base type sizes

Expand All @@ -74,15 +74,15 @@ nature of the pages.
density of information housed inside containers for space efficiency, and in
these situations fixed type styles are a must.

- The expressive type set has two fixed headings, for use where smaller headings
- The expressive type set has two fixed headings that are to be used where smaller headings
are needed. The remaining headings are _fluid_. Web pages need to be able to
flex and work at different breakpoints, and the fluid heading styles change
size at different breakpoints, and can extrapolate/stretch in between sizes
for smooth transitions.

## Utility styles

The utility styles are for use with productive and expressive moments and
The utility styles are used with productive and expressive moments and
include styles for code snippets, labels for captions and helper text, as well
as legal copy. Productive styles have a suffix of `-01` and expressive styles
have a suffix of `-02`.
Expand Down Expand Up @@ -116,7 +116,7 @@ styles change size at different breakpoints.
Do not use these styles inside a container. They may be used in product pages
where text sits outside of a container, and a blend of expressive and productive
type styles is desired for hierarchy and distinction. For more information, see
[Styling strategies](/guidelines/typography/styling-strategies).
[Style strategies](/guidelines/typography/style-strategies).

<TypesetStyle typesets="fluidHeadings" breakpointControls={true} />

Expand All @@ -125,7 +125,7 @@ type styles is desired for hierarchy and distinction. For more information, see
The callout and display styles are part of the expressive set and being fluid,
they will adjust at different breakpoints. Do not use these styles inside a
container. For guidance about using display styles, see
[Styling strategies](/guidelines/typography/styling-strategies#expressive-use-cases).
[Style strategies](/guidelines/typography/style-strategies#expressive-use-cases).

<TypesetStyle typesets="fluidCallouts,fluidDisplay" breakpointControls={true} />

Expand Down