From 304210134778a627e7aab82874903194ca7aef04 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Wed, 15 Nov 2023 16:59:21 +0300 Subject: [PATCH] grid main --- .../_modules/layout/grid/grid.component.html | 10 +++--- .../_modules/pages/page/page.component.html | 4 +-- src/assets/css/_basics.scss | 31 +++++++------------ 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/app/_modules/layout/grid/grid.component.html b/src/app/_modules/layout/grid/grid.component.html index e01a59e..0734481 100644 --- a/src/app/_modules/layout/grid/grid.component.html +++ b/src/app/_modules/layout/grid/grid.component.html @@ -5,12 +5,14 @@
-
+
+
-
+
-
- +
+ +
diff --git a/src/app/_modules/pages/page/page.component.html b/src/app/_modules/pages/page/page.component.html index 86ad120..dc4b812 100644 --- a/src/app/_modules/pages/page/page.component.html +++ b/src/app/_modules/pages/page/page.component.html @@ -1,4 +1,4 @@ -
+
@@ -11,7 +11,7 @@

Page type {{page?.type?.name}} is undefined

-
+
diff --git a/src/assets/css/_basics.scss b/src/assets/css/_basics.scss index 65ac856..56ae283 100644 --- a/src/assets/css/_basics.scss +++ b/src/assets/css/_basics.scss @@ -89,6 +89,17 @@ jumbotron{ } } +.grid-content{ + display: flex; + >*{ + flex-grow: 1; + } +} +.main-content{ + width: 100%; + max-width: $page-width; +} + .menu, .page-header { display: flex; @@ -267,26 +278,6 @@ body { display: flex; flex-direction: column; - .content { - flex-grow: 1; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - gap: 40px; - left-content{ - - } - .main-content{ - flex-basis: 840px; - .pages{ - width: 100%; - } - } - right-content{ - flex-basis: 400px; - } - } } }