Merge remote-tracking branch 'origin/dev-1.2.4' into dev-1.2.4

net/Web.config

@@ -4,6 +4,6 @@
 		<compilation debug="true" targetFramework="4.0"/>
 		<httpRuntime requestValidationMode="2.0" maxRequestLength="102400 "/>
 		<pages validateRequest="false" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"></pages>
-        <globalization fileEncoding="utf-8" requestEncoding="utf-8" responseEncoding="utf-8" culture="zh-CN"/>
+        <globalization fileEncoding="utf-8" culture="zh-CN"/>
 	</system.web>
 </configuration>

themes/gorgeous/_css/buttonicon.css

@@ -242,7 +242,7 @@
 .edui-gorgeous .edui-for-copy .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-copy .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-copy .edui-icon {
-    background-position: -695px -3px
+    background-position: -1123px -3px
 }
 
 .edui-gorgeous .edui-for-paste .edui-state-hover .edui-icon,
@@ -458,7 +458,7 @@
 .edui-gorgeous .edui-for-edittable .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-edittable .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-edittable .edui-icon {
-    background-position: -434px -68px
+    background-position: -2px -69px
 }
 
 .edui-gorgeous .edui-for-template .edui-state-hover .edui-icon,
@@ -494,7 +494,7 @@
 .edui-gorgeous .edui-for-edittd .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-edittd .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-edittd .edui-icon {
-    background-position: -700px -68px;
+    background-position: -35px -69px
 }
 
 .edui-gorgeous .edui-for-snapscreen .edui-state-hover .edui-icon,
@@ -518,5 +518,5 @@
 .edui-gorgeous .edui-for-music .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-music .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-music .edui-icon {
-    background-position: -1124px -68px
+    background-position: 0 -36px
 }
\ No newline at end of file

themes/gorgeous/_css/dialog.css

@@ -315,7 +315,7 @@
     height: 115px;
 }
 .edui-gorgeous .edui-for-edittd .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -1px -300px
 }
 /*snapscreen-dialog*/
 .edui-gorgeous .edui-for-snapscreen .edui-dialog-content {
@@ -323,7 +323,7 @@
     height: 220px;
 }
 .edui-gorgeous .edui-for-snapscreen .edui-dialog-caption {
-     background-position: -1px -3px;
+     background-position: -138px -304px
  }
 /*music-dialog*/
 .edui-gorgeous .edui-for-music .edui-dialog-content {
@@ -331,5 +331,5 @@
     height: 360px;
 }
 .edui-gorgeous .edui-for-music .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -132px -150px
 }
\ No newline at end of file

themes/gorgeous/css/ueditor.css

