1 files changed, 25 insertions, 8 deletions

diff --git a/src/objects/_avatar.scss b/src/objects/_avatar.scss
index e6fa74e..5a34d19 100644
--- a/src/objects/_avatar.scss
+++ b/src/objects/_avatar.scss
@@ -24,9 +24,11 @@ $sizes: 'xs' 'sm' 'lg' 'xl' 'xxl' 'xxxl';
 @include iro.props-namespace('avatar') {
     @include iro.props-store((
         --dims: (
-            --size:           fn.global-dim(--size --500),
-            --font-size:      fn.global-dim(--font-size --100),
-            --indicator-size: fn.global-dim(--size --150),
+            --size:              fn.global-dim(--size --500),
+            --font-size:         fn.global-dim(--font-size --100),
+            --indicator-size:    fn.global-dim(--size --150),
+            --indicator-spacing: fn.global-dim(--size --40),
+            --rounding:          25%,
 
             --xxxl: (
                 --size:           fn.global-dim(--size --1600),
@@ -58,8 +60,6 @@ $sizes: 'xs' 'sm' 'lg' 'xl' 'xxl' 'xxxl';
                 --font-size:      fn.global-dim(--font-size --50),
                 --indicator-size: fn.global-dim(--size --100),
             ),
-            --indicator-spacing: fn.global-dim(--size --40),
-            --rounding:          25%,
             
             --key-focus: (
                 --border:        fn.global-dim(--key-focus --border),
@@ -82,12 +82,24 @@ $sizes: 'xs' 'sm' 'lg' 'xl' 'xxl' 'xxxl';
     @include iro.bem-object(iro.props-namespace()) {
         display:        inline-block;
         position:       relative;
-        border:         fn.dim(--key-focus --border) solid transparent;
         border-radius:  fn.dim(--rounding);
         font-size:      fn.dim(--font-size);
         font-style:     normal;
         vertical-align: .05em;
 
+        &::after {
+            content:        '';
+            display:        none;
+            position:       absolute;
+            z-index:        1;
+            inset:          calc(-1 * fn.dim(--key-focus --border-offset));
+            border:         fn.dim(--key-focus --border-offset) solid transparent;
+            border-radius:  fn.dim(--rounding);
+            outline:        fn.color(--key-focus --border) solid fn.dim(--key-focus --border);
+            box-shadow:     0 0 0 calc(fn.dim(--key-focus --border) + fn.dim(--key-focus --outline)) fn.color(--key-focus --outline);
+            pointer-events: none;
+        }
+
         @include iro.bem-elem('status') {
             position:         absolute;
             inset-inline-end: 0;
@@ -110,6 +122,10 @@ $sizes: 'xs' 'sm' 'lg' 'xl' 'xxl' 'xxxl';
         @include iro.bem-modifier('circle') {
             border-radius: 100%;
 
+            &::after {
+                border-radius: 100%;
+            }
+
             @include iro.bem-elem('content') {
                 border-radius: 100%;
             }
@@ -143,8 +159,9 @@ $sizes: 'xs' 'sm' 'lg' 'xl' 'xxl' 'xxxl';
         }
     
         &:focus-visible {
-            outline:    fn.color(--key-focus --border) solid fn.dim(--key-focus --border);
-            box-shadow: 0 0 0 calc(fn.dim(--key-focus --border) + fn.dim(--key-focus --outline)) fn.color(--key-focus --outline);
+            &::after {
+                display: block;
+            }
         }
     }
 }