Merge pull request #105 from SzymCode/dev

Dev
SzymCode · Aug 9, 2024 · 98681c4 · 98681c4
2 parents 165302b + af7a161
commit 98681c4
Show file tree

Hide file tree

Showing 138 changed files with 1,366 additions and 2,434 deletions.
diff --git a/app/Models/Article.php b/app/Models/Article.php
@@ -45,7 +45,7 @@ public function getDescription(): string
     {
         return $this->description;
     }
-    public function getCategory(): string
+    public function getCategory(): string|null
     {
         return $this->category;
     }

diff --git a/atomic/_old_structure/sass/app.scss b/atomic/_old_structure/sass/app.scss
@@ -1,5 +1,4 @@
 // Component styles
-@import 'styles/components/layout/layout';
 @import 'styles/components/button';
 @import 'styles/components/canvas';
 @import 'styles/components/card';

diff --git a/atomic/_old_structure/sass/styles/components/layout/layout.scss b/atomic/_old_structure/sass/styles/components/layout/layout.scss
diff --git a/atomic/_old_structure/sass/styles/components/layout/navbar.scss b/atomic/_old_structure/sass/styles/components/layout/navbar.scss
diff --git a/atomic/_old_structure/sass/styles/components/layout/sidebar.scss b/atomic/_old_structure/sass/styles/components/layout/sidebar.scss
diff --git a/atomic/_old_structure/sass/variables/components/layout/_layout_variables.scss b/atomic/_old_structure/sass/variables/components/layout/_layout_variables.scss
diff --git a/atomic/_old_structure/sass/variables/components/layout/_navbar_variables.scss b/atomic/_old_structure/sass/variables/components/layout/_navbar_variables.scss
diff --git a/atomic/_old_structure/sass/variables/components/layout/_sidebar_variables.scss b/atomic/_old_structure/sass/variables/components/layout/_sidebar_variables.scss