@@ -767,7 +767,7 @@ div.edui-box {
 .edui-gorgeous .edui-for-copy .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-copy .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-copy .edui-icon {
-    background-position: -695px -3px
+    background-position: -1123px -3px
 }
 
 .edui-gorgeous .edui-for-paste .edui-state-hover .edui-icon,
@@ -983,7 +983,7 @@ div.edui-box {
 .edui-gorgeous .edui-for-edittable .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-edittable .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-edittable .edui-icon {
-    background-position: -434px -68px
+    background-position: -2px -69px
 }
 
 .edui-gorgeous .edui-for-template .edui-state-hover .edui-icon,
@@ -1019,7 +1019,7 @@ div.edui-box {
 .edui-gorgeous .edui-for-edittd .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-edittd .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-edittd .edui-icon {
-    background-position: -700px -68px;
+    background-position: -35px -69px
 }
 
 .edui-gorgeous .edui-for-snapscreen .edui-state-hover .edui-icon,
@@ -1043,7 +1043,7 @@ div.edui-box {
 .edui-gorgeous .edui-for-music .edui-state-hover .edui-icon,
 .edui-gorgeous .edui-for-music .edui-state-checked .edui-icon,
 .edui-gorgeous .edui-for-music .edui-icon {
-    background-position: -1124px -68px
+    background-position: 0 -36px
 }
 /*splitbutton*/
 .edui-gorgeous .edui-toolbar .edui-splitbutton-body .edui-arrow,
@@ -1539,7 +1539,7 @@ div.edui-box {
     height: 115px;
 }
 .edui-gorgeous .edui-for-edittd .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -1px -300px
 }
 /*snapscreen-dialog*/
 .edui-gorgeous .edui-for-snapscreen .edui-dialog-content {
@@ -1547,7 +1547,7 @@ div.edui-box {
     height: 220px;
 }
 .edui-gorgeous .edui-for-snapscreen .edui-dialog-caption {
-     background-position: -1px -3px;
+     background-position: -138px -304px
  }
 /*music-dialog*/
 .edui-gorgeous .edui-for-music .edui-dialog-content {
@@ -1555,7 +1555,7 @@ div.edui-box {
     height: 360px;
 }
 .edui-gorgeous .edui-for-music .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -132px -150px
 }
 /*段落弹出菜单*/
 .edui-gorgeous .edui-for-paragraph .edui-listitem-label {

themes/modern/_css/buttonicon.css

@@ -242,7 +242,7 @@
 .edui-modern .edui-for-copy .edui-state-hover .edui-icon,
 .edui-modern .edui-for-copy .edui-state-checked .edui-icon,
 .edui-modern .edui-for-copy .edui-icon {
-    background-position: -695px -3px
+    background-position: -1123px -3px
 }
 
 .edui-modern .edui-for-paste .edui-state-hover .edui-icon,
@@ -458,7 +458,7 @@
 .edui-modern .edui-for-edittable .edui-state-hover .edui-icon,
 .edui-modern .edui-for-edittable .edui-state-checked .edui-icon,
 .edui-modern .edui-for-edittable .edui-icon {
-    background-position: -434px -68px
+    background-position: -2px -69px
 }
 
 .edui-modern .edui-for-template .edui-state-hover .edui-icon,
@@ -494,7 +494,7 @@
 .edui-modern .edui-for-edittd .edui-state-hover .edui-icon,
 .edui-modern .edui-for-edittd .edui-state-checked .edui-icon,
 .edui-modern .edui-for-edittd .edui-icon {
-    background-position: -700px -68px;
+    background-position: -35px -69px
 }
 
 .edui-modern .edui-for-snapscreen .edui-state-hover .edui-icon,
@@ -518,5 +518,5 @@
 .edui-modern .edui-for-music .edui-state-hover .edui-icon,
 .edui-modern .edui-for-music .edui-state-checked .edui-icon,
 .edui-modern .edui-for-music .edui-icon {
-    background-position: -1124px -68px
+    background-position: 0 -36px
 }
\ No newline at end of file

themes/modern/_css/dialog.css

@@ -315,7 +315,7 @@
     height: 115px;
 }
 .edui-modern .edui-for-edittd .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -1px -300px
 }
 /*snapscreen-dialog*/
 .edui-modern .edui-for-snapscreen .edui-dialog-content {
@@ -323,13 +323,13 @@
     height: 220px;
 }
 .edui-modern .edui-for-snapscreen .edui-dialog-caption {
-     background-position: -1px -3px;
- }
+    background-position: -138px -304px
+}
 /*music-dialog*/
 .edui-modern .edui-for-music .edui-dialog-content {
     width: 515px;
     height: 360px;
 }
 .edui-modern .edui-for-music .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -132px -150px
 }
\ No newline at end of file

themes/modern/css/ueditor.css

@@ -808,7 +808,7 @@ div.edui-box {
 .edui-modern .edui-for-copy .edui-state-hover .edui-icon,
 .edui-modern .edui-for-copy .edui-state-checked .edui-icon,
 .edui-modern .edui-for-copy .edui-icon {
-    background-position: -695px -3px
+    background-position: -1123px -3px
 }
 
 .edui-modern .edui-for-paste .edui-state-hover .edui-icon,
@@ -1024,7 +1024,7 @@ div.edui-box {
 .edui-modern .edui-for-edittable .edui-state-hover .edui-icon,
 .edui-modern .edui-for-edittable .edui-state-checked .edui-icon,
 .edui-modern .edui-for-edittable .edui-icon {
-    background-position: -434px -68px
+    background-position: -2px -69px
 }
 
 .edui-modern .edui-for-template .edui-state-hover .edui-icon,
@@ -1060,7 +1060,7 @@ div.edui-box {
 .edui-modern .edui-for-edittd .edui-state-hover .edui-icon,
 .edui-modern .edui-for-edittd .edui-state-checked .edui-icon,
 .edui-modern .edui-for-edittd .edui-icon {
-    background-position: -700px -68px;
+    background-position: -35px -69px
 }
 
 .edui-modern .edui-for-snapscreen .edui-state-hover .edui-icon,
@@ -1084,7 +1084,7 @@ div.edui-box {
 .edui-modern .edui-for-music .edui-state-hover .edui-icon,
 .edui-modern .edui-for-music .edui-state-checked .edui-icon,
 .edui-modern .edui-for-music .edui-icon {
-    background-position: -1124px -68px
+    background-position: 0 -36px
 }
 /*splitbutton*/
 .edui-modern .edui-toolbar .edui-splitbutton-body .edui-arrow,
@@ -1593,7 +1593,7 @@ div.edui-box {
     height: 115px;
 }
 .edui-modern .edui-for-edittd .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -1px -300px
 }
 /*snapscreen-dialog*/
 .edui-modern .edui-for-snapscreen .edui-dialog-content {
@@ -1601,15 +1601,15 @@ div.edui-box {
     height: 220px;
 }
 .edui-modern .edui-for-snapscreen .edui-dialog-caption {
-     background-position: -1px -3px;
- }
+    background-position: -138px -304px
+}
 /*music-dialog*/
 .edui-modern .edui-for-music .edui-dialog-content {
     width: 515px;
     height: 360px;
 }
 .edui-modern .edui-for-music .edui-dialog-caption {
-    background-position: -1px -3px;
+    background-position: -132px -150px
 }
 /*段落弹出菜单*/
 .edui-modern .edui-for-paragraph .edui-listitem-label {