From 71f82251f6fbee101b8bafea5c4c26fa00ef2bf9 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Wed, 5 Jun 2013 17:11:03 +0100
Subject: [PATCH] Remove progress bar and fade on hiding file menu

Progress bar removed as it's not accurate or indicative of amount
loaded/progress
Call hideFileMenu instead of manually setting display, so now we have
fade effect
Add opacity transition of 0.15s
---
 index.php         |  5 ++---
 lib/ice-coder.css | 16 +++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/index.php b/index.php
index c797d92..e19c0bf 100644
--- a/index.php
+++ b/index.php
@@ -84,7 +84,6 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
 </div>
 
 <div id="loadingMask" class="blackMask" style="visibility: visible" onContextMenu="return false">
-	<span class="progressBar" id="progressBar" style="-webkit-animation:fullexpand 10s ease-out; -moz-animation:fullexpand 10s ease-out"></span>
 	<div class="popupVCenter">
 		<div class="popup">
 			<div class="circleOutside"></div>
@@ -94,7 +93,7 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
 	</div>
 </div>
 
-<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'" onContextMenu="return false">
+<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');top.ICEcoder.hideFileMenu()" style="opacity: 0" onContextMenu="return false">
 	<span id="folderMenuItems">
 		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="ICEcoder.showFileMenu()">New File</a>
 		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="ICEcoder.showFileMenu()">New Folder</a>
@@ -129,7 +128,7 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
 	<img src="images/ice-coder-icon.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
 </div>
 
-<div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.document.getElementById('fileMenu').style.display='none';">
+<div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.ICEcoder.hideFileMenu();">
 	<div class="account" id="account">
 		<div class="accountOptions">
 			<div title="Save (Ctrl + s)" onClick="ICEcoder.fMIcon('save')" id="fMSave" class="save"></div>
diff --git a/lib/ice-coder.css b/lib/ice-coder.css
index 8310cd7..40da28b 100644
--- a/lib/ice-coder.css
+++ b/lib/ice-coder.css
@@ -55,16 +55,6 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 	100% {-webkit-transform:rotate(-360deg)}
 }
 
-.progressBar {position:absolute; top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; box-shadow:0 0 10px 1px rgba(0,198,255,0.7)}
-@-moz-keyframes fullexpand {
-	0%  {width:0}
-	100%{width:100%}	
-}
-@-webkit-keyframes fullexpand {
-	0%  {width:0}
-	100%{width:100%}	
-}
-
 .header {position: absolute; display: inline-block; top: 0; left: 0; width: 100%; height: 40px; background-color: #fff; text-align: right; z-index: 2}
 .header .tools {position: absolute; display: inline-block; left: 15px; top: 3px}
 .header .plugins {position: absolute; display: inline-block; left: 55px; top: 3px}
@@ -160,7 +150,11 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 
 .textbox {box-shadow: inset 1px 1px 2px 0 rgba(0,0,0,0.4)}
 
-.fileMenu {position: absolute; display: none; left: 0; top: 0; background-color: #333; z-index: 10}
+.fileMenu {position: absolute; display: none; left: 0; top: 0; background-color: #333; z-index: 10;
+	-webkit-transition: opacity 0.15s;
+	-moz-transition: opacity 0.15s;
+	transition: opacity 0.15s;
+}
 .fileMenu a {display: block; padding: 2px 5px; background-color: #333; color: #eee; text-decoration: none}
 .fileMenu a:hover {background-color: #666}