From 54d4c4d0550d233b1499350b89d3c809b3902724 Mon Sep 17 00:00:00 2001 From: kvakazyambra Date: Tue, 8 Nov 2022 09:41:50 +0300 Subject: [PATCH] About pages fixed grid --- .../Pages/about/DiscussionRulesPage.tsx | 2 +- src/components/Pages/about/DogmaPage.tsx | 2 +- src/components/Pages/about/GuidePage.tsx | 68 ++++++++-------- src/components/Pages/about/HelpPage.tsx | 56 ++++++------- src/components/Pages/about/ManifestPage.tsx | 78 +++++++++---------- src/components/Pages/about/PartnersPage.tsx | 2 +- src/components/Pages/about/PrinciplesPage.tsx | 2 +- src/components/Pages/about/ProjectsPage.tsx | 2 +- src/components/Pages/about/TermsOfUsePage.tsx | 68 ++++++++-------- src/components/Pages/about/ThanksPage.tsx | 2 +- src/styles/app.scss | 6 +- 11 files changed, 145 insertions(+), 143 deletions(-) diff --git a/src/components/Pages/about/DiscussionRulesPage.tsx b/src/components/Pages/about/DiscussionRulesPage.tsx index 23797f7e..0ec5105a 100644 --- a/src/components/Pages/about/DiscussionRulesPage.tsx +++ b/src/components/Pages/about/DiscussionRulesPage.tsx @@ -7,7 +7,7 @@ export const DiscussionRulesPage = () => {
-
+

diff --git a/src/components/Pages/about/DogmaPage.tsx b/src/components/Pages/about/DogmaPage.tsx index 86730bd6..061432ed 100644 --- a/src/components/Pages/about/DogmaPage.tsx +++ b/src/components/Pages/about/DogmaPage.tsx @@ -7,7 +7,7 @@ export const DogmaPage = () => {
-
+

Редакционные принципы

Дискурс - журнал с открытой горизонтальной редакцией. Содержание журнала определяется прямым diff --git a/src/components/Pages/about/GuidePage.tsx b/src/components/Pages/about/GuidePage.tsx index d5bb6793..15366782 100644 --- a/src/components/Pages/about/GuidePage.tsx +++ b/src/components/Pages/about/GuidePage.tsx @@ -21,7 +21,40 @@ export const GuidePage = () => {

-
+
+

+ +

+ + + + +
+ +

Как устроен Дискурс

@@ -242,39 +275,6 @@ export const GuidePage = () => { . Мы обязательно ответим.

- -
-

- -

- - - - -
diff --git a/src/components/Pages/about/HelpPage.tsx b/src/components/Pages/about/HelpPage.tsx index 3149bc0a..d96355fa 100644 --- a/src/components/Pages/about/HelpPage.tsx +++ b/src/components/Pages/about/HelpPage.tsx @@ -18,7 +18,34 @@ export const HelpPage = () => {
-
+
+

+ +

+ + + + +
+ +

Как вы можете поддержать Дискурс?

@@ -126,33 +153,6 @@ export const HelpPage = () => { .

- -
-

- -

- - - - -
diff --git a/src/components/Pages/about/ManifestPage.tsx b/src/components/Pages/about/ManifestPage.tsx index 1a05df50..bcbd7a69 100644 --- a/src/components/Pages/about/ManifestPage.tsx +++ b/src/components/Pages/about/ManifestPage.tsx @@ -22,7 +22,45 @@ export const ManifestPage = () => {
-
+
+

+ +

+ + + + +
+ +

Манифест

@@ -145,44 +183,6 @@ export const ManifestPage = () => { и постараемся реализовать все хорошие задумки.

- -
-

- -

- - - - -
diff --git a/src/components/Pages/about/PartnersPage.tsx b/src/components/Pages/about/PartnersPage.tsx index e94e3994..410ba866 100644 --- a/src/components/Pages/about/PartnersPage.tsx +++ b/src/components/Pages/about/PartnersPage.tsx @@ -8,7 +8,7 @@ export const PartnersPage = () => {
-
+

{t('Partners')}

diff --git a/src/components/Pages/about/PrinciplesPage.tsx b/src/components/Pages/about/PrinciplesPage.tsx index ff4d8510..7260b5cf 100644 --- a/src/components/Pages/about/PrinciplesPage.tsx +++ b/src/components/Pages/about/PrinciplesPage.tsx @@ -7,7 +7,7 @@ export const PrinciplesPage = () => {
-
+

{title}

diff --git a/src/components/Pages/about/ProjectsPage.tsx b/src/components/Pages/about/ProjectsPage.tsx index 7c625ef5..45c4b0e1 100644 --- a/src/components/Pages/about/ProjectsPage.tsx +++ b/src/components/Pages/about/ProjectsPage.tsx @@ -8,7 +8,7 @@ export const ProjectsPage = () => {
-
+

{t('Projects')}

diff --git a/src/components/Pages/about/TermsOfUsePage.tsx b/src/components/Pages/about/TermsOfUsePage.tsx index 942fb6f0..7577bd3c 100644 --- a/src/components/Pages/about/TermsOfUsePage.tsx +++ b/src/components/Pages/about/TermsOfUsePage.tsx @@ -16,7 +16,40 @@ export const TermsOfUsePage = () => { {/**/}
-
+
+

+ +

+ + + + +
+ +

Пользовательское соглашение

@@ -233,39 +266,6 @@ export const TermsOfUsePage = () => { или через форму «предложить идею».

- -
-

- -

- - - - -
diff --git a/src/components/Pages/about/ThanksPage.tsx b/src/components/Pages/about/ThanksPage.tsx index 7b9a5f8b..b516e4c6 100644 --- a/src/components/Pages/about/ThanksPage.tsx +++ b/src/components/Pages/about/ThanksPage.tsx @@ -12,7 +12,7 @@ export const ThanksPage = () => {
-
+

{title}

diff --git a/src/styles/app.scss b/src/styles/app.scss index 40a9971b..1372872d 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -3,7 +3,7 @@ @import 'bootstrap/scss/mixins/utilities'; @import 'bootstrap/scss/containers'; @import 'bootstrap/scss/grid'; -@import 'bootstrap/scss/utilities'; +@import 'bootstrap/scss/bootstrap-utilities'; :root { --background-color: #fff; @@ -586,7 +586,9 @@ astro-island { } .container--static-page { - padding-top: 1.5em; + @include media-breakpoint-up(md) { + padding-top: 1.5em; + } } .shift-content {