remove "unlink" icon & editor outline

Fixes #91
liferay · Jan 29, 2015 · f79c12e · f79c12e
1 parent 14b287d
commit f79c12e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 24 deletions.
diff --git a/src/ui/yui/src/assets/css/alloy-editor-core.css b/src/ui/yui/src/assets/css/alloy-editor-core.css
@@ -85,3 +85,7 @@
   font-size: 12px;
   margin-left: 5px;
 }
+
+.cke_editable {
+  outline: none;
+}
diff --git a/src/ui/yui/src/assets/font/font.css b/src/ui/yui/src/assets/font/font.css
@@ -107,8 +107,4 @@
 
 .alloy-editor-icon-underline:before {
 	content: "\E014";
-}
-
-.alloy-editor-icon-unlink:before {
-	content: "\E015";
 }
diff --git a/src/ui/yui/src/assets/font/fonts/alloyeditor.eot b/src/ui/yui/src/assets/font/fonts/alloyeditor.eot
diff --git a/src/ui/yui/src/assets/font/fonts/alloyeditor.svg b/src/ui/yui/src/assets/font/fonts/alloyeditor.svg
diff --git a/src/ui/yui/src/assets/font/fonts/alloyeditor.ttf b/src/ui/yui/src/assets/font/fonts/alloyeditor.ttf
diff --git a/src/ui/yui/src/assets/font/fonts/alloyeditor.woff b/src/ui/yui/src/assets/font/fonts/alloyeditor.woff
diff --git a/src/ui/yui/src/assets/sass/alloy-editor-core.scss b/src/ui/yui/src/assets/sass/alloy-editor-core.scss
@@ -106,4 +106,8 @@
         font-size: 12px;
         margin-left: 5px;
     }
+}
+
+.cke_editable{
+    outline: none;
 }
diff --git a/src/ui/yui/src/assets/svg/unlink.svg b/src/ui/yui/src/assets/svg/unlink.svg
diff --git a/src/ui/yui/src/buttons/button-a.js b/src/ui/yui/src/buttons/button-a.js
@@ -89,12 +89,6 @@ YUI.add('button-a', function(Y) {
                 this._button.set('pressed', !!result && !dataType);
 
                 iconLinkNode = this._button.get('boundingBox').one('i');
-
-                if (this._button.get('pressed')) {
-                    iconLinkNode.replaceClass('alloy-editor-icon-link', 'alloy-editor-icon-unlink');
-                } else {
-                    iconLinkNode.replaceClass('alloy-editor-icon-unlink', 'alloy-editor-icon-link');
-                }
             },
 
             /**

diff --git a/src/ui/yui/test/toolbar-styles.js b/src/ui/yui/test/toolbar-styles.js
@@ -163,7 +163,7 @@ describe('ToolbarStyles', function() {
 
     it('should remove a link selection', function(done) {
         testButtonAction.call(this, {
-            buttonSelector: '.alloy-editor-button .alloy-editor-icon-unlink',
+            buttonSelector: '.alloy-editor-button .alloy-editor-icon-link',
             expected: '<p>The link should be selection removed completely.</p>',
             html: 'The link should be <a>{selection}</a> removed completely.',
             beforeAction: function(button) {
@@ -175,7 +175,7 @@ describe('ToolbarStyles', function() {
         }, done);
 
         testButtonAction.call(this, {
-            buttonSelector: '.alloy-editor-button .alloy-editor-icon-unlink',
+            buttonSelector: '.alloy-editor-button .alloy-editor-icon-link',
             expected: '<p>The link should be selection removed completely.</p>',
             html: 'The link <a>should be {selection} removed</a> completely.',
             beforeAction: function(button) {