From 5a7deeee909693ce67413ae3cf7f0b902a57d6d1 Mon Sep 17 00:00:00 2001
From: naoki hirata <naoki@magic3.org>
Date: Wed, 28 May 2014 22:19:58 +0900
Subject: [PATCH] =?utf8?q?elFinder=E3=82=92=E3=83=A2=E3=83=BC=E3=83=80?=
 =?utf8?q?=E3=83=AB=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=A7?=
 =?utf8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81=E3=81=AEC?=
 =?utf8?q?SS=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 scripts/m3/admin.css | 3 ++-
 scripts/m3/edit.css  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/m3/admin.css b/scripts/m3/admin.css
index e76f2de5..6e6f4d97 100644
--- a/scripts/m3/admin.css
+++ b/scripts/m3/admin.css
@@ -272,9 +272,10 @@
 .m3widgetlist {
 	overflow: auto;		/* スクロールバーあり */
 }
-/*** 編集画面用　***/
+/*** 編集画面用 ***/
 /* テンプレートタイプラベル */
 .panel-heading .label {
 	padding-left:8px;
 	padding-bottom:1px;
 }
+
diff --git a/scripts/m3/edit.css b/scripts/m3/edit.css
index 7edd02db..29b00ff9 100644
--- a/scripts/m3/edit.css
+++ b/scripts/m3/edit.css
@@ -84,3 +84,7 @@ img.m3icon {
 	border:0;
 	vertical-align: top;
 }
+/*** CKEditor用 ***/
+.ui-dialog *, .ui-dialog *:after, .ui-dialog *:before{
+	box-sizing: content-box;
+}
-- 
2.11.0