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

apply fix #5

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
df80f8d
apply fix
bhackett1024 Nov 18, 2024
1aac9ca
bump
bhackett1024 Nov 18, 2024
a991664
Merge remote-tracking branch 'origin/main' into fix-1
bhackett1024 Nov 19, 2024
8d3f062
fix
bhackett1024 Nov 19, 2024
105f852
Merge branch 'main' into fix-1
bhackett1024 Nov 19, 2024
74fe486
wip
bhackett1024 Nov 19, 2024
0f001ac
wip
bhackett1024 Nov 20, 2024
1661ed1
fix
bhackett1024 Nov 20, 2024
fe9cb60
version
bhackett1024 Nov 20, 2024
9909062
version
bhackett1024 Nov 20, 2024
7bb4e3d
version
bhackett1024 Nov 20, 2024
261f46f
version
bhackett1024 Nov 20, 2024
daa6163
version
bhackett1024 Nov 20, 2024
c0bbfb4
version
bhackett1024 Nov 20, 2024
09a3661
version
bhackett1024 Nov 20, 2024
0af012c
version
bhackett1024 Nov 20, 2024
dba97d6
version
bhackett1024 Nov 20, 2024
beb8dbf
version
bhackett1024 Nov 20, 2024
3449a14
version
bhackett1024 Nov 20, 2024
ff217e6
wip
bhackett1024 Nov 21, 2024
c4d5b89
wip
bhackett1024 Nov 21, 2024
a00bba9
wip
bhackett1024 Nov 21, 2024
bf28ec8
wip
bhackett1024 Nov 21, 2024
102ed9e
wip
bhackett1024 Nov 21, 2024
f133bbf
wip
bhackett1024 Nov 21, 2024
a73fd35
version
bhackett1024 Nov 24, 2024
c1e6cd5
version
bhackett1024 Nov 24, 2024
daf0c6d
version
bhackett1024 Nov 24, 2024
93ae3e4
version
bhackett1024 Nov 24, 2024
04a347d
version
bhackett1024 Nov 24, 2024
fb5c789
bump
bhackett1024 Nov 25, 2024
68e2362
bump
bhackett1024 Nov 25, 2024
9f36df6
version
bhackett1024 Nov 25, 2024
2eb74f8
version
bhackett1024 Nov 25, 2024
021a8f4
version
bhackett1024 Nov 25, 2024
7913735
version
bhackett1024 Nov 25, 2024
43c6a7f
version
bhackett1024 Nov 25, 2024
9b6b7b2
version
bhackett1024 Nov 25, 2024
7ef36de
Merge branch 'main' into fix-1
bhackett1024 Nov 25, 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
1 change: 1 addition & 0 deletions src/devtools/client/inspector/computed/actions/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export async function createComputedProperties(
stylesheet,
stylesheetURL,
overridden: !!property.overridden,
important: property.priority === "important",
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export default function MatchedSelector(props: MatchedSelectorProps) {
colorSwatchClassName="computed-colorswatch"
fontFamilySpanClassName="computed-font-family"
values={selector.parsedValue}
important={selector.important}
/>
</div>
</span>
Expand Down
1 change: 1 addition & 0 deletions src/devtools/client/inspector/computed/state/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface MatchedSelectorState {
overridden: boolean;
stylesheet: string;
stylesheetURL: string;
important: boolean;
}

export interface ComputedState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ interface DeclarationValueProps {
colorSwatchClassName: string;
fontFamilySpanClassName: string;
values: (string | Record<string, string>)[];
important?: boolean;
}

class DeclarationValue extends React.PureComponent<DeclarationValueProps> {
render() {
return this.props.values.map(v => {
const renderedValues = this.props.values.map(v => {
if (typeof v === "string") {
return v;
}
Expand Down Expand Up @@ -46,6 +47,13 @@ class DeclarationValue extends React.PureComponent<DeclarationValueProps> {

return value;
});

return (
<React.Fragment>
{renderedValues}
{this.props.important && " !important"}
</React.Fragment>
);
}
}

Expand Down