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

Jump to bottom

[apm][uptime][monitoring] Remove color="ghost" buttons #169312

Merged
merged 6 commits into from
Oct 27, 2023
Merged

[apm][uptime][monitoring] Remove color="ghost" buttons #169312

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f597b03
[apm] Remove unnecessary `ghost` colors from `EuiBottomBar`
cee-chen Oct 18, 2023
b109b08
[monitoring] Remove unnecessary `ghost` colors from `EuiBottomBar`
cee-chen Oct 18, 2023
4b6cbbe
[uptime] Convert `color="ghost"` button to dark mode wrapper
cee-chen Oct 18, 2023
9b79429
Update snapshots
cee-chen Oct 18, 2023
11082da
update button style
shahzad31 Oct 27, 2023
084d18a
Merge branch 'main' into eui-ghost/observability
shahzad31 Oct 27, 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
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/components/app/settings/bottom_bar_actions/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function BottomBarActions({
}}
>
<EuiHealth color="warning" />
<EuiText color="ghost">
<EuiText>
{i18n.translate('xpack.apm.bottomBarActions.unsavedChanges', {
defaultMessage:
'{unsavedChangesCount, plural, =0{0 unsaved changes} one {1 unsaved change} other {# unsaved changes}} ',
Expand All @@ -55,7 +55,7 @@ export function BottomBarActions({
<EuiFlexItem grow={false}>
<EuiButtonEmpty
data-test-subj="apmBottomBarActionsDiscardChangesButton"
color="ghost"
color="text"
onClick={onDiscardChanges}
>
{i18n.translate(
Expand Down
48 changes: 20 additions & 28 deletions x-pack/plugins/monitoring/public/components/renderers/__snapshots__/setup_mode.test.js.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 8 additions & 17 deletions x-pack/plugins/monitoring/public/components/renderers/setup_mode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@
* 2.0.
*/

import {
EuiBottomBar,
EuiFlexGroup,
EuiFlexItem,
EuiIcon,
EuiSpacer,
EuiTextColor,
} from '@elastic/eui';
import { EuiBottomBar, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import React, { Fragment } from 'react';
import { withKibana } from '@kbn/kibana-react-plugin/public';
Expand Down Expand Up @@ -144,15 +137,13 @@ export class WrappedSetupModeRenderer extends React.Component {
<EuiFlexItem grow={false}>
<EuiFlexGroup gutterSize="s">
<EuiFlexItem grow={false}>
<EuiTextColor color="ghost">
<FormattedMessage
id="xpack.monitoring.setupMode.description"
defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
values={{
flagIcon: <EuiIcon type="flag" />,
}}
/>
</EuiTextColor>
<FormattedMessage
id="xpack.monitoring.setupMode.description"
defaultMessage="You are in setup mode. The ({flagIcon}) icon indicates configuration options."
values={{
flagIcon: <EuiIcon type="flag" />,
}}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
Expand Down
41 changes: 25 additions & 16 deletions x-pack/plugins/uptime/public/legacy_uptime/components/settings/settings_actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@
*/

import React from 'react';
import { EuiFlexGroup, EuiFlexItem, EuiButton, EuiButtonEmpty, EuiText } from '@elastic/eui';
import {
EuiFlexGroup,
EuiFlexItem,
EuiButton,
EuiButtonEmpty,
EuiText,
EuiThemeProvider,
} from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { euiStyled } from '@kbn/kibana-react-plugin/common';
import { SettingsPageFieldErrors } from '../../pages/settings';
Expand Down Expand Up @@ -41,21 +48,23 @@ export const SettingsActions = ({
</WarningText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButtonEmpty
color="ghost"
size="s"
iconType="cross"
data-test-subj="discardSettingsButton"
isDisabled={!isFormDirty || isFormDisabled}
onClick={() => {
onCancel();
}}
>
<FormattedMessage
id="xpack.uptime.sourceConfiguration.discardSettingsButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
<EuiThemeProvider colorMode="dark">
shahzad31 marked this conversation as resolved.
Show resolved Hide resolved
<EuiButtonEmpty
color="text"
size="s"
iconType="cross"
data-test-subj="discardSettingsButton"
isDisabled={!isFormDirty || isFormDisabled}
onClick={() => {
onCancel();
}}
>
<FormattedMessage
id="xpack.uptime.sourceConfiguration.discardSettingsButtonLabel"
defaultMessage="Cancel"
/>
</EuiButtonEmpty>
</EuiThemeProvider>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
Expand Down