From 16bf1421b9e8dca61491f4ba28b697926d5c8ad8 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Thu, 26 May 2016 18:08:00 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D0=BF=D1=82=D0=B8=D0=B2=D1=83=20=D0=BF=D1=80=D0=BE=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/profile/profile.scss | 15 +++++++++++---- src/pages/profile/profile.scss | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/profile/profile.scss b/src/components/profile/profile.scss index 9e04413..f1fb5c4 100644 --- a/src/components/profile/profile.scss +++ b/src/components/profile/profile.scss @@ -1,18 +1,19 @@ @import '~components/ui/fonts.scss'; @import '~components/ui/colors.scss'; +$formColumnWidth: 416px; + .indexContent { display: flex; } .formColumn { - flex-grow: 1; - max-width: 416px; + width: $formColumnWidth; + min-width: $formColumnWidth; // Чтобы flex не ужимал блок, несмотря на фикс ширину выше border-bottom: 10px solid #ddd8ce; } .descriptionColumn { - width: 340px; padding: 12px 20px 0 0; box-sizing: border-box; } @@ -113,11 +114,17 @@ .descriptionColumn { width: 100%; - max-width: 416px; + max-width: $formColumnWidth; padding: 0; margin-bottom: 10px; } + .formColumn { + min-width: 0; + width: auto; + max-width: $formColumnWidth; + } + .indexDescription { text-align: center; } diff --git a/src/pages/profile/profile.scss b/src/pages/profile/profile.scss index 2a11f57..e1ffa77 100644 --- a/src/pages/profile/profile.scss +++ b/src/pages/profile/profile.scss @@ -1,5 +1,5 @@ .container { - margin-top: 55px; + margin: 55px 10px 10px; } .footer { @@ -12,6 +12,6 @@ @media (max-width: 720px) { .container { - margin: 20px 10px 10px; + margin-top: 20px; } }