Merge commit '72ea5d455bc176be768eec0105c9fa974af27426'
diff --git a/bundles/org.eclipse.orion.client.core/web/css/ide.css b/bundles/org.eclipse.orion.client.core/web/css/ide.css
index 0f67db0..3b48b8e 100644
--- a/bundles/org.eclipse.orion.client.core/web/css/ide.css
+++ b/bundles/org.eclipse.orion.client.core/web/css/ide.css
@@ -391,17 +391,18 @@
 	width: 97%;
 	clear: both;
 	float: left;
-	border-radius: 2px;
+	border-radius: 3px;
 	margin: 8px;
 	display: none;
-	vertical-align:middle;
-	font-size:11px;
+	vertical-align: middle;
+	font-size: 11px;
 	z-index: 50;
+	color: #999;
 }
 
 .slideParameters {
-	border: 1px solid #808080;
-	background-color: #d7d7d7;
+	border: 1px solid #555;
+	background-color: #555;
 }
 
 .slideContainerActive {
@@ -716,7 +717,17 @@
 }
 
 input {
+	border-radius: 3px;
 	-moz-user-select: text;
+	text-indent: none;
+	text-indent: 0px;
+	text-shadow: none;
+	border: none;
+	border-radius: 5px;
+	color: silver;
+	font-size: 9pt;
+	padding: 2px;
+	margin-left: 5px;
 }
 
 .treeIterationCursor {
@@ -828,3 +839,31 @@
 .targetSelector{
 
 }
+
+.setting-control {
+	display: inline-block;
+	width: 200px;
+	padding: 4px;
+	margin: 10px;
+	outline: none;
+	background-color: white;
+	border: 1px solid #CCC;
+	border-radius: 3px;
+	font-size: 12px;
+	color: #222;
+}
+
+.settingsPanelLabel {
+	margin-top: 10px;
+	min-width: 145px;
+	text-transform: uppercase;
+	color: #B3ADAA;
+	display: inline-block;
+}
+
+.settingsPanel{
+	position: relative;
+	float: right;
+	margin-right: 24px;
+	padding: 10px;
+}
diff --git a/bundles/org.eclipse.orion.client.core/web/css/images.css b/bundles/org.eclipse.orion.client.core/web/css/images.css
index d21ba19..14f1e7a 100644
--- a/bundles/org.eclipse.orion.client.core/web/css/images.css
+++ b/bundles/org.eclipse.orion.client.core/web/css/images.css
@@ -77,3 +77,23 @@
 .core-sprite-stop{ background-position: 0 -685px; width: 16px; height: 16px; } 
 .core-sprite-stylesheet{ background-position: 0 -703px; width: 16px; height: 16px; } 
 .core-sprite-warning{ background-position: 0 -721px; width: 16px; height: 16px; } 
+ 
+   
+.core-sprite-settings {
+   background: url(../images/gear.png) no-repeat top left;
+   vertical-align: middle;
+   display: inline-block;
+   margin-top: 4px;
+   height: 16px;
+   width: 16px;
+}
+
+.core-sprite-settings-white {
+   background: url(../images/gear-white.png) no-repeat top left;
+   vertical-align: middle;
+   display: inline-block;
+   margin-top: 4px;
+   height: 16px;
+   width: 16px;
+}
+
diff --git a/bundles/org.eclipse.orion.client.core/web/edit/setup.js b/bundles/org.eclipse.orion.client.core/web/edit/setup.js
index 2f54867..53918f8 100644
--- a/bundles/org.eclipse.orion.client.core/web/edit/setup.js
+++ b/bundles/org.eclipse.orion.client.core/web/edit/setup.js
@@ -17,12 +17,12 @@
         'orion/problems', 'orion/editor/contentAssist', 'orion/editorCommands', 'orion/editor/editorFeatures', 'orion/editor/editor', 'orion/syntaxchecker',
         'orion/textview/textView', 'orion/textview/textModel', 
         'orion/textview/projectionTextModel', 'orion/textview/keyBinding','orion/searchAndReplace/textSearcher',
-        'orion/edit/dispatcher', 'orion/contentTypes', 'orion/PageUtil', 'orion/highlight', "orion/i18nUtil", 'orion/edit/syntaxmodel',
+        'orion/edit/dispatcher', 'orion/contentTypes', 'orion/PageUtil', 'orion/highlight', "orion/i18nUtil", 'orion/edit/syntaxmodel', 'orion/widgets/themes/editor/MiniThemeChooser',
        'dojo/hash'], 
 		function(messages, require, dojo, mSelection, mStatus, mProgress, mDialogs, mCommands, mFavorites,
 				mFileClient, mOperationsClient, mSearchClient, mGlobalCommands, mOutliner, mProblems, mContentAssist, mEditorCommands, mEditorFeatures, mEditor,
 				mSyntaxchecker, mTextView, mTextModel, mProjectionTextModel, mKeyBinding, mSearcher,
-				mDispatcher, mContentTypes, PageUtil, Highlight, i18nUtil, SyntaxModelWirer) {
+				mDispatcher, mContentTypes, PageUtil, Highlight, i18nUtil, SyntaxModelWirer, mThemeChooser) {
 	
 var exports = exports || {};
 	
@@ -139,6 +139,11 @@
 							this._contentType = contentTypeService.getFilenameContentType(this.getTitle());
 							name = this.getTitle();
 						}
