Skip to content

Commit eadf506

Browse files
bsastregxbsastregx
authored
[mercury/fix-icons] (#386)
* fix `create-database-tables` icon * update showcase files * Delete Assistant.svg * remove assistant icon * put back assistant icon
1 parent eb785ab commit eadf506

File tree

13 files changed

+371
-376
lines changed

13 files changed

+371
-376
lines changed

‎packages/mercury/showcase/all.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/mercury/showcase/assets/scripts/assets/MERCURY_ASSETS.js‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4785,6 +4785,41 @@ export const MERCURY_ASSETS = freeze({
47854785
})
47864786
})
47874787
}),
4788+
assistant: freeze({
4789+
"on-surface": freeze({
4790+
enabled: freeze({
4791+
name: "system_assistant_on-surface--enabled"
4792+
}),
4793+
hover: freeze({
4794+
name: "system_assistant_on-surface--hover"
4795+
}),
4796+
active: freeze({
4797+
name: "system_assistant_on-surface--active"
4798+
}),
4799+
disabled: freeze({
4800+
name: "system_assistant_on-surface--disabled"
4801+
})
4802+
}),
4803+
"on-elevation": freeze({
4804+
enabled: freeze({
4805+
name: "system_assistant_on-elevation--enabled"
4806+
})
4807+
}),
4808+
primary: freeze({
4809+
enabled: freeze({
4810+
name: "system_assistant_primary--enabled"
4811+
}),
4812+
hover: freeze({
4813+
name: "system_assistant_primary--hover"
4814+
}),
4815+
active: freeze({
4816+
name: "system_assistant_primary--active"
4817+
}),
4818+
disabled: freeze({
4819+
name: "system_assistant_primary--disabled"
4820+
})
4821+
})
4822+
}),
47884823
"arrow-up": freeze({
47894824
"on-surface": freeze({
47904825
enabled: freeze({
@@ -5064,41 +5099,6 @@ export const MERCURY_ASSETS = freeze({
50645099
name: "system_add-circle_primary--disabled"
50655100
})
50665101
})
5067-
}),
5068-
Assistant: freeze({
5069-
"on-surface": freeze({
5070-
enabled: freeze({
5071-
name: "system_Assistant_on-surface--enabled"
5072-
}),
5073-
hover: freeze({
5074-
name: "system_Assistant_on-surface--hover"
5075-
}),
5076-
active: freeze({
5077-
name: "system_Assistant_on-surface--active"
5078-
}),
5079-
disabled: freeze({
5080-
name: "system_Assistant_on-surface--disabled"
5081-
})
5082-
}),
5083-
"on-elevation": freeze({
5084-
enabled: freeze({
5085-
name: "system_Assistant_on-elevation--enabled"
5086-
})
5087-
}),
5088-
primary: freeze({
5089-
enabled: freeze({
5090-
name: "system_Assistant_primary--enabled"
5091-
}),
5092-
hover: freeze({
5093-
name: "system_Assistant_primary--hover"
5094-
}),
5095-
active: freeze({
5096-
name: "system_Assistant_primary--active"
5097-
}),
5098-
disabled: freeze({
5099-
name: "system_Assistant_primary--disabled"
5100-
})
5101-
})
51025102
})
51035103
}),
51045104
states: freeze({

‎packages/mercury/showcase/icons/index.html‎

Lines changed: 248 additions & 248 deletions
Large diffs are not rendered by default.

‎packages/mercury/showcase/scss/mercury.scss‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5250,10 +5250,10 @@
52505250
}
52515251

52525252
%dialog {
5253-
--spacing-body-block-start: var(--mer-spacing--lg);
5254-
--spacing-body-block-end: var(--mer-spacing--lg);
5255-
--spacing-body-inline-start: var(--mer-spacing--md);
5256-
--spacing-body-inline-end: var(--mer-spacing--md);
5253+
--spacing-body-block-start: var(--mer-spacing--md);
5254+
--spacing-body-block-end: var(--mer-spacing--md);
5255+
--spacing-body-inline-start: var(--mer-spacing--sm);
5256+
--spacing-body-inline-end: var(--mer-spacing--sm);
52575257
--ch-dialog-max-inline-size: 800px;
52585258
background-color: var(--mer-surface__elevation--01);
52595259
box-shadow: var(--mer-box-shadow--01);
@@ -5294,8 +5294,8 @@
52945294
}
52955295

52965296
&__footer {
5297-
@include control-footer-base();
5298-
@include control-footer-border();
5297+
padding-block: var(--mer-spacing--xs);
5298+
padding-inline: var(--mer-spacing--sm);
52995299
}
53005300

53015301
// ------------------------------
@@ -5397,6 +5397,8 @@
53975397
#{$footer-selector} {
53985398
@extend %dialog__footer;
53995399
}
5400+
// @include buttons-spacer($footer-selector);
5401+
@include control-footer($with-border-selector: $footer-selector);
54005402

