forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-18 05:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix styles import order

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx
View File

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

6
src/index.scss
View File

@@ -1,7 +1,7 @@
@import '@shlinkio/shlink-frontend-kit/base'; @import '@shlinkio/shlink-frontend-kit/base'; // Before bootstrap stylesheet. Includes SASS var overrides
@import '@shlinkio/shlink-frontend-kit/index';
@import '@shlinkio/shlink-web-component/index';
@import 'node_modules/bootstrap/scss/bootstrap.scss'; @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; outline: none !important;

2
test/common/services/HttpClient.test.ts
View File

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