Skip to content
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
Expand Up @@ -62,6 +62,6 @@ describe('Dashboard actions', () => {
// Verify the color of the outlined star (gray)
cy.get('@starIconOutlinedAfter')
.should('have.css', 'color')
.and('eq', 'rgb(133, 133, 133)');
.and('eq', 'rgba(0, 0, 0, 0.45)');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const FaveStar = ({
<Icons.StarOutlined
aria-label="unstarred"
iconSize="l"
iconColor={theme.colors.grayscale.light1}
iconColor={theme.colorTextTertiary}
name="favorite-unselected"
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,10 @@ test('renders clickable items with blue icons when the bar is collapsed', async
const images = screen.getAllByRole('img');
const clickableColor = window.getComputedStyle(images[0]).color;
const nonClickableColor = window.getComputedStyle(images[1]).color;
expect(clickableColor).toBe(hexToRgb(supersetTheme.colors.primary.base));
expect(nonClickableColor).toBe(hexToRgb(supersetTheme.colorText));
expect(clickableColor).toBe(hexToRgb(supersetTheme.colorPrimary));
expect(nonClickableColor.replace(/\s+/g, '')).toBe(
supersetTheme.colorTextTertiary.replace(/\s+/g, ''),
);
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const StyledItem = styled.div<{
padding-right: ${last ? 0 : SPACE_BETWEEN_ITEMS}px;
cursor: ${onClick ? 'pointer' : 'default'};
& .metadata-icon {
color: ${onClick && collapsed ? theme.colorPrimary : theme.colorTextBase};
color: ${onClick && collapsed ? theme.colorPrimary : theme.colorTextTertiary};
padding-right: ${collapsed ? 0 : ICON_PADDING}px;
& .anticon {
line-height: 0;
Expand Down
7 changes: 1 addition & 6 deletions superset-frontend/src/dashboard/components/Header/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
FeatureFlag,
t,
getExtensionsRegistry,
useTheme,
} from '@superset-ui/core';
import { Global } from '@emotion/react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
Expand Down Expand Up @@ -159,7 +158,6 @@ const discardChanges = () => {
};

const Header = () => {
const theme = useTheme();
const dispatch = useDispatch();
const [didNotifyMaxUndoHistoryToast, setDidNotifyMaxUndoHistoryToast] =
useState(false);
Expand Down Expand Up @@ -650,10 +648,7 @@ const Header = () => {
data-test="header-save-button"
aria-label={t('Save')}
>
<Icons.SaveOutlined
iconColor={hasUnsavedChanges && theme.colors.primary.light5}
iconSize="m"
/>
<Icons.SaveOutlined iconSize="m" />
{t('Save')}
</Button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
TextAreaEditor,
ModalTrigger,
} from '@superset-ui/core/components';
import { t, withTheme } from '@superset-ui/core';
import { t, withTheme, css } from '@superset-ui/core';

import ControlHeader from 'src/explore/components/ControlHeader';

Expand Down Expand Up @@ -112,6 +112,11 @@ class TextAreaControl extends Component {
const codeEditor = (
<div>
<TextAreaEditor
css={css`
.ace_gutter-active-line {
background-color: inherit;
}
`}
mode={this.props.language}
style={style}
minLines={minLines}
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/pages/DatasetList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
'You must be a dataset owner in order to edit. Please reach out to a dataset owner to request modifications or edit access.',
)
}
placement="bottomRight"
placement="bottom"
>
<span
role="button"
Expand Down
Loading