54015403
// ------------------------------
54025404
// Edges (For dragging)
@@ -13953,6 +13955,15 @@
1395313955
--icon__system_card-variant_primary--hover: url('#{$icons-path}system/light/card-variant.svg#primary--hover');
1395413956
--icon__system_card-variant_primary--active: url('#{$icons-path}system/light/card-variant.svg#primary--active');
1395513957
--icon__system_card-variant_primary--disabled: url('#{$icons-path}system/light/card-variant.svg#primary--disabled');
13958+
--icon__system_assistant_on-surface--enabled: url('#{$icons-path}system/light/assistant.svg#on-surface--enabled');
13959+
--icon__system_assistant_on-surface--hover: url('#{$icons-path}system/light/assistant.svg#on-surface--hover');
13960+
--icon__system_assistant_on-surface--active: url('#{$icons-path}system/light/assistant.svg#on-surface--active');
13961+
--icon__system_assistant_on-surface--disabled: url('#{$icons-path}system/light/assistant.svg#on-surface--disabled');
13962+
--icon__system_assistant_on-elevation--enabled: url('#{$icons-path}system/light/assistant.svg#on-elevation--enabled');
13963+
--icon__system_assistant_primary--enabled: url('#{$icons-path}system/light/assistant.svg#primary--enabled');
13964+
--icon__system_assistant_primary--hover: url('#{$icons-path}system/light/assistant.svg#primary--hover');
13965+
--icon__system_assistant_primary--active: url('#{$icons-path}system/light/assistant.svg#primary--active');
13966+
--icon__system_assistant_primary--disabled: url('#{$icons-path}system/light/assistant.svg#primary--disabled');
1395613967
--icon__system_arrow-up_on-surface--enabled: url('#{$icons-path}system/light/arrow-up.svg#on-surface--enabled');
1395713968
--icon__system_arrow-up_on-surface--hover: url('#{$icons-path}system/light/arrow-up.svg#on-surface--hover');
1395813969
--icon__system_arrow-up_on-surface--active: url('#{$icons-path}system/light/arrow-up.svg#on-surface--active');
@@ -14025,15 +14036,6 @@
1402514036
--icon__system_add-circle_primary--hover: url('#{$icons-path}system/light/add-circle.svg#primary--hover');
1402614037
--icon__system_add-circle_primary--active: url('#{$icons-path}system/light/add-circle.svg#primary--active');
1402714038
--icon__system_add-circle_primary--disabled: url('#{$icons-path}system/light/add-circle.svg#primary--disabled');
14028-
--icon__system_Assistant_on-surface--enabled: url('#{$icons-path}system/light/Assistant.svg#on-surface--enabled');
14029-
--icon__system_Assistant_on-surface--hover: url('#{$icons-path}system/light/Assistant.svg#on-surface--hover');
14030-
--icon__system_Assistant_on-surface--active: url('#{$icons-path}system/light/Assistant.svg#on-surface--active');
14031-
--icon__system_Assistant_on-surface--disabled: url('#{$icons-path}system/light/Assistant.svg#on-surface--disabled');
14032-
--icon__system_Assistant_on-elevation--enabled: url('#{$icons-path}system/light/Assistant.svg#on-elevation--enabled');
14033-
--icon__system_Assistant_primary--enabled: url('#{$icons-path}system/light/Assistant.svg#primary--enabled');
14034-
--icon__system_Assistant_primary--hover: url('#{$icons-path}system/light/Assistant.svg#primary--hover');
14035-
--icon__system_Assistant_primary--active: url('#{$icons-path}system/light/Assistant.svg#primary--active');
14036-
--icon__system_Assistant_primary--disabled: url('#{$icons-path}system/light/Assistant.svg#primary--disabled');
1403714039

1403814040
}
1403914041

