v1.2.0 BETA.

froala · Sep 7, 2014 · 54ca0b2 · 54ca0b2
1 parent ec434ef
commit 54ca0b2
Show file tree

Hide file tree

Showing 19 changed files with 62 additions and 22 deletions.
diff --git a/css/froala_editor.css b/css/froala_editor.css
@@ -45,14 +45,34 @@ button {
 }
 .froala-box .html-switch {
   position: absolute;
-  left: 0;
-  top: -30px;
+  left: 1px;
+  top: 1px;
   z-index: 1000;
   display: none;
   font-size: 14px;
   line-height: 160%;
   height: 30px;
-  border: solid 1px #aaaaaa;
+  background: #ffffff;
+  color: #353535;
+  cursor: pointer;
+  -webkit-transition: background linear 0.1s;
+  -moz-transition: background linear 0.1s;
+  -ms-transition: background linear 0.1s;
+  -o-transition: background linear 0.1s;
+  border-radius: 0;
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  -moz-background-clip: padding;
+  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
+  -moz-outline: 0;
+  outline: 0;
+  border: 0;
+  width: 40px;
+}
+.froala-box .html-switch:hover {
+  color: #ffffff;
+  background: #2c82c9;
 }
 .froala-box.f-html .html-switch {
   display: inline-block;
@@ -985,11 +1005,26 @@ button {
   margin-right: 0 !important;
   width: 200px;
 }
+.froala-popup.froala-image-popup h4 span + span,
+.froala-popup.froala-file-popup h4 span + span {
+  display: none;
+}
+.froala-popup.froala-image-popup h4.uploading span,
+.froala-popup.froala-file-popup h4.uploading span {
+  display: none;
+}
+.froala-popup.froala-image-popup h4.uploading span + span,
+.froala-popup.froala-file-popup h4.uploading span + span {
+  display: inline-block;
+}
+.froala-popup.froala-image-popup h4.uploading i,
+.froala-popup.froala-file-popup h4.uploading i {
+  display: none;
+}
 .froala-popup.froala-image-popup p.f-progress,
 .froala-popup.froala-file-popup p.f-progress {
   width: 100%;
   display: none;
-  background-color: #61bd6d;
   border: 0;
   height: 20px;
   margin: 5px 0;

diff --git a/css/froala_editor.min.css b/css/froala_editor.min.css
diff --git a/css/froala_page.css b/css/froala_page.css
@@ -130,8 +130,7 @@ table.fr-tag td {
 }
 .froala-element p,
 p.fr-tag {
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin: 0 0 10px;
 }
 .froala-element h1,
 h1[class="fr-tag"] {

diff --git a/css/froala_page.min.css b/css/froala_page.min.css
diff --git a/examples/custom_buttons.html b/examples/custom_buttons.html
@@ -47,7 +47,7 @@
 
   <script>
       $(function(){
-          $('#edit').editable({inlineMode: false, buttons: ['bold', 'italic', 'formatBlock', 'alert', 'clear', 'image', 'add'], blockTags: ['p'], customButtons: {
+          $('#edit').editable({inlineMode: false, buttons: ['bold', 'italic', 'subscript', 'superscript', 'formatBlock', 'alert', 'clear', 'image', 'add'], blockTags: ['p'], customButtons: {
             alert: {
               title: 'Alert',
               icon: {

diff --git a/examples/events/blur.html b/examples/events/blur.html
@@ -44,6 +44,7 @@ <h1>Click and edit</h1>
   <script src="../../js/plugins/font_size.min.js"></script>
   <script src="../../js/plugins/block_styles.min.js"></script>
   <script src="../../js/plugins/video.min.js"></script>
+  <script src="../../js/plugins/lists.min.js"></script>
 
   <script>
       $(function(){

diff --git a/examples/events/contentChanged.html b/examples/events/contentChanged.html
@@ -42,6 +42,7 @@
   <script src="../../js/plugins/font_size.min.js"></script>
   <script src="../../js/plugins/block_styles.min.js"></script>
   <script src="../../js/plugins/video.min.js"></script>
+  <script src="../../js/plugins/lists.min.js"></script>
 
   <script>
       $(function(){

diff --git a/examples/events/focus.html b/examples/events/focus.html
@@ -44,6 +44,7 @@ <h1>Click and edit</h1>
   <script src="../../js/plugins/font_size.min.js"></script>
   <script src="../../js/plugins/block_styles.min.js"></script>
   <script src="../../js/plugins/video.min.js"></script>
+  <script src="../../js/plugins/lists.min.js"></script>
 
   <script>
       $(function(){

diff --git a/examples/events/removeImage.html b/examples/events/removeImage.html
@@ -42,6 +42,7 @@
   <script src="../../js/plugins/font_size.min.js"></script>
   <script src="../../js/plugins/block_styles.min.js"></script>
   <script src="../../js/plugins/video.min.js"></script>
+  <script src="../../js/plugins/lists.min.js"></script>
 
   <script>
       $(function(){

diff --git a/examples/textarea.html b/examples/textarea.html
@@ -44,7 +44,8 @@
 
   <script>
       $(function(){
-          $('#edit').editable({inlineMode: false})
+          $('#edit')
+            .editable({inlineMode: false})
       });
   </script>
 </body>

diff --git a/js/froala_editor.min.js b/js/froala_editor.min.js
diff --git a/js/plugins/block_styles.min.js b/js/plugins/block_styles.min.js
diff --git a/js/plugins/colors.min.js b/js/plugins/colors.min.js