Skip to content

chore(styles): Remove custom styles for the css vars table #4110

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.

Sign up for GitHub

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

Merged
nicolethoen merged 7 commits into from
Jul 11, 2024
Merged

chore(styles): Remove custom styles for the css vars table #4110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0cc8daf
chore(styles): Remove custom styles for the css vars table
wise-king-sullyman Jun 25, 2024
08f38f4
Merge branch 'v6' into css-vars-styles
wise-king-sullyman Jul 8, 2024
de57cb5
revert back to using CSS for creating the color samples
wise-king-sullyman Jul 8, 2024
9677eef
fix(cssVariables): Only show color sample for color vars
wise-king-sullyman Jul 9, 2024
05ae2da
Merge branch 'v6' into css-vars-styles
wise-king-sullyman Jul 10, 2024
e525c54
chore(deps): Bump docs framework version
wise-king-sullyman Jul 10, 2024
c49747e
fix(cssVariables): Add hex color values back with light theme note
wise-king-sullyman Jul 10, 2024
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
20 changes: 9 additions & 11 deletions packages/documentation-framework/components/cssVariables/cssVariables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
.ws-color-box {
display: inline-block;
height: 18px;
width: 18px;
/* border: var(--pf-v6-global--BorderWidth--sm) solid var(--pf-v6-global--BorderColor--200); */
/* border-radius: var(--pf-v6-global--BorderRadius--lg); */
}

.ws-td-text {
/* font-size: var(--pf-v6-global--FontSize--sm) !important; */
.circle {
height: 1em;
display: inline-block;
aspect-ratio: 1 / 1;
border-radius: 50%;
border: var(--pf-t--global--border--width--regular) solid var(--pf-t--global--background--color--inverse--default);
box-shadow: var(--pf-t--global--box-shadow--sm);
}

.ws-css-property {
padding: var(--pf-t--global--spacer--xs) var(--pf-t--global--spacer--md);
.rotate-90-deg {
transform: rotate(90deg);
}
39 changes: 13 additions & 26 deletions packages/documentation-framework/components/cssVariables/cssVariables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
import { debounce } from "@patternfly/react-core";
import { List, ListItem, debounce } from "@patternfly/react-core";
import {
Table,
Thead,
Expand All @@ -10,33 +10,22 @@ import {
} from "@patternfly/react-table";
import { AutoLinkHeader } from "../autoLinkHeader/autoLinkHeader";
import * as tokensModule from "@patternfly/react-tokens/dist/esm/componentIndex";
import global_spacer_md from "@patternfly/react-tokens/dist/esm/global_spacer_md";
import LevelUpAltIcon from "@patternfly/react-icons/dist/esm/icons/level-up-alt-icon";
import { CSSSearch } from './cssSearch';

const isColorRegex = /^(#|rgb)/;

const mappingAsList = (property, values) => (
<div>
<div className="ws-css-property">
<span>
{property}
</span>
</div>
{values.map((entry, index) => (
<div
key={index}
style={{
padding: `4px 0 4px calc(${global_spacer_md.value} * ${index + 3})`
}}
<List isPlain>
<ListItem>{property}</ListItem>
{values.map((entry) => (
<ListItem
icon={<LevelUpAltIcon className="rotate-90-deg" />}
>
<LevelUpAltIcon style={{ transform: 'rotate(90deg)' }} />
<span style={{ paddingLeft: '16px' }}>
{entry}
</span>
</div>
{entry}
</ListItem>
))}
</div>
</List>
);

const flattenList = files => {
Expand Down Expand Up @@ -97,6 +86,7 @@ export class CSSVariables extends React.Component {
(values && searchRE.test(JSON.stringify(values)));
if (passes) {
const rowKey = `${selector}_${property}`;
const isColor = isColorRegex.test(value);
const cells = [
...this.props.hideSelectorColumn ? [] : [selector],
property,
Expand All @@ -105,22 +95,19 @@ export class CSSVariables extends React.Component {
key={`${rowKey}_1`}
className="pf-v6-l-flex pf-m-space-items-sm"
>
{isColorRegex.test(value) && (
{isColor && (
<div
key={`${rowKey}_2`}
className="pf-v6-l-flex pf-m-column pf-m-align-self-center"
>
<span
className="ws-color-box"
style={{ backgroundColor: value }}
/>
<span className="circle" style={{ backgroundColor: `var(${property})`}}/>
</div>
)}
<div
key={`${rowKey}_3`}
className="pf-v6-l-flex pf-m-column pf-m-align-self-center ws-td-text"
>
{value}
{isColor && '(In light theme)'} {value}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/documentation-site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"screenshots": "pf-docs-framework screenshots"
},
"dependencies": {
"@patternfly/documentation-framework": "6.0.0-alpha.55",
"@patternfly/documentation-framework": "6.0.0-alpha.57",
"@patternfly/react-catalog-view-extension": "6.0.0-alpha.4",
"@patternfly/react-console": "6.0.0-alpha.3",
"@patternfly/react-docs": "7.0.0-alpha.84",
Expand Down