From 0f1103093a75d311df54926fa0b481f1eeff136f Mon Sep 17 00:00:00 2001 From: Rui Date: Wed, 18 Apr 2018 16:58:16 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=86=E3=83=8A:=20width?= =?UTF-8?q?=E3=81=AE=E4=BB=A3=E3=82=8F=E3=82=8A=E3=81=ABmax-width=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _includes/style.scss | 3 ++- _sass/_container.scss | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/_includes/style.scss b/_includes/style.scss index 3293a5f..be7c3bb 100644 --- a/_includes/style.scss +++ b/_includes/style.scss @@ -26,8 +26,9 @@ $selection-font-color: #fff; // コンテナ $container-box-shadow: 0 0 10px 0 #ddd; +$container-columns: 30% 70%; $container-padding-top-mobile: 1em; -$container-width: 80vw; +$container-max-width: 1024px; // ヘッダ $header-background: #f2f2f2; diff --git a/_sass/_container.scss b/_sass/_container.scss index 27d9aaa..1a5b54c 100644 --- a/_sass/_container.scss +++ b/_sass/_container.scss @@ -8,16 +8,16 @@ box-shadow: $container-box-shadow; box-sizing: border-box; display: grid; - grid-template-columns: auto 1fr; + grid-template-columns: $container-columns; grid-template-rows: auto 1fr auto; // IE11 ~ display: -ms-grid; - -ms-grid-columns: auto 1fr; + -ms-grid-columns: $container-columns; -ms-grid-rows: auto 1fr auto; // ~ IE11 margin: 0 auto; min-height: 100vh; - width: $container-width; + max-width: $container-max-width; header { border-bottom: $border-default;