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

fix: remove margins on host elements #20710

Merged
merged 2 commits into from
Nov 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "fix: remove margins from host elements",
"packageName": "@fluentui/web-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
1 change: 0 additions & 1 deletion packages/web-components/src/checkbox/checkbox.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const checkboxStyles: (context: ElementDefinitionContext, definition: Che
${display('inline-flex')} :host {
align-items: center;
outline: none;
margin: calc(${designUnit} * 1px) 0;
${
/*
* Chromium likes to select label text or the default slot when
Expand Down
3 changes: 1 addition & 2 deletions packages/web-components/src/divider/divider.styles.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { css, ElementStyles } from '@microsoft/fast-element';
import { display, ElementDefinitionContext, FoundationElementDefinition } from '@microsoft/fast-foundation';
import { designUnit, neutralStrokeDividerRest, strokeWidth } from '../design-tokens';
import { neutralStrokeDividerRest, strokeWidth } from '../design-tokens';

export const dividerStyles: (
context: ElementDefinitionContext,
Expand All @@ -10,7 +10,6 @@ export const dividerStyles: (
${display('block')} :host {
box-sizing: content-box;
height: 0;
margin: calc(${designUnit} * 1px) 0;
border: none;
border-top: calc(${strokeWidth} * 1px) solid ${neutralStrokeDividerRest};
}
Expand Down
1 change: 0 additions & 1 deletion packages/web-components/src/flipper/flipper.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export const flipperStyles: (context: ElementDefinitionContext, definition: Flip
height: calc((${heightNumber} + ${designUnit}) * 1px);
justify-content: center;
align-items: center;
margin: 0;
fill: currentcolor;
color: ${neutralFillStrongRest};
background: padding-box linear-gradient(${neutralFillRest}, ${neutralFillRest}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export const optionStyles: (
font-size: ${typeRampBaseFontSize};
height: calc(${heightNumber} * 1px);
line-height: ${typeRampBaseLineHeight};
margin: 0 calc(${designUnit} * 1px);
outline: none;
overflow: hidden;
align-items: center;
Expand Down
5 changes: 5 additions & 0 deletions packages/web-components/src/listbox/listbox.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
display,
ElementDefinitionContext,
FoundationElementDefinition,
ListboxOption
} from '@microsoft/fast-foundation';
import {
controlCornerRadius,
Expand All @@ -26,6 +27,10 @@ export const listboxStyles: (
outline: none;
}

::slotted(${context.tagFor(ListboxOption)}) {
margin: 0 calc(${designUnit} * 1px);
}

:host(:focus-within:not([disabled])) {
border-color: ${focusStrokeOuter};
box-shadow: 0 0 0 1px ${focusStrokeOuter} inset;
Expand Down
2 changes: 0 additions & 2 deletions packages/web-components/src/menu-item/menu-item.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { DirectionalStyleSheetBehavior, heightNumber } from '../styles/index';
import {
bodyFont,
controlCornerRadius,
designUnit,
disabledOpacity,
focusStrokeOuter,
focusStrokeWidth,
Expand Down Expand Up @@ -42,7 +41,6 @@ export const menuItemStyles: (context: ElementDefinitionContext, definition: Men
justify-items: center;
align-items: center;
padding: 0;
margin: 0 calc(${designUnit} * 1px);
white-space: nowrap;
color: ${neutralForegroundRest};
fill: currentcolor;
Expand Down
11 changes: 9 additions & 2 deletions packages/web-components/src/menu/menu.styles.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css, ElementStyles } from '@microsoft/fast-element';
import { display, ElementDefinitionContext, forcedColorsStylesheetBehavior, FoundationElementDefinition } from '@microsoft/fast-foundation';
import { display, Divider, ElementDefinitionContext, forcedColorsStylesheetBehavior, FoundationElementDefinition, MenuItem } from '@microsoft/fast-foundation';
import { SystemColors } from "@microsoft/fast-web-utilities";
import { elevationShadowFlyout } from '../styles/index';
import {
Expand All @@ -20,7 +20,6 @@ export const menuStyles: (
border: calc(${strokeWidth} * 1px) solid transparent;
border-radius: calc(${layerCornerRadius} * 1px);
box-shadow: ${elevationShadowFlyout};
margin: 0;
padding: calc(${designUnit} * 1px) 0;
max-width: 368px;
min-width: 64px;
Expand All @@ -31,6 +30,14 @@ export const menuStyles: (
margin: 0 calc(${designUnit} * 2px);
}

::slotted(${context.tagFor(MenuItem)}) {
margin: 0 calc(${designUnit} * 1px);
}

::slotted(${context.tagFor(Divider)}) {
margin: calc(${designUnit} * 1px) 0;
}

::slotted(hr) {
box-sizing: content-box;
height: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export const progressRingStyles: (
outline: none;
height: calc(${heightNumber} * 1px);
width: calc(${heightNumber} * 1px);
margin: calc(${heightNumber} * 1px) 0;
}

.progress {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export const progressStyles: (context: ElementDefinitionContext, definition: Pro
align-items: center;
outline: none;
height: calc((${strokeWidth} * 3) * 1px);
margin: calc(${designUnit} * 1px) 0;
}

.progress {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { css, ElementStyles } from '@microsoft/fast-element';
import { display, ElementDefinitionContext, FoundationElementDefinition } from '@microsoft/fast-foundation';
import { designUnit } from '../design-tokens';

export const radioGroupStyles: (
context: ElementDefinitionContext,
definition: FoundationElementDefinition,
) => ElementStyles = (context: ElementDefinitionContext, definition: FoundationElementDefinition) => css`
${display('flex')} :host {
align-items: flex-start;
margin: calc(${designUnit} * 1px) 0;
flex-direction: column;
}

Expand Down
1 change: 0 additions & 1 deletion packages/web-components/src/radio/radio.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const radioStyles: (context: ElementDefinitionContext, definition: RadioO
--input-size: calc((${heightNumber} / 2) + ${designUnit});
align-items: center;
outline: none;
margin: calc(${designUnit} * 1px) 0;
${
/*
* Chromium likes to select label text or the default slot when
Expand Down
1 change: 0 additions & 1 deletion packages/web-components/src/slider/slider.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export const sliderStyles: (context: ElementDefinitionContext, definition: Slide
--track-width: ${designUnit};
align-items: center;
width: 100%;
margin: calc(${designUnit} * 1px) 0;
user-select: none;
box-sizing: border-box;
border-radius: calc(${controlCornerRadius} * 1px);
Expand Down
6 changes: 3 additions & 3 deletions packages/web-components/src/switch/switch.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ export const switchStyles: (context: ElementDefinitionContext, definition: Switc
align-items: center;
outline: none;
font-family: ${bodyFont};
margin: calc(${designUnit} * 1px) 0;
${
/*
* Chromium likes to select label text or the default slot when
Expand Down Expand Up @@ -140,8 +139,9 @@ export const switchStyles: (context: ElementDefinitionContext, definition: Switc
cursor: pointer;
}

.status-message {
margin-inline-start: calc(${designUnit} * 2px + 2px);
::slotted([slot="checked-message"]),
::slotted([slot="unchecked-message"]) {
margin-inline-start: calc(${designUnit} * 2px + 2px);
}

:host(.checked) .switch {
Expand Down