From 1c059279de5f04bb100e6aa7199853a98d000937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Thu, 16 Nov 2023 10:52:58 +0100 Subject: [PATCH 01/24] Setting line-height for large size in class instead of inline style --- src/fa-layers-text.svelte | 11 ++++++++++- src/fa-layers.svelte | 5 +++++ src/fa.svelte | 5 +++++ src/utils.js | 3 --- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/fa-layers-text.svelte b/src/fa-layers-text.svelte index f05b659..9910d52 100644 --- a/src/fa-layers-text.svelte +++ b/src/fa-layers-text.svelte @@ -35,8 +35,17 @@ $: s = getStyles( ); + + - + diff --git a/src/fa-layers.svelte b/src/fa-layers.svelte index eaaba92..4feafb2 100644 --- a/src/fa-layers.svelte +++ b/src/fa-layers.svelte @@ -17,6 +17,10 @@ $: s = getStyles(style, size, pull, true); - + Date: Thu, 16 Nov 2023 13:48:36 +0100 Subject: [PATCH 13/24] Setting custom sizes with direct JS element manipulation --- src/fa-layers-text.svelte | 29 ++++++++++++++++------------- src/fa-layers.svelte | 11 +++++++---- src/fa.svelte | 13 ++++++++----- src/utils.js | 18 ++++++------------ 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/fa-layers-text.svelte b/src/fa-layers-text.svelte index 89f409a..ae624a1 100644 --- a/src/fa-layers-text.svelte +++ b/src/fa-layers-text.svelte @@ -1,8 +1,10 @@ diff --git a/src/fa-layers.svelte b/src/fa-layers.svelte index 037ea46..ac96fc1 100644 --- a/src/fa-layers.svelte +++ b/src/fa-layers.svelte @@ -44,17 +44,39 @@ onMount(() => { setCustomSize(containerElement, size); }); .svelte-fa-layers :global(.svelte-fa-layers-text span) { display: inline-block; } + +.svelte-fa-pull-left { + float: left; +} + +.svelte-fa-pull-right { + float: right; +} + +.svelte-fa-size-lg { + font-size: 1.33333em; + line-height: .75em; + vertical-align: -.225em; +} + +.svelte-fa-size-sm { + font-size: .875em; +} + +.svelte-fa-size-xs { + font-size: .75em; +} diff --git a/src/fa.svelte b/src/fa.svelte index 81eabfb..00eb8af 100644 --- a/src/fa.svelte +++ b/src/fa.svelte @@ -59,25 +59,25 @@ $: transform = getTransform(scale, translateX, translateY, rotate, flip, 512); width: 1.25em; } -:global(.svelte-fa-pull-left) { +.svelte-fa-pull-left { float: left; } -:global(.svelte-fa-pull-right) { +.svelte-fa-pull-right { float: right; } -:global(.svelte-fa-size-lg) { +.svelte-fa-size-lg { font-size: 1.33333em; line-height: .75em; vertical-align: -.225em; } -:global(.svelte-fa-size-sm) { +.svelte-fa-size-sm { font-size: .875em; } -:global(.svelte-fa-size-xs) { +.svelte-fa-size-xs { font-size: .75em; } From d253597fb4077e4afa20257d721101b1f0b39554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Sun, 26 Nov 2023 13:40:42 +0100 Subject: [PATCH 23/24] Fixed test typo --- test/layers.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/layers.test.js b/test/layers.test.js index 67c5a67..d29b714 100644 --- a/test/layers.test.js +++ b/test/layers.test.js @@ -91,8 +91,8 @@ test('pull', async () => { await setProps(faLayers, { pull: 'right', }); - style = getFaLayers().getAttribute('style'); - expect(style).toContain('float:right'); + style = getComputedStyle(getFaLayers()); + expect(style.float).toBe('right'); }); describe('size', () => { From 25866fba037b76c2f85f8770eb29604c1916fef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Sun, 26 Nov 2023 13:49:14 +0100 Subject: [PATCH 24/24] Removed docs htaccess, shouldn't have been commited in the first place --- docs/.htaccess | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 docs/.htaccess diff --git a/docs/.htaccess b/docs/.htaccess deleted file mode 100644 index 04d4816..0000000 --- a/docs/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -Header always set Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self' https://cdn.jsdelivr.net/; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net/; img-src 'self' https://img.shields.io/" -#Header always set Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; script-src 'self' https://cdn.jsdelivr.net/; style-src 'self' https://cdn.jsdelivr.net/; img-src 'self' https://img.shields.io/"