+						
+						var chooser = new mThemeChooser.MiniThemeChooser( preferences, editor.getTextView() );
+	
+						mGlobalCommands.addSettings( chooser );
+						
 						mGlobalCommands.setPageTarget({task: "Coding", name: name, target: metadata,
 							isFavoriteTarget: true, makeAlternate: function() {
 								if (metadata.Parents && metadata.Parents.length > 0) {
diff --git a/bundles/org.eclipse.orion.client.core/web/images/gear-white.png b/bundles/org.eclipse.orion.client.core/web/images/gear-white.png
new file mode 100644
index 0000000..0c22df0
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.core/web/images/gear-white.png
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.core/web/images/gear.png b/bundles/org.eclipse.orion.client.core/web/images/gear.png
new file mode 100644
index 0000000..8a78e80
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.core/web/images/gear.png
Binary files differ
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/commonHTMLFragments.js b/bundles/org.eclipse.orion.client.core/web/orion/commonHTMLFragments.js
index 636f1e9..087dfb9 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/commonHTMLFragments.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/commonHTMLFragments.js
@@ -90,6 +90,9 @@
 		'<ul class="layoutLeft commandList pageActions" id="pageActions"></ul>' + //$NON-NLS-0$
 		'<ul class="layoutLeft commandList pageActions" id="selectionTools"></ul>' + //$NON-NLS-0$
 		'<img class="layoutRight progressPane" src="'+ require.toUrl("images/none.png") +'" id="progressPane" tabindex="0" role="progressbar" aria-label="Operations - Press spacebar to show current operations"></img>' + //$NON-NLS-4$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+		'<div class="layoutRight" style="padding-left:7px;padding-right:7px;margin-top:3px;" id="settingsTab" style="visibility:hidden;">' +
+		'<div class="layoutRight settings core-sprite-settings" id="settingsAction" role="settings" aria-live="off" style="visibility:hidden;"></div>' + //$NON-NLS-0$
+		'</div>' + 
 		'<div class="layoutRight status" id="statusPane" role="status" aria-live="off"></div>' + //$NON-NLS-0$
 		'<ul class="layoutRight commandList pageActions" id="pageNavigationActions"></ul>' + //$NON-NLS-0$
 		'<div id="notificationArea" class="layoutLeft layoutBlock slideContainer">' + //$NON-NLS-0$
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/editorCommands.js b/bundles/org.eclipse.orion.client.core/web/orion/editorCommands.js
index cf1827d..eb4e734 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/editorCommands.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/editorCommands.js
@@ -149,52 +149,6 @@
 					
 				this.commandService.addCommand(saveCommand);
 				this.commandService.registerCommandContribution(this.toolbarId, "orion.save", 1, null, false, new mCommands.CommandKeyBinding('s', true)); //$NON-NLS-1$ //$NON-NLS-0$
-				
-				
-				if( document.webkitCancelFullScreen || document.mozCancelFullScreen ){
-				
-					editor.getTextView().setAction("fullscreen", dojo.hitch(this, function (){ 
-						var element = document.getElementById('innerPanels'); 
-						
-						if( element.webkitRequestFullScreen ){
-							element.webkitRequestFullScreen(); 
-						}else if( element.mozRequestFullScreen ){
-							element.mozRequestFullScreen(); 
-						}
-					}));
-						
-				    editor.getTextView().setAction("normalscreen", dojo.hitch(this, function (){ 
-						var element = document.getElementById('innerPanels');
-						if( document.webkitCancelFullScreen ){
-							document.webkitCancelFullScreen(); 
-						}else if( document.mozCancelFullScreen ){
-							document.mozCancelFullScreen();
-						}
-					}));
-	
-					
-					var fullScreenCommand = new mCommands.Command({
-					
-						name: 'Fullscreen',
-						tooltip: 'Edit in full screen mode',
-						id: "orion.fullscreen",
-						callback: function(data){
-						
-							if( data.domNode.innerHTML === 'Fullscreen' ){
-								data.domNode.innerHTML = 'Exit Fullscreen';
-								data.items.getTextView().invokeAction("fullscreen");
-							}else{
-								data.domNode.innerHTML = 'Fullscreen';
-								
-								data.items.getTextView().invokeAction("normalscreen");
-							}
-						}
-					});
-					
-					this.commandService.addCommand(fullScreenCommand);
-					this.commandService.registerCommandContribution(this.toolbarId, "orion.fullscreen", 1, null, false, new mCommands.CommandKeyBinding('u', true)); //$NON-NLS-1$ //$NON-NLS-0$
-	
-				}
 		
 				// page navigation commands (go to line)
 				var lineParameter = new mCommands.ParametersDescription([new mCommands.CommandParameter('line', 'number', 'Line:')], {hasOptionalParameters: false}, //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.core/web/orion/globalCommands.js
index 0f920c3..44fcd95 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/globalCommands.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/globalCommands.js
@@ -594,6 +594,93 @@
 		}
 	}
 	
+	function isDescendant(parent, child) {
+	     var node = child.parentNode;
+	     while (node !== null) {
+	         if (node === parent) {
+	             return true;
+	         }
+	         node = node.parentNode;
+	     }
+	     return false;
+	}
+	
+	
+		/* This function adds a settings dialog to a page. It adds it so that	
+		a settings gear will appear at the right hand side */
+	
+	function addSettings( settings ){
+		var settingsNode = document.getElementById("settingsTab");
+		var settingsButton = document.getElementById("settingsAction");
+		settingsNode.style.visibility = '';
+		settingsButton.style.visibility = '';
+		settingsButton.onclick = function(){
+		
+			var TAB_HEIGHT = 24;
+			var TAB_WIDTH = 25;
+			var PANEL_HEIGHT = 150;
+			var PANEL_WIDTH = 220;
+			var BORDER_RADIUS = '3px';
+			var COLOR = '#555';
+		
+			settingsNode.style.backgroundColor = COLOR;
+			settingsNode.style.zIndex = '99';
+			settingsNode.style.borderTopRightRadius = BORDER_RADIUS;
+			settingsNode.style.borderTopLeftRadius = BORDER_RADIUS;
+			
+			settingsButton.className = "core-sprite-settings-white";
+			
+			settingsNode.id = 'settingsNode';
+			settingsButton.id = 'settingsButton';
+			
+			var rightPane = document.getElementById( 'innerPanels' );	
+			var rpBox = rightPane.getBoundingClientRect();
+			var box = settingsNode.getBoundingClientRect();
+			var leftPane = document.getElementById( 'outlineContainer' );
+			var lpBox = leftPane.getBoundingClientRect();
+			
+			var panel = document.createElement( 'div' );
+			panel.className = 'settingsPanel';
+			panel.style.width = PANEL_WIDTH + 'px';
+			panel.style.height = PANEL_HEIGHT + 'px';
+			panel.style.backgroundColor = COLOR;
+			panel.style.zIndex = '99';
+			panel.style.top = box.top - rpBox.top + TAB_HEIGHT -4 + 'px';
+			panel.id = 'settingsPanel';
+			
+			panel.style.borderTopLeftRadius = BORDER_RADIUS;
+			panel.style.borderBottomRightRadius = BORDER_RADIUS;
+			panel.style.borderBottomLeftRadius = BORDER_RADIUS;
+			rightPane.appendChild( panel );
+			
+			settings.appendTo( panel );
+			
+			var listener = window.addEventListener("click", function(event) { 
+			
+				switch( event.target.id ){
+					
+					case 'settingsPanel':
+					case 'settingsButton':
+					case 'settingsNode':
+						break;
+						
+					default:
+					
+						if( !isDescendant( panel, event.target ) ){
+							settingsButton.className = "core-sprite-settings";
+							settingsNode.style.backgroundColor = 'white';
+	
+								rightPane.removeChild( panel );
+							
+							settings.destroy();
+							window.removeEventListener( listener );
+						}
+						
+						break;
+				}			
+			}, false);
+		};
+	}
 	
 	/**
 	 * Generates the banner at the top of a page.
@@ -1060,6 +1147,7 @@
 	
 	//return the module exports
 	return {
+		addSettings: addSettings,
 		generateBanner: generateBanner,
 		getToolbarElements: getToolbarElements,
 		layoutToolbarElements: layoutToolbarElements,
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/MiniThemeChooser.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/MiniThemeChooser.js
new file mode 100644
index 0000000..6dedf5d
--- /dev/null
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/MiniThemeChooser.js
@@ -0,0 +1,282 @@
+/*******************************************************************************

+ * @license

+ * Copyright (c) 2012 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials are made 

+ * available under the terms of the Eclipse Public License v1.0 

+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 

+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 

+ * 

+ * Contributors: Anton McConville - IBM Corporation - initial API and implementation

+ ******************************************************************************/

+/*global dojo dijit widgets orion  window console define localStorage*/

+/*jslint browser:true*/

+

+define(['i18n!orion/settings/nls/messages', 'require', 'dojo', 'dijit', 'orion/commands', 'orion/globalCommands', 'orion/PageUtil', 'orion/widgets/themes/ThemeComponent', 'orion/widgets/themes/editor/ThemeData'], 

+	function(messages, require, dojo, dijit, mCommands, mGlobalCommands, PageUtil, Component, ThemeData ) {

+

+		function MiniThemeChooser(preferences, textview){			

+			

+			this.preferences = preferences;

+			this.textview = textview;

+			// anchorNode.InnerHTML = this.template;

+		}

+		

+		function appendTo( node ){

+			node.innerHTML = this.template;

+			

+			this.addFontSizePicker();

+			this.addThemePicker();

+		}

+		

+		MiniThemeChooser.prototype.appendTo = appendTo;

+

+		MiniThemeChooser.prototype.template =	'<div id="themeContainer">' +

+													'<div id="pickercontainer" style="display:block;">' +

+														'<span class="settingsPanelLabel">Chosen Theme:</span>' + 

+														'<div id="themepicker"></div>' +

+													'</div>' +

+													'<div id="sizecontainer">' +

+														'<span class="settingsPanelLabel">Font Size:</span>' + 

+														'<div id="fontsizepicker"></div>' +

+													'</div>' +

+												'</div>';

+		

+		function select( name ){

+		

+			var themeInfo = this.themeData.getThemeStorageInfo();

+		

+			var selectedTheme = { 'selected': name };

+				

+			this.preferences.getPreferences(themeInfo.storage, 2).then(function(prefs){ //$NON-NLS-0$

+//				prefs.put( themeInfo.styleset, JSON.stringify(styles) );

+				prefs.put( 'selected', JSON.stringify(selectedTheme) );

+			} );

+		}

+		

+		MiniThemeChooser.prototype.select = select;

+		

+		function selectFontSize( size ){

+		

+			var themeInfo = this.themeData.getThemeStorageInfo();

+			

+			var tv = this.textview;

+		

+			this.preferences.getPreferences('/settings', 2).then(function(prefs){

+				

+				var styles = prefs.get( 'JavaScript Editor' );

+				

+				if(styles){ 

+					styles = JSON.parse( styles ); 

+					

+					for( var s in styles ){

+						if( styles[s].element === 'fontSize' ){

+							styles[s].value = size;

+							break;

+						}

+					}

+				}

+			

+				prefs.put( 'JavaScript Editor', JSON.stringify(styles) );

+				

+				/* First cut - going to reload the page, will work on making this

+				   happen dynamically. First of all I want to makes sure the

+				   infrastructure is working to add settings and operate

+				   the settings panel */

+				

+				window.location.reload();

+				

+				/* Just setting the style is not enough - having trouble

+				   closing in on the right hooks within the editor

+				   to update the view */

+				

+//				var nodes = document.querySelectorAll( '.userTheme' ); 

+//				for( var item in nodes ){

+//					nodes[item].style.fontSize = size;

+//				}

+				

+			});

+		}

+		

+		MiniThemeChooser.prototype.selectFontSize = selectFontSize;

+		

+		function updateFontSizePicker( selected ){

+		

+			var MiniThemeChooser = this;

+		

+			var options = [];

+			

+			for( var size = 8; size < 19; size++ ){

+					

+				var set = {

+					value: size + 'pt',

+					label: size + 'pt'

+				};	

+				

+				if( size === selected ){ set.selected = 'true'; }

+				

+				options.push(set);

+			}	

+		

+			this.sizeSelect.destroy();

+			var newdiv = document.createElement('div');

+			newdiv.id = 'fontsizepicker';

+			document.getElementById( 'sizecontainer' ).appendChild(newdiv);

+			this.sizeSelect = new orion.widgets.settings.Select( {options:options}, newdiv );

+			this.sizeSelect.setStorageItem = dojo.hitch( MiniThemeChooser, 'selectFontSize' );

+	

+		}

+		

+		function addFontSizePicker(){

+		

+			var MiniThemeChooser = this;

+			

+			var picker = document.getElementById( 'fontsizepicker' );

+			

+			var options = [];

+			

+			for( var size = 8; size < 19; size++ ){

+					

+				var set = {

+					value: size + 'pt',

+					label: size + 'pt'

+				};	

+				

+				if( size === 10 ){ set.selected = 'true'; }

+				

+				this.fontSize = '10pt';

+				

+				options.push(set);

+			}	

+			

+			this.sizeSelect = new orion.widgets.settings.Select( {options:options}, picker );

+			this.sizeSelect.setStorageItem = dojo.hitch( MiniThemeChooser, 'selectFontSize' );	

+		}

+		

+		MiniThemeChooser.prototype.addFontSizePicker = addFontSizePicker;

+		

+		MiniThemeChooser.prototype.select = select;

+		

+		

+		function addThemePicker(){

+		

+			var options = [];

+			

+			var MiniThemeChooser = this;

+			

+			var selection;

+			

+			var builder = this;

+			

+			this.themeData = new ThemeData.ThemeData();

+			

+			var themeInfo = this.themeData.getThemeStorageInfo();

+			

+			this.preferences.getPreferences(themeInfo.storage, 2).then(dojo.hitch(this, function(prefs){ //$NON-NLS-0$

+

+				/* Check to see if the Orion theme is in the themes preferences ... if it is, 

+				   then we don't need to populate again, otherwise we do need to populate. */

+				   		   

+				selection = prefs.get( 'selected' );

+				

+				if(selection){ selection = JSON.parse( selection ); }

+				

+				var styles = prefs.get( themeInfo.styleset );

+				

+				if(styles){ styles = JSON.parse( styles ); }

+

+				if(!styles){

+				

+					/* If we're in this condition, then the themes are not in local storage yet.

+					   Going to make sure */

+				

+					styles = builder.styleset; 

+				}

+				

+				if(!selection) {

+					selection = { 'selected':'Orion' };	

+				}

+			

+				if( styles ){

+				

+					for( var theme in styles ){

+					

+						var set = {

+							value: styles[theme].name,

+							label: styles[theme].name

+						};	

+						

+						if( selection ){	

+							if( styles[theme].name === selection.selected ){

+								set.selected = true;

+							}

+						}

+						

+						options.push(set);

+						

+						MiniThemeChooser.styles = styles;

+					}	

+				}

+				

+//				if( selection ){	

+//					this.select( selection.selected );

+//				}

+			

+				var picker = document.getElementById( 'themepicker' );

+				

+				this.themeSelect = new orion.widgets.settings.Select( {options:options}, picker );

+				this.themeSelect.setStorageItem = dojo.hitch( MiniThemeChooser, 'select' );

+			

+			} ));	

+		}

+		

+		MiniThemeChooser.prototype.addThemePicker = addThemePicker;

+		

+		

+		function updateThemePicker(selection){

+			

+			var options = [];

+			

+			for( var theme in this.styles ){

+					

+				var set = {

+					value: this.styles[theme].name,

+					label: this.styles[theme].name

+				};	

+				

+				if( selection ){	

+					if( this.styles[theme].name === selection ){

+						set.selected = true;

+					}

+				}

+				

+				options.push(set);

+				

+				this.themeSelect.destroy();

+				var newdiv = document.createElement('div');

+				newdiv.id = 'themepicker';

+				document.getElementById( 'pickercontainer').appendChild(newdiv);

+				this.themeSelect = new orion.widgets.settings.Select( {options:options}, newdiv );

+				this.themeSelect.setStorageItem = dojo.hitch( this, 'select' );

+			}	

+		}

+		

+		function destroy(){

+			var picker = dijit.byId( 'themepicker' );

+			if (picker) {

+				picker.destroyRecursive();

+			}

+

+			var fontsizepicker = dijit.byId( 'fontsizepicker' );

+			if (fontsizepicker) {

+				fontsizepicker.destroyRecursive();

+			}

+		}

+		

+		MiniThemeChooser.prototype.destroy = destroy;

+

+		return{

+			MiniThemeChooser:MiniThemeChooser,

+			destroy:destroy

+		};

+	}

+);
\ No newline at end of file
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/ThemeData.js b/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/ThemeData.js
index e507d57..b2664c5 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/ThemeData.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/ThemeData.js
@@ -49,7 +49,7 @@
 		StyleSet.prototype.overviewRuler = '#FBFBFB';

 		StyleSet.prototype.lineNumberOdd = 'white';

 		StyleSet.prototype.lineNumberEven = 'white';

-		StyleSet.prototype.lineNumber = '#bfbfbf';

+		StyleSet.prototype.lineNumber = 'silver';

 		StyleSet.prototype.tag = 'darkorange';

 		StyleSet.prototype.attribute = 'cadetBlue';

 		StyleSet.prototypefontSize = '10pt';

@@ -88,9 +88,9 @@
 		prospecto.text = 'darkSlateGray';

 		prospecto.string = 'cornFlowerBlue';

 		prospecto.overviewRuler = 'white';

-		prospecto.lineNumberOdd = 'darkSlateGray';

-		prospecto.lineNumberEven = 'darkSlateGray';

-		prospecto.lineNumber = 'darkSlateGray';

+		prospecto.lineNumberOdd = 'silver';

+		prospecto.lineNumberEven = 'silver';

+		prospecto.lineNumber = 'silver';

 		prospecto.currentLine = '#EAF2FE';

 		prospecto.tag = 'darkorange';

 		prospecto.attribute = 'cadetBlue';

@@ -703,8 +703,6 @@
 		ThemeData.prototype.importTheme = importTheme;

 		

 		function processSettings( settings, preferences ){

-		

-			console.log( settings );

 			

 			if( !settings['fontSize'] ){

 				settings['fontSize'] = { value:'10pt' };

diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/textview/rulers.css b/bundles/org.eclipse.orion.client.editor/web/orion/textview/rulers.css
index 27b6c83..da1b06c 100644
--- a/bundles/org.eclipse.orion.client.editor/web/orion/textview/rulers.css
+++ b/bundles/org.eclipse.orion.client.editor/web/orion/textview/rulers.css
@@ -18,6 +18,7 @@
 
 /* Styles for the line number ruler */
 .rulerLines {
+	color: silver;
 }
 .rulerLines.even
 .rulerLines.odd {