@@ -14610,6 +14612,15 @@
1461014612
--icon__system_card-variant_primary--hover: url('#{$icons-path}system/dark/card-variant.svg#primary--hover');
1461114613
--icon__system_card-variant_primary--active: url('#{$icons-path}system/dark/card-variant.svg#primary--active');
1461214614
--icon__system_card-variant_primary--disabled: url('#{$icons-path}system/dark/card-variant.svg#primary--disabled');
14615+
--icon__system_assistant_on-surface--enabled: url('#{$icons-path}system/dark/assistant.svg#on-surface--enabled');
14616+
--icon__system_assistant_on-surface--hover: url('#{$icons-path}system/dark/assistant.svg#on-surface--hover');
14617+
--icon__system_assistant_on-surface--active: url('#{$icons-path}system/dark/assistant.svg#on-surface--active');
14618+
--icon__system_assistant_on-surface--disabled: url('#{$icons-path}system/dark/assistant.svg#on-surface--disabled');
14619+
--icon__system_assistant_on-elevation--enabled: url('#{$icons-path}system/dark/assistant.svg#on-elevation--enabled');
14620+
--icon__system_assistant_primary--enabled: url('#{$icons-path}system/dark/assistant.svg#primary--enabled');
14621+
--icon__system_assistant_primary--hover: url('#{$icons-path}system/dark/assistant.svg#primary--hover');
14622+
--icon__system_assistant_primary--active: url('#{$icons-path}system/dark/assistant.svg#primary--active');
14623+
--icon__system_assistant_primary--disabled: url('#{$icons-path}system/dark/assistant.svg#primary--disabled');
1461314624
--icon__system_arrow-up_on-surface--enabled: url('#{$icons-path}system/dark/arrow-up.svg#on-surface--enabled');
1461414625
--icon__system_arrow-up_on-surface--hover: url('#{$icons-path}system/dark/arrow-up.svg#on-surface--hover');
1461514626
--icon__system_arrow-up_on-surface--active: url('#{$icons-path}system/dark/arrow-up.svg#on-surface--active');
@@ -14682,15 +14693,6 @@
1468214693
--icon__system_add-circle_primary--hover: url('#{$icons-path}system/dark/add-circle.svg#primary--hover');
1468314694
--icon__system_add-circle_primary--active: url('#{$icons-path}system/dark/add-circle.svg#primary--active');
1468414695
--icon__system_add-circle_primary--disabled: url('#{$icons-path}system/dark/add-circle.svg#primary--disabled');
14685-
--icon__system_Assistant_on-surface--enabled: url('#{$icons-path}system/dark/Assistant.svg#on-surface--enabled');
14686-
--icon__system_Assistant_on-surface--hover: url('#{$icons-path}system/dark/Assistant.svg#on-surface--hover');
14687-
--icon__system_Assistant_on-surface--active: url('#{$icons-path}system/dark/Assistant.svg#on-surface--active');
14688-
--icon__system_Assistant_on-surface--disabled: url('#{$icons-path}system/dark/Assistant.svg#on-surface--disabled');
14689-
--icon__system_Assistant_on-elevation--enabled: url('#{$icons-path}system/dark/Assistant.svg#on-elevation--enabled');
14690-
--icon__system_Assistant_primary--enabled: url('#{$icons-path}system/dark/Assistant.svg#primary--enabled');
14691-
--icon__system_Assistant_primary--hover: url('#{$icons-path}system/dark/Assistant.svg#primary--hover');
14692-
--icon__system_Assistant_primary--active: url('#{$icons-path}system/dark/Assistant.svg#primary--active');
14693-
--icon__system_Assistant_primary--disabled: url('#{$icons-path}system/dark/Assistant.svg#primary--disabled');
1469414696

1469514697
}
1469614698

‎packages/mercury/src/assets/MERCURY_ASSETS.ts‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4787,6 +4787,41 @@ export const MERCURY_ASSETS = freeze({
47874787
})
47884788
})
47894789
}),
4790+
assistant: freeze({
4791+
"on-surface": freeze({
4792+
enabled: freeze({
4793+
name: "system_assistant_on-surface--enabled"
4794+
}),
4795+
hover: freeze({
4796+
name: "system_assistant_on-surface--hover"
4797+
}),
4798+
active: freeze({
4799+
name: "system_assistant_on-surface--active"
4800+
}),
4801+
disabled: freeze({
4802+
name: "system_assistant_on-surface--disabled"
4803+
})
4804+
}),
4805+
"on-elevation": freeze({
4806+
enabled: freeze({
4807+
name: "system_assistant_on-elevation--enabled"
4808+
})
4809+
}),
4810+
primary: freeze({
4811+
enabled: freeze({
4812+
name: "system_assistant_primary--enabled"
4813+
}),
4814+
hover: freeze({
4815+
name: "system_assistant_primary--hover"
4816+
}),
4817+
active: freeze({
4818+
name: "system_assistant_primary--active"
4819+
}),
4820+
disabled: freeze({
4821+
name: "system_assistant_primary--disabled"
4822+
})
4823+
})
4824+
}),
47904825
"arrow-up": freeze({
47914826
"on-surface": freeze({
47924827
enabled: freeze({
@@ -5066,41 +5101,6 @@ export const MERCURY_ASSETS = freeze({
50665101
name: "system_add-circle_primary--disabled"
50675102
})
50685103
})
5069-
}),
5070-
Assistant: freeze({
5071-
"on-surface": freeze({
5072-
enabled: freeze({
5073-
name: "system_Assistant_on-surface--enabled"
5074-
}),
5075-
hover: freeze({
5076-
name: "system_Assistant_on-surface--hover"
5077-
}),
5078-
active: freeze({
5079-
name: "system_Assistant_on-surface--active"
5080-
}),
5081-
disabled: freeze({
5082-
name: "system_Assistant_on-surface--disabled"
5083-
})
5084-
}),
5085-
"on-elevation": freeze({
5086-
enabled: freeze({
5087-
name: "system_Assistant_on-elevation--enabled"
5088-
})
5089-
}),
5090-
primary: freeze({
5091-
enabled: freeze({
5092-
name: "system_Assistant_primary--enabled"
5093-
}),
5094-
hover: freeze({
5095-
name: "system_Assistant_primary--hover"
5096-
}),
5097-
active: freeze({
5098-
name: "system_Assistant_primary--active"
5099-
}),
5100-
disabled: freeze({
5101-
name: "system_Assistant_primary--disabled"
5102-
})
5103-
})
51045104
})
51055105
}),
51065106
states: freeze({

‎packages/mercury/src/assets/icons/_generated/menus/dark/create-database-tables.svg‎

Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)