Fix styles import order

This commit is contained in:
Alejandro Celaya 2023-08-07 23:06:29 +02:00
parent 8decceaa38
commit 74aaed65b6
3 changed files with 6 additions and 6 deletions

View file

@ -26,11 +26,11 @@ export const ShortUrlsRowMenu = (
return (
<RowDropdownBtn minWidth={190}>
<DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="visits">
<DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="visits" asLink>
<FontAwesomeIcon icon={pieChartIcon} fixedWidth /> Visit stats
</DropdownItem>
<DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="edit">
<DropdownItem tag={ShortUrlDetailLink} shortUrl={shortUrl} suffix="edit" asLink>
<FontAwesomeIcon icon={editIcon} fixedWidth /> Edit short URL
</DropdownItem>

View file

@ -1,7 +1,7 @@
@import '@shlinkio/shlink-frontend-kit/base';
@import '@shlinkio/shlink-frontend-kit/index';
@import '@shlinkio/shlink-web-component/index';
@import '@shlinkio/shlink-frontend-kit/base'; // Before bootstrap stylesheet. Includes SASS var overrides
@import 'node_modules/bootstrap/scss/bootstrap.scss';
@import '@shlinkio/shlink-frontend-kit/index'; // After bootstrap. Includes CSS overwrites
@import '@shlinkio/shlink-web-component/index';
* {
outline: none !important;

View file

@ -61,7 +61,7 @@ describe('HttpClient', () => {
const theError = { error: true, foo: 'bar' };
fetch.mockResolvedValue({ json: () => theError, ok: false });
await expect(httpClient.fetchJson('')).rejects.toEqual(theError);
await expect(httpClient.fetchEmpty('')).rejects.toEqual(theError);
});
});
});