From 1221731967fcec90c0722f5e0d244fa086a79480 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 15 Nov 2016 14:18:53 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Wysiwyg=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=AE?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E8=BE=BC=E3=81=BF=E3=82=92=E6=9C=89=E5=8A=B9?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=20https://github.com/NetCommons3/Ne?= =?UTF-8?q?tCommons3/issues/732?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webroot/css/style.css b/webroot/css/style.css index e9d4f789..f1e2a51e 100644 --- a/webroot/css/style.css +++ b/webroot/css/style.css @@ -18,6 +18,10 @@ display: inline-block; } +.img-responsive.nc3-img.inline { + display: inline; +} + .display-number-dropdown-toggle { min-width: 125px; max-width: 300px; From 31f6ffec885e447a80b0bc94fe412077b566604d Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 15 Nov 2016 14:20:38 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Wysiwyg=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=AE?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E8=BE=BC=E3=81=BF=E3=82=92=E6=9C=89=E5=8A=B9?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=20https://github.com/NetCommons3/Ne?= =?UTF-8?q?tCommons3/issues/732?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/style.css b/webroot/css/style.css index f1e2a51e..fd28c190 100644 --- a/webroot/css/style.css +++ b/webroot/css/style.css @@ -18,7 +18,7 @@ display: inline-block; } -.img-responsive.nc3-img.inline { +.img-responsive.nc3-img.nc3-inline { display: inline; } From 8959a4ea8567d9fcbb9fb0e99785a767075a72db Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 15 Nov 2016 14:28:40 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Wysiwyg=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=AE?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E8=BE=BC=E3=81=BF=E3=82=92=E6=9C=89=E5=8A=B9?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=20https://github.com/NetCommons3/Ne?= =?UTF-8?q?tCommons3/issues/732?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webroot/css/style.css b/webroot/css/style.css index fd28c190..037a806e 100644 --- a/webroot/css/style.css +++ b/webroot/css/style.css @@ -18,7 +18,7 @@ display: inline-block; } -.img-responsive.nc3-img.nc3-inline { +.img-responsive.nc3-img:not(.center-block) { display: inline; } From 3183bc0d33104dd33e9421ea8345b5476ba6181a Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 15 Nov 2016 17:38:38 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=97=E3=83=A9=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=81=8C=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F=E3=83=90=E3=82=B0?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utility/CurrentFrame.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utility/CurrentFrame.php b/Utility/CurrentFrame.php index 766fd4c1..a0c52ef3 100644 --- a/Utility/CurrentFrame.php +++ b/Utility/CurrentFrame.php @@ -121,7 +121,7 @@ public function setBox() { } $result = $this->Box->find('first', array( - 'recursive' => -1, + 'recursive' => 0, 'conditions' => array( 'Box.id' => $boxId, ),