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

Fluid pattern v2 #3382

Merged
merged 45 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1954431
Modal accessibility content and images (#3303)
mbgower Dec 20, 2022
add1f1f
Compressed Images (#3321)
github-actions[bot] Jan 3, 2023
2d503e0
Compressed Images (#3323)
github-actions[bot] Jan 3, 2023
c6dc314
typo fix (#3324)
jeanservaas Jan 3, 2023
c4eea1d
typo fix (#3325)
jeanservaas Jan 3, 2023
764e01b
Update tooltip accessibility.mdx (#3318)
mbgower Jan 3, 2023
aa4790b
Tooltip accessibility update (#3330)
mbgower Jan 4, 2023
5ca4ef4
update usage image (#3331)
laurenmrice Jan 5, 2023
da42bee
added fourth accessibility tab to toggletip (#3319)
mbgower Jan 5, 2023
c5214a4
chore(release): update carbon deps (#3335)
carbon-automation[bot] Jan 6, 2023
454d19d
chore(deps): bump json5 from 1.0.1 to 1.0.2 (#3338)
dependabot[bot] Jan 6, 2023
2f02240
Compressed Images (#3340)
github-actions[bot] Jan 9, 2023
df1b868
update .mdx (#3337)
laurenmrice Jan 12, 2023
feaee4e
docs: tooltip a11y tab update (#3336)
laurenmrice Jan 12, 2023
8b82fdb
Compressed Images (#3349)
github-actions[bot] Jan 17, 2023
a6bdc38
updating the color tokens on the color page (#3345)
thyhmdo Jan 17, 2023
6864782
chore(release): update carbon deps (#3350)
carbon-automation[bot] Jan 18, 2023
7a97c96
chore(release): update carbon deps (#3355)
carbon-automation[bot] Jan 20, 2023
451f151
Update link to 2x grid page (#3358)
carsonmccue Jan 24, 2023
8b26fef
Dropdown accessibility (#3353)
mbgower Jan 25, 2023
6dbaf7e
Select accessibility (#3354)
mbgower Jan 25, 2023
4c7f162
Create sync-platform-branch action (#3365)
francinelucca Jan 27, 2023
4202a4b
ci(deploy): remove ibm cloud deploy (#3367)
tay1orjones Jan 27, 2023
c04bb0a
Compressed Images (#3371)
github-actions[bot] Jan 30, 2023
4dfeb33
[Bug] Update colors for Status indicators (#3346)
thyhmdo Jan 30, 2023
91c7e63
Update .kodiak.toml (#3374)
tay1orjones Feb 1, 2023
8294300
chore(release): update carbon deps (#3372)
carbon-automation[bot] Feb 2, 2023
7f0d9ea
Rename sync-platform-branch to sync-platform-branch.yml (#3376)
francinelucca Feb 3, 2023
895acdb
Compressed Images (#3378)
github-actions[bot] Feb 6, 2023
5891a37
fix(react): replace codesandbox link with stackblitz (#3369)
tay1orjones Feb 7, 2023
87ecd4b
Create index.mdx
aagonzales Feb 8, 2023
d05ed2d
Merge branch 'fluid-inputs' into fluid-pattern-v2
aagonzales Feb 8, 2023
f61bb6a
added-placeholder-images
aagonzales Feb 8, 2023
6486629
Merge branch 'fluid-pattern-v2' of https://github.com/aagonzales/carb…
aagonzales Feb 8, 2023
18868e6
Updates from design review
aagonzales Feb 13, 2023
ea3d53b
chore(yarn): update checksums
tay1orjones Feb 13, 2023
3961328
updated images
aagonzales Feb 13, 2023
431bed1
images + related updates
aagonzales Feb 13, 2023
c773b85
Update index.mdx
aagonzales Feb 13, 2023
1e3b9bb
added-placement
aagonzales Feb 14, 2023
d6ca537
Update fluid-pattern-placement.png
aagonzales Feb 14, 2023
b576106
updated-file-name
aagonzales Feb 14, 2023
6ed041e
Update nav-items.yaml
aagonzales Feb 14, 2023
9e7efd7
fixed-typos
aagonzales Feb 14, 2023
794b2ab
Apply suggestions from code review
aagonzales Feb 14, 2023
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
32 changes: 0 additions & 32 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,6 @@ on:
- main

jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js 16.x
uses: actions/setup-node@v2-beta
with:
node-version: 16.x

- name: Install packages
run: yarn install --frozen-lockfile --network-timeout 300000

- name: Build site
run: yarn build:clean

- name: Install IBM Cloud CLI
run: curl -fsSL https://clis.cloud.ibm.com/install/osx | sh

- name: Install Cloud Foundry CLI
run: ibmcloud cf install -v 6.51.0

- name: Login to ibmcloud
env:
API_KEY: ${{ secrets.API_KEY }}
run:
ibmcloud login -a "https://cloud.ibm.com" -u apikey -p "$API_KEY" -o
"carbon-design-system" -s "production" -r "us-south"

- name: Deploy website
run: |
ibmcloud cf v3-zdt-push carbon-website -b https://github.com/cloudfoundry/nginx-buildpack.git

gh-pages:
if: github.repository == 'carbon-design-system/carbon-website'
runs-on: ubuntu-latest
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/sync-platform-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Sync Platform Branch
on:
schedule:
# Runs on Fridays 6:00 UTC (-6 CT, -5 EST)
# ┌───────────── minute (0 - 59)
# │ ┌───────────── hour (0 - 23)
# │ │ ┌───────────── day of the month (1 - 31)
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
# │ │ │ │ │
# │ │ │ │ │
# │ │ │ │ │
- cron: 0 6 * * 5

# Enable running this workflow manually from the Actions tab
workflow_dispatch: # Allow for running this manually.

jobs:
sync-branches:
runs-on: ubuntu-latest
name: Syncing branches
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 16
- name: Opening pull request
id: pull
uses: tretuna/sync-branches@1.4.0
with:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
FROM_BRANCH: "main"
TO_BRANCH: "carbon-platform"
PULL_REQUEST_BODY: "Platform Sync, pulling in new content from main into carbon-platform branch"
CONTENT_COMPARISON: true
REVIEWERS: '["francinelucca","andreancardona","alisonjoseph"]'
3 changes: 2 additions & 1 deletion .kodiak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
version = 1

[merge]
automerge_label = "status: ready to merge 🎉"
automerge_label = ["status: ready to merge 🎉", "status: enable automerge 🟠"]
notify_on_conflict = "false"
method = "squash"
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"dependencies": {
"@babel/core": "^7.15.8",
"@carbon/charts-react": "0.55.0",
"@carbon/elements": "^11.18.0-rc.0",
"@carbon/icons-react": "^11.15.0-rc.0",
"@carbon/pictograms": "^12.11.0",
"@carbon/pictograms-react": "^11.37.0",
"@carbon/react": "^1.21.0-rc.0",
"@carbon/elements": "^11.19.0",
"@carbon/icons-react": "^11.16.0",
"@carbon/pictograms": "^12.12.0",
"@carbon/pictograms-react": "^11.38.0",
"@carbon/react": "^1.22.0",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/ColorGrid/ColorGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {
colors,
black100,
green60,
green50,
orange40,
red60,
white0,
Expand Down Expand Up @@ -34,7 +34,7 @@ export default function ColorGrid({ colorFamily, ...rest }) {
<ColorSwatch hex={red60} />
<ColorSwatch hex={orange40} />
<ColorSwatch hex={yellow20} />
<ColorSwatch hex={green60} />
<ColorSwatch hex={green50} />
</div>
);
}
Expand Down
6 changes: 6 additions & 0 deletions src/components/MdxIcon/icons/stackblitz.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/components/MdxIcon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { mdxIcon, iconInverse } from './MdxIcon.module.scss';
import sketch from './icons/sketch.svg';
import ase from './icons/ase.png';
import codesandbox from './icons/codesandbox.svg';
import stackblitz from './icons/stackblitz.svg';
import codepen from './icons/codepen.svg';
import illustrator from './icons/illustrator.svg';
import react from './icons/react.png';
Expand All @@ -23,6 +24,7 @@ const localIcons = {
sketch,
ase,
codesandbox,
stackblitz,
codepen,
illustrator,
react,
Expand Down
8 changes: 4 additions & 4 deletions src/data/guidelines/color-tokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -1922,12 +1922,12 @@ const colorTokens = {
role: ['Success', 'On'],
value: {
white: {
name: 'Green 60',
hex: '#198038',
name: 'Green 50',
hex: '#24a148',
},
g10: {
name: 'Green 60',
hex: '#198038',
name: 'Green 50',
hex: '#24a148',
},
g90: {
name: 'Green 40',
Expand Down
2 changes: 2 additions & 0 deletions src/data/nav-items.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@
path: /patterns/empty-states-pattern/
- title: Filtering
path: /patterns/filtering/
- title: Fluid styles
path: /patterns/fluid-styles/
- title: Forms
path: /patterns/forms-pattern/
- title: Global header
Expand Down
25 changes: 18 additions & 7 deletions src/data/status-indicators/palettes.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,32 @@ export const statusLight = [
light: true,
},
{
name: 'Green 60',
hex: '198038',
name: 'Green 50',
hex: '24A148',
light: true,
},
{
name: 'Orange 50',
hex: 'eb6200',
name: 'Orange 40',
hex: 'ff832b',
light: false,
},
{ name: 'Blue 60', hex: '0f62fe', light: true },
{
name: 'Orange 60 (outline)',
hex: 'ba4e00',
light: true,
},

{
name: 'Yellow 30',
hex: 'f1c21b',
light: false,
},
{
name: 'Yellow 60 (outline)',
hex: '8e6a00',
light: true,
},
{ name: 'Blue 70', hex: '0043ce', light: true },
{ name: 'Purple 60', hex: '8a3ffc', light: true },
{
name: 'Gray 60',
Expand All @@ -35,8 +46,8 @@ export const statusDark = [
light: false,
},
{
name: 'Green 50',
hex: '24a148',
name: 'Green 40',
hex: '42be65',
light: false,
},
{
Expand Down
Loading