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

[Don't merge] Madretsma #7033

Closed
wants to merge 3 commits into from
Closed

[Don't merge] Madretsma #7033

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
1c6dc05
Draft style changes
ryankeairns Aug 2, 2023
b0680b7
More nits
ryankeairns Aug 2, 2023
48d008c
missed one
ryankeairns Aug 9, 2023
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
2 changes: 1 addition & 1 deletion src-docs/src/views/guidelines/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
}

.guideSass__fontSize--euiFontSizeXXL {
@include euiFontSizeXL;
@include euiFontSizeXXL;
}

.guideSass__shadow {
Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/theme/_components/_theme_example.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const ThemeExample: FunctionComponent<ThemeExample> = ({
css={css`
gap: ${euiTheme.size.xl};

${useEuiPaddingCSS(isLargeBreakpoint ? 'vertical' : undefined).xl};
${useEuiPaddingCSS().xl};
/* padding: ${euiTheme.size.xl}; */

:not(:first-child) {
Expand Down
32 changes: 16 additions & 16 deletions src-docs/src/views/theme/_json/eui_theme_dark.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@
"euiColorVis9_behindText": "#ff7e62",
"euiFontWeightLight": 300,
"euiFontWeightRegular": 400,
"euiFontWeightMedium": 500,
"euiFontWeightSemiBold": 600,
"euiFontWeightBold": 700,
"euiFontWeightMedium": 450,
"euiFontWeightSemiBold": 500,
"euiFontWeightBold": 600,
"euiCodeFontWeightRegular": 400,
"euiCodeFontWeightBold": 700,
"euiCodeFontWeightBold": 600,
"euiFormMaxWidth": "400px",
"euiFormControlHeight": "40px",
"euiFormControlCompressedHeight": "32px",
Expand Down Expand Up @@ -222,41 +222,41 @@
"euiFontSizeXS": "12px",
"euiFontSizeS": "14px",
"euiFontSizeM": "16px",
"euiFontSizeL": "22px",
"euiFontSizeXL": "27px",
"euiFontSizeXXL": "34px",
"euiFontSizeL": "20px",
"euiFontSizeXL": "24px",
"euiFontSizeXXL": "30px",
"euiLineHeight": 1.5,
"euiBodyLineHeight": 1.142857143,
"euiTitles": {
"xxxs": {
"font-size": "12px",
"line-height": "1.14286rem",
"font-weight": 700
"font-weight": 600
},
"xxs": {
"font-size": "14px",
"line-height": "1.71429rem",
"font-weight": 700
"font-weight": 600
},
"xs": {
"font-size": "16px",
"line-height": "1.71429rem",
"font-weight": 700
"font-weight": 600
},
"s": {
"font-size": "22px",
"font-size": "20px",
"line-height": "2.28571rem",
"font-weight": 700
"font-weight": 600
},
"m": {
"font-size": "27px",
"font-size": "24px",
"line-height": "2.28571rem",
"font-weight": 700
"font-weight": 600
},
"l": {
"font-size": "34px",
"font-size": "30px",
"line-height": "2.85714rem",
"font-weight": 700
"font-weight": 600
}
},
"euiZLevel0": 0,
Expand Down
68 changes: 34 additions & 34 deletions src-docs/src/views/theme/_json/eui_theme_light.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@
"euiAnimSpeedExtraSlow": "500ms",
"euiBorderWidthThin": "1px",
"euiBorderWidthThick": "2px",
"euiBorderColor": "#d3dae6",
"euiBorderColor": "#d3d9e6",
"euiBorderRadius": "6px",
"euiBorderRadiusSmall": "4px",
"euiBorderThick": "2px solid #d3dae6",
"euiBorderThin": "1px solid #d3dae6",
"euiBorderEditable": "2px dotted #d3dae6",
"euiBorderThick": "2px solid #d3d9e6",
"euiBorderThin": "1px solid #d3d9e6",
"euiBorderEditable": "2px dotted #d3d9e6",
"euiButtonHeight": "40px",
"euiButtonHeightSmall": "32px",
"euiButtonHeightXSmall": "24px",
"euiButtonColorDisabled": "#abb4c4",
"euiButtonColorDisabledText": "#abb4c4",
"euiButtonColorGhostDisabled": "#69707d",
"euiButtonColorGhostDisabled": "#6a707c",
"euiButtonTypes": {
"primary": "#0077cc",
"accent": "#f04e98",
"success": "#00bfb3",
"warning": "#fec514",
"danger": "#bd271e",
"ghost": "#ffffff",
"text": "#69707d"
"text": "#6a707c"
},
"euiPaletteColorBlind": {
"euiColorVis0": {
Expand Down Expand Up @@ -109,11 +109,11 @@
"euiColorVis9_behindText": "#ff7e62",
"euiFontWeightLight": 300,
"euiFontWeightRegular": 400,
"euiFontWeightMedium": 500,
"euiFontWeightSemiBold": 600,
"euiFontWeightBold": 700,
"euiFontWeightMedium": 450,
"euiFontWeightSemiBold": 500,
"euiFontWeightBold": 600,
"euiCodeFontWeightRegular": 400,
"euiCodeFontWeightBold": 700,
"euiCodeFontWeightBold": 600,
"euiFormMaxWidth": "400px",
"euiFormControlHeight": "40px",
"euiFormControlCompressedHeight": "32px",
Expand Down Expand Up @@ -142,9 +142,9 @@
"euiFormBorderDisabledColor": "rgba(17, 43, 134, 0.09999999999999998)",
"euiFormCustomControlDisabledIconColor": "#5e646f",
"euiFormCustomControlBorderColor": "#c9cbcd",
"euiFormControlDisabledColor": "#98a2b3",
"euiFormControlDisabledColor": "#98a1b3",
"euiFormControlBoxShadow": "0 0 rgba(0, 0, 0, 0)",
"euiFormControlPlaceholderText": "#69707d",
"euiFormControlPlaceholderText": "#6a707c",
"euiFormInputGroupLabelBackground": "#e9edf3",
"euiFormInputGroupBorder": "none",
"euiSwitchOffColor": "rgba(152, 162, 179, 0.19999999999999996)",
Expand All @@ -161,7 +161,7 @@
"euiHeaderBackgroundColor": "#ffffff",
"euiHeaderDarkBackgroundColor": "#25282f",
"euiHeaderBorderColor": "#cdd3df",
"euiHeaderBreadcrumbColor": "#343741",
"euiHeaderBreadcrumbColor": "#2e3138",
"euiHeaderHeight": "48px",
"euiHeaderChildSize": "40px",
"euiHeaderHeightCompensation": "48px",
Expand Down Expand Up @@ -222,41 +222,41 @@
"euiFontSizeXS": "12px",
"euiFontSizeS": "14px",
"euiFontSizeM": "16px",
"euiFontSizeL": "22px",
"euiFontSizeXL": "27px",
"euiFontSizeXXL": "34px",
"euiFontSizeL": "20px",
"euiFontSizeXL": "24px",
"euiFontSizeXXL": "30px",
"euiLineHeight": 1.5,
"euiBodyLineHeight": 1.142857143,
"euiTitles": {
"xxxs": {
"font-size": "12px",
"line-height": "1.14286rem",
"font-weight": 700
"font-weight": 600
},
"xxs": {
"font-size": "14px",
"line-height": "1.71429rem",
"font-weight": 700
"font-weight": 600
},
"xs": {
"font-size": "16px",
"line-height": "1.71429rem",
"font-weight": 700
"font-weight": 600
},
"s": {
"font-size": "22px",
"font-size": "20px",
"line-height": "2.28571rem",
"font-weight": 700
"font-weight": 600
},
"m": {
"font-size": "27px",
"font-size": "24px",
"line-height": "2.28571rem",
"font-weight": 700
"font-weight": 600
},
"l": {
"font-size": "34px",
"font-size": "30px",
"line-height": "2.85714rem",
"font-weight": 700
"font-weight": 600
}
},
"euiZLevel0": 0,
Expand Down Expand Up @@ -286,17 +286,17 @@
"euiColorWarning": "#fec514",
"euiColorDanger": "#bd271e",
"euiColorEmptyShade": "#ffffff",
"euiColorLightestShade": "#f5f7fa",
"euiColorLightShade": "#d3dae6",
"euiColorMediumShade": "#98a2b3",
"euiColorDarkShade": "#69707d",
"euiColorDarkestShade": "#343741",
"euiColorFullShade": "#000000",
"euiColorLightestShade": "#f1f4fa",
"euiColorLightShade": "#d3d9e6",
"euiColorMediumShade": "#98a1b3",
"euiColorDarkShade": "#6a707c",
"euiColorDarkestShade": "#2e3138",
"euiColorFullShade": "#030303",
"euiPageBackgroundColor": "#fafbfd",
"euiColorHighlight": "#fff9e8",
"euiTextColor": "#343741",
"euiTextColor": "#2e3138",
"euiTitleColor": "#1a1c21",
"euiTextSubduedColor": "#69707d",
"euiTextSubduedColor": "#6a707c",
"euiColorDisabled": "#abb4c4",
"euiColorPrimaryText": "#0071c2",
"euiColorSuccessText": "#007e77",
Expand All @@ -306,5 +306,5 @@
"euiColorDisabledText": "#abb4c4",
"euiLinkColor": "#0071c2",
"euiColorChartLines": "#eef0f3",
"euiColorChartBand": "#f5f7fa"
"euiColorChartBand": "#f1f4fa"
}
2 changes: 1 addition & 1 deletion src-docs/src/views/theme/typography/values.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export default () => {
fullWidth
id={htmlIdGenerator()()}
min={300}
max={700}
max={600}
step={1}
value={fontWeight}
onChange={onFontWeightChange}
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/header_logo/header_logo.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const euiHeaderLogoStyles = (euiThemeContext: UseEuiTheme) => {
}
`,
euiHeaderLogo__text: css`
${euiTitle(euiThemeContext, 'xxs')}
${euiTitle(euiThemeContext, 'xs')}
${logicalCSS('padding-left', euiTheme.size.base)}

${euiBreakpoint(euiThemeContext, ['xs'])} {
Expand Down
3 changes: 1 addition & 2 deletions src/components/page_template/inner/page_inner.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ export const euiPageInnerStyles = (euiThemeContext: UseEuiTheme) => {
`,

panelled: css`
background: ${euiBackgroundColor(euiThemeContext, 'plain')};
${euiShadow(euiThemeContext, 'm')}
background: ${euiBackgroundColor(euiThemeContext, 'plain')}
`,

border: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/panel/panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ export const EuiPanel: FunctionComponent<EuiPanelProps> = ({
paddingSize = 'm',
borderRadius = 'm',
color = 'plain',
hasShadow = true,
hasBorder = false,
hasShadow = false,
hasBorder = true,
grow = true,
panelRef,
element,
Expand Down
1 change: 1 addition & 0 deletions src/components/popover/popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ export class EuiPopover extends Component<Props, State> {
className={classNames(panelClassName, panelProps?.className)}
hasDragDrop={hasDragDrop}
hasShadow={false}
hasBorder={false}
paddingSize={panelPaddingSize}
tabIndex={tabIndex}
aria-live={ariaLive}
Expand Down
12 changes: 6 additions & 6 deletions src/components/title/title.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ export const euiTitle = (
const titleScaleToFontSizeScaleMap: {
[size in EuiTitleSize]: _EuiThemeFontScale;
} = {
xxxs: 'xs',
xxs: 's',
xs: 'm',
s: 'l',
m: 'xl',
l: 'xxl',
xxxs: 'xxs',
xxs: 'xs',
xs: 's',
s: 'm',
m: 'l',
l: 'xl',
};

return {
Expand Down
4 changes: 2 additions & 2 deletions src/global_styling/variables/_borders.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ $euiBorderWidthThin: 1px !default;
$euiBorderWidthThick: 2px !default;

$euiBorderColor: $euiColorLightShade !default;
$euiBorderRadius: $euiSizeS * .75 !default;
$euiBorderRadiusSmall: $euiSizeS * .5 !default;
$euiBorderRadius: $euiSizeS * .5 !default;
$euiBorderRadiusSmall: $euiSizeS * .25 !default;
$euiBorderThick: $euiBorderWidthThick solid $euiBorderColor !default;
$euiBorderThin: $euiBorderWidthThin solid $euiBorderColor !default;
$euiBorderEditable: $euiBorderWidthThick dotted $euiBorderColor !default;
8 changes: 4 additions & 4 deletions src/global_styling/variables/_font_weight.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// Font weights
$euiFontWeightLight: 300 !default;
$euiFontWeightRegular: 400 !default;
$euiFontWeightMedium: 500 !default;
$euiFontWeightSemiBold: 600 !default;
$euiFontWeightBold: 700 !default;
$euiFontWeightMedium: 450 !default;
$euiFontWeightSemiBold: 500 !default;
$euiFontWeightBold: 600 !default;
$euiCodeFontWeightRegular: 400 !default;
$euiCodeFontWeightBold: 700 !default;
$euiCodeFontWeightBold: 600 !default;
6 changes: 3 additions & 3 deletions src/global_styling/variables/typography.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ export type _EuiThemeFontWeights = {
light: CSSProperties['fontWeight'];
/** - Default value: 400 */
regular: CSSProperties['fontWeight'];
/** - Default value: 500 */
/** - Default value: 450 */
medium: CSSProperties['fontWeight'];
/** - Default value: 600 */
/** - Default value: 500 */
semiBold: CSSProperties['fontWeight'];
/** - Default value: 700 */
/** - Default value: 600 */
bold: CSSProperties['fontWeight'];
};

Expand Down
12 changes: 6 additions & 6 deletions src/themes/amsterdam/_colors_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ $euiColorDanger: #BD271E !default;

// Grays
$euiColorEmptyShade: #FFF !default;
$euiColorLightestShade: #F5F7FA !default;
$euiColorLightShade: #D3DAE6 !default;
$euiColorMediumShade: #98A2B3 !default;
$euiColorDarkShade: #69707D !default;
$euiColorDarkestShade: #343741 !default;
$euiColorFullShade: #000 !default;
$euiColorLightestShade: #F1F4FA !default;
$euiColorLightShade: #D3D9E6 !default;
$euiColorMediumShade: #98A1B3 !default;
$euiColorDarkShade: #6A707C !default;
$euiColorDarkestShade: #2E3138 !default;
$euiColorFullShade: #030303 !default;

// Backgrounds
$euiPageBackgroundColor: tint($euiColorLightestShade, 50%) !default;
Expand Down
4 changes: 2 additions & 2 deletions src/themes/amsterdam/global_styling/variables/_borders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export const border: _EuiThemeBorder = {
thick: '2px',
},
radius: {
medium: computed(sizeToPixel(0.375)),
small: computed(sizeToPixel(0.25)),
medium: computed(sizeToPixel(0.25)),
small: computed(sizeToPixel(0.125)),
},
thin: computed(
([width, color]) => `${width.thin} solid ${color}`,
Expand Down
Loading
Loading