From 638f852fab19a063899cedb97e7d0aed73813433 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 22 May 2016 16:40:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/css/style.css | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/webroot/css/style.css b/webroot/css/style.css index 84886564..9a6b5a08 100644 --- a/webroot/css/style.css +++ b/webroot/css/style.css @@ -260,18 +260,14 @@ ul.nav-pills { /** * フレーム枠内 */ -.frame.nc-content header { +.frame.nc-content-list article header, +.frame.nc-content article header { margin-bottom: 16px; } /** * フレーム枠内のh1,h2,h3,h4,h5,h6 */ -.frame .nc-content-list > h1, -.frame .nc-content-list > .h1 { - margin-top: 0px; - margin-bottom: 16px; -} .frame.nc-content article h1, .frame.nc-content article .h1 { margin-top: 0px; @@ -397,12 +393,3 @@ ul.nav-pills { .frame.nc-content article .h6 { font-size: 9px; } - -/** - * サイト閉鎖 - */ -.site-close.jumbotron h1 { - font-size: 2.8em; - margin-top: 0px; - margin-bottom: 20px; -} From 46aa646d4e730261cc0f682eed2a8d51b9b11301 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 22 May 2016 18:16:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=83=88=E4=BF=AE=E6=AD=A3=20https://github.?= =?UTF-8?q?com/NetCommons3/NetCommons3/issues/231?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/css/style.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/webroot/css/style.css b/webroot/css/style.css index dd771d2c..d070465a 100644 --- a/webroot/css/style.css +++ b/webroot/css/style.css @@ -260,9 +260,9 @@ ul.nav-pills { /** * フレーム枠内 */ -.frame.nc-content-list article header, -.frame.nc-content article header { - margin-bottom: 16px; +.frame.nc-content-list header, +.frame.nc-content header { + margin-bottom: 8px; } /** @@ -276,6 +276,12 @@ ul.nav-pills { .frame.nc-content-list article h1, .frame.nc-content-list article .h1, +.frame .nc-content-list > h1, +.frame .nc-content-list > .h1 { + margin-top: 0px; + margin-bottom: 16px; +} + .frame.nc-content-list article h2, .frame.nc-content-list article .h2, .frame.nc-content-list article h3,