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.

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

Update style of expand and sort symbol #904

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Update style of expand and sort symbol #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7a2dfd
update style to match new icon style
nielslyngsoe Sep 15, 2024
4031642
remove width and height
nielslyngsoe Sep 16, 2024
8f0dee2
Merge branch 'v1/contrib' into v1/feature/expand-and-sort-symbol-update
nielslyngsoe Sep 16, 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
15 changes: 10 additions & 5 deletions packages/uui-caret/lib/uui-caret.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ export class UUICaretElement extends LitElement {
}

render() {
return html`<svg viewBox="0 0 512 512">
<path d="M 255.125 400.35 L 88.193 188.765 H 422.055 Z"></path>
return html`<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round">
<path d="m4 9 8 8 8-8"></path>
</svg>`;
}

Expand All @@ -39,10 +46,8 @@ export class UUICaretElement extends LitElement {
}

svg {
fill: currentColor;
transform-origin: 50% 50%;
transition: transform 280ms cubic-bezier(0.17, -0.88, 0.82, 1.84); /* Julia's beloved easing */
}
transition: transform 100ms cubic-bezier(0.1, 0, 0.9, 1);

:host([open]) svg {
transform: rotate(180deg);
Expand Down
14 changes: 10 additions & 4 deletions packages/uui-symbol-expand/lib/uui-symbol-expand.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@ export class UUISymbolExpandElement extends LitElement {
public open = false;

render() {
return html`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
<path d="M 255.125 400.35 L 88.193 188.765 H 422.055 Z"></path>
return html`<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round">
<path d="m4 9 8 8 8-8"></path>
</svg>`;
}

Expand All @@ -32,10 +39,9 @@ export class UUISymbolExpandElement extends LitElement {
}

svg {
fill: currentColor;
transform: rotate(-90deg);
transform-origin: 50% 50%;
transition: transform 120ms ease-in-out;
transition: transform 100ms cubic-bezier(0.1, 0, 0.9, 1);
width: 100%;
height: 100%;
}
Expand Down
44 changes: 30 additions & 14 deletions packages/uui-symbol-sort/lib/uui-symbol-sort.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,31 @@ export class UUISymbolSortElement extends ActiveMixin(LitElement) {
public descending = false;

render() {
return html`<svg
return html` <svg
id="up"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512 512">
<path d="M 255.125 400.35 L 88.193 188.765 H 422.055 Z"></path>
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round">
<path d="m4 9 8 8 8-8"></path>
</svg>
<svg id="down" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
<path d="M 255.125 400.35 L 88.193 188.765 H 422.055 Z"></path>
<svg
id="down"
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="3"
stroke-linecap="round"
stroke-linejoin="round">
<path d="m4 9 8 8 8-8"></path>
</svg>`;
}

Expand All @@ -35,39 +52,38 @@ export class UUISymbolSortElement extends ActiveMixin(LitElement) {
:host {
position: relative;
display: inline-block;
width: 0.8em;
width: 0.9em;
height: 1em;
vertical-align: middle;
//vertical-align: middle;
pointer-events: none;
}

svg {
position: absolute;
left: 0;
top: 50%;
width: 0.8em;
fill: currentColor;
width: 0.9em;
transform-origin: 50% 50%;
transition:
transform 120ms ease-in-out,
opacity 120ms,
margin-top 240ms;
opacity: 0;
margin-top: -0.5em;
margin-top: -8em;
}

#up {
transform: rotate(180deg);
margin-top: -0.7em;
margin-top: -1.05em;
}
#down {
margin-top: -0.3em;
margin-top: -0.55em;
}
:host([active]) #up {
margin-top: calc(-0.5em - (0.2em * var(--uui-symbol-sort-hover, 0)));
margin-top: calc(-0.8em - (0.25em * var(--uui-symbol-sort-hover, 0)));
}
:host([active]) #down {
margin-top: calc(-0.5em + (0.2em * var(--uui-symbol-sort-hover, 0)));
margin-top: calc(-0.8em + (0.25em * var(--uui-symbol-sort-hover, 0)));
}

:host(:hover) {
Expand Down
1 change: 1 addition & 0 deletions packages/uui-table/lib/uui-table.story.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import '.';
import './uui-table-advanced-example';
import '@umbraco-ui/uui-box/lib';
import '@umbraco-ui/uui-symbol-sort/lib';

import { Meta, Story } from '@storybook/web-components';
import { html } from 'lit';
Expand Down
Loading