From cf45cac6560f88be1a42031c435ac71247a88b5f Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Tue, 8 Oct 2024 23:12:56 +0300
Subject: [PATCH] widthfix-merged

---
 src/styles/_global.scss | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/styles/_global.scss b/src/styles/_global.scss
index 5cad55ba..b88b3dd5 100644
--- a/src/styles/_global.scss
+++ b/src/styles/_global.scss
@@ -121,16 +121,19 @@ $container-padding-x: $grid-gutter-width * 0.5;
 
 // Миксин make-col
 @mixin make-col($size: false, $columns: $grid-columns) {
-  @if $size {
-    flex: 0 0 auto;
-    width: calc(100% * #{calc($size / $columns)});
-  } @else {
-    flex: 1 1 0;
-    max-width: 100%;
-  }
+  $size-factor: 0;
+  $size-factor: $size / $columns;
+  
+  $flex-grow: 1 - $size-factor;
+  $flex-shrink: 1 - $size-factor;
+  $flex-basis: calc(100% * #{$size-factor});
+  
+  flex: $flex-grow $flex-shrink $flex-basis;
+  max-width: max($flex-basis, 100% * $size-factor);
 }
 
 @mixin make-col-offset($size, $columns: $grid-columns) {
-  $num: calc($size / $columns);
-  margin-left: if($num == 0, 0, calc(100% * $num));
+  $offset: calc(100% * #{$size / $columns});
+
+  margin-left: max(0px, $offset);
 }