SF

Fixes #91
liferay · Jan 29, 2015 · b9b585d · b9b585d
1 parent 68421bf
commit b9b585d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/src/ui/yui/gulp-tasks/fonts.js b/src/ui/yui/gulp-tasks/fonts.js
@@ -1,36 +1,36 @@
 'use strict';
 
 var consolidate = require('gulp-consolidate'),
-	del = require('del'),
-	gulp = require('gulp'),
-	iconfont = require('gulp-iconfont'),
-	rename = require('gulp-rename'),
+    del = require('del'),
+    gulp = require('gulp'),
+    iconfont = require('gulp-iconfont'),
+    rename = require('gulp-rename'),
 
-	fontName = 'alloyeditor',
-	path = require('path'),
-	ROOT = path.join(__dirname, '../src/assets');
+    fontName = 'alloyeditor',
+    path = require('path'),
+    ROOT = path.join(__dirname, '../src/assets');
 
 gulp.task('clean-fonts', function(callback) {
-	del([path.join(ROOT, 'font', 'fonts')], callback);
+    del([path.join(ROOT, 'font', 'fonts')], callback);
 });
 
 gulp.task('generate-fonts', function(){
-	gulp.src([ path.join(ROOT, 'svg', '*.svg')])
-		.pipe(iconfont({
-			fontName: fontName,
-			normalize: true
-	    }))
-	    .on('codepoints', function(codepoints) {
-	    	gulp.src(path.join(ROOT, 'font', 'font-template.css'))
-	    		.pipe(consolidate('lodash', {
-					fontName: fontName,
-					fontPath: 'fonts/',
-					glyphs: codepoints
-		 		}))
-		 		.pipe(rename({ basename: 'font'}))
-				.pipe(gulp.dest(path.join(ROOT, 'font')));
-	    })
-	    .pipe(gulp.dest(path.join(ROOT, 'font', 'fonts')));
+    gulp.src([ path.join(ROOT, 'svg', '*.svg')])
+        .pipe(iconfont({
+            fontName: fontName,
+            normalize: true
+        }))
+        .on('codepoints', function(codepoints) {
+            gulp.src(path.join(ROOT, 'font', 'font-template.css'))
+                .pipe(consolidate('lodash', {
+                    fontName: fontName,
+                    fontPath: 'fonts/',
+                    glyphs: codepoints
+                }))
+                .pipe(rename({ basename: 'font'}))
+                .pipe(gulp.dest(path.join(ROOT, 'font')));
+        })
+        .pipe(gulp.dest(path.join(ROOT, 'font', 'fonts')));
 });
 
 gulp.task('fonts', ['clean-fonts', 'generate-fonts', 'build']);
diff --git a/src/ui/yui/src/assets/css/skin/ocean/alloy-editor-skin.css b/src/ui/yui/src/assets/css/skin/ocean/alloy-editor-skin.css
@@ -79,10 +79,10 @@
   color: #fff;
 }
 .alloy-editor-toolbar .alloy-editor-button:hover {
-  background-image: none;
-  color: #2b4259;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
   opacity: 0.4;
+  background-image: none;
+  color: #2b4259;
 }
 .alloy-editor-toolbar .alloy-editor-button.yui3-button-selected, .alloy-editor-toolbar .alloy-editor-button.yui3-button-active, .alloy-editor-toolbar .alloy-editor-button.yui3-button:active {
   -webkit-box-shadow: none;
@@ -118,9 +118,9 @@
   color: #2f232d;
 }
 .alloy-editor-toolbar-styles .link-wrapper .input-container .input-clear {
-  color: #2b4259;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=40);
   opacity: 0.4;
+  color: #2b4259;
 }
 
 .alloy-editor-toolbar-add-trigger {

diff --git a/src/ui/yui/src/assets/sass/skin/ocean/alloy-editor-skin.scss b/src/ui/yui/src/assets/sass/skin/ocean/alloy-editor-skin.scss
@@ -35,9 +35,9 @@ $prefixes: ("-webkit-", "-moz-", "-o-", "");
         color: #fff;
 
         &:hover {
+            @include opacity(0.4);
             background-image: none;
             color: #2b4259;
-            @include opacity(0.4);
         }
 
         &.yui3-button-selected, &.yui3-button-active, &.yui3-button:active {
@@ -74,8 +74,8 @@ $prefixes: ("-webkit-", "-moz-", "-o-", "");
             color: #2f232d;
 
             .input-clear {
-                color: #2b4259;
                 @include opacity(0.4);
+                color: #2b4259;
             }
         }
     }