Attachment 265724 Details for Bug 507788 – Patch that demonstrates proposed theme changes (following 'option 1' in the design document)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch that demonstrates proposed theme changes (following 'option 1' in the design document)

theme_prototype.patch (text/plain), 42.64 KB, created by Casey Flynn

on 2016-12-05 13:29:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Casey Flynn

Created: 2016-12-05 13:29:12 EST

Size: 42.64 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/css/lightPage.css b/bundles/org.eclipse.orion.client.ui/web/css/lightPage.css
>index ec3ce23..3ddd472 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/css/lightPage.css
>+++ b/bundles/org.eclipse.orion.client.ui/web/css/lightPage.css
>@@ -1,4 +1,4 @@
>-
>+/*
> .lightPage .dropdownTrigger:not(.dropdownDefaultButton),
> .lightPage .mainToolbar .commandImage.dropdownTrigger,
> .lightPage .dropdownButtonWithIcon,
>@@ -180,7 +180,7 @@
>  	color: white !important;
> }
> 
>-.lightPage .primaryButton {  /* from git.css */
>+.lightPage .primaryButton {  
> 	background-color: rgb(61, 114, 179) !important;
> 	color: white !important;
> 	border: 1px solid rgb(61, 114, 179) !important;
>@@ -211,7 +211,7 @@
> 	color: #cdcdcd;
> }
> 
>-.lightPage .textviewTooltip .commandButton { /* Styling quickfixes */
>+.lightPage .textviewTooltip .commandButton {
> 	border-color: white;
> 	border: 1px solid #325C80;
> 	background-color: inherit;
>@@ -269,7 +269,7 @@
> 	width: 40px;
> 	border-width: 4px;
> }
>-
>+*/
> @-webkit-keyframes rotateThis {
> 	0% {
> 		transform: rotate(0deg);
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js
>index cc8ce94..1409dcd 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/ThemeVersion.js
>@@ -7,6 +7,7 @@
>  * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
>  * 
>  * Contributors: Anton McConville - IBM Corporation - initial API and implementation
>+ * 				 Casey Flynn - Google Inc.
>  ******************************************************************************/
> /*eslint-env browser, amd*/
> define([], function() {
>@@ -14,7 +15,7 @@ define([], function() {
> 	/**
> 	 * Version string for theme data. Please update this string whenever you change the style of a themable element.
> 	 */
>-	var THEMES_VERSION = "6.88";
>+	var THEMES_VERSION = "6.881";
> 
> 	return THEMES_VERSION;
> });
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeData.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeData.js
>index 8cfa634..f9cca34 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeData.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeData.js
>@@ -7,6 +7,7 @@
>  * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
>  * 
>  * Contributors: Anton McConville - IBM Corporation - initial API and implementation
>+ * 				 Casey Flynn - Google Inc.
>  ******************************************************************************/
> /*eslint-env browser, amd*/
> 
>@@ -25,185 +26,566 @@ define([
> 	//
> 	// *******************************************************************************
> 
>-		function StyleSet(){
>-		    //
>-		}
>-		
>-		function multiply(a,b){
>-			var resultString = 'Result:';
>-			var result = a*b;
>-			return resultString + result;
>-		}
>-		
>-		// TODO: what are these for? They just get overridden by ThemeData constructor
>-		StyleSet.prototype.name = 'Orion';
>-		StyleSet.prototype.navbar = '#404648';
>-		StyleSet.prototype.button = '#EFEFEF';
>-		StyleSet.prototype.location = '#333';
>-		StyleSet.prototype.breadcrumb = '#3087B3';
>-		StyleSet.prototype.separator = '#333';
>-		StyleSet.prototype.selection = 'FEC';
>-		StyleSet.prototype.sidepanel = '#FBFBFB';
>-		StyleSet.prototype.mainpanel = 'white';
>-		StyleSet.prototype.toolpanel = 'white';
>-		StyleSet.prototype.navtext = '#bfbfbf';
>-		StyleSet.prototype.content = '#3087B3';
>-		StyleSet.prototype.search = '#444';
>-		StyleSet.prototype.bannerProgress = "white";
>+
>+//		function StyleSet(){
>+//		    //
>+//		}
>+//		
>+//		// TODO: what are these for? They just get overridden by ThemeData constructor
>+//		StyleSet.prototype.name = 'Orion';
>+//		StyleSet.prototype.navbar = '#404648';
>+//		StyleSet.prototype.button = '#EFEFEF';
>+//		StyleSet.prototype.location = '#333';
>+//		StyleSet.prototype.breadcrumb = '#3087B3';
>+//		StyleSet.prototype.separator = '#333';
>+//		StyleSet.prototype.selection = 'FEC';
>+//		StyleSet.prototype.sidepanel = '#FBFBFB';
>+//		StyleSet.prototype.mainpanel = 'white';
>+//		StyleSet.prototype.toolpanel = 'white';
>+//		StyleSet.prototype.navtext = '#bfbfbf';
>+//		StyleSet.prototype.content = '#3087B3';
>+//		StyleSet.prototype.search = '#444';
>+//		StyleSet.prototype.bannerProgress = "white";
> 
> 		function ThemeData(){
> 		
> 			this.styles = [];
>-			
>-			var orion = new StyleSet();
>-			orion.name = 'Orion';
>-			orion.navbar = 'white'; // #404648 for dark banner
>-			orion.button = '#EFEFEF';
>-			orion.location = '#efefef';
>-			orion.selection = 'FEC';
>-			orion.sidepanel = '#FBFBFB';
>-			orion.mainpanel = 'white';
>-			orion.toolpanel = 'white';
>-			orion.navtext = '#bfbfbf';
>-			orion.content = '#3087B3';
>-			orion.search = '#444';
>-			orion.breadcrumb = '#3087B3';
>-			orion.separator = '#333';
>-			orion.bannerProgress = "whitesmoke";
> 
>-			this.styles.push( orion );		
>+			var orionPage = {
>+				"className": "lightPage",
>+				"name": "lightPage",
>+				"styles":  {
>+					"#configSection": {
>+						"background": "white !important",
>+						"color": "black !important"
>+					},
>+					"#log": {
>+						"margin": "5px",
>+						"width": "calc(100% - 17px)"
>+					},
>+					"auxpane": {
>+						"background": "#c4c5c8 !important"
>+					},
>+					".checkedRow": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important",
>+						".commandButton": {
>+							"border-color": "white",
>+							"color": "white"
>+						},
>+						".commandButton:not(.primaryButton):focus": {
>+							"background": "rgba(255, 255, 255, 0.50)",
>+							"box-shadow": "0 1px 2px 0 rgb(61, 114, 179)",
>+							"color": "black"
>+						},
>+						".commandButton:not(.primaryButton):hover": {
>+							"background": "rgba(255, 255, 255, 0.50)",
>+							"box-shadow": "0 1px 2px 0 rgb(61, 114, 179)",
>+							"color": "black"
>+						},
>+						".gitStatusIcon": {
>+							"color": "white !important"
>+						},
>+						".gitStatusTitle": {
>+							"color": "white !important"
>+						}
>+					},
>+					".commandButton": {
>+						"background-color": "rgba(0, 0, 0, 0)",
>+						"border": "1px solid rgb(61, 114, 179)",
>+						"color": "rgb(61, 114, 179)"
>+					},
>+					".commandButton.disabled": {
>+						"color": "#cdcdcd"
>+					},
>+					".commandButton.orionButton.dropdownTrigger:hover": {
>+						"border-color": "#ccc"
>+					},
>+					".commandButton:not(.primaryButton):focus": {
>+						"background-color": "rgba(61, 114, 179, 0.25)",
>+						"box-shadow": "0 1px 2px 0 rgb(61, 114, 179)",
>+						"color": "black"
>+					},
>+					".commandButton:not(.primaryButton):hover": {
>+						"background-color": "rgba(61, 114, 179, 0.25)",
>+						"box-shadow": "0 1px 2px 0 rgb(61, 114, 179)",
>+						"color": "black"
>+					},
>+					".content-fixedHeight": {
>+						"background": "#c4c5c8 !important"
>+					},
>+					".core-sprite-error": {
>+						"color": "red"
>+					},
>+					".dialogTitle": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".dropdownButtonWithIcon": {
>+						"color": "rgb(21, 41, 53) !important"
>+					},
>+					".dropdownMenu": {
>+						".dropdownMenuItemSelected": {
>+							"background": "rgba(61, 114, 179, 0.25)",
>+							"border-left-color": "rgb(61, 114, 179)"
>+						}
>+					},
>+					".dropdownTrigger:not(.dropdownDefaultButton)": {
>+						"color": "rgb(21, 41, 53) !important"
>+					},
>+					".editorViewerHeader": {
>+						"background": "#f5f7fa !important",
>+						"border-bottom": "1px solid #f5f7fa",
>+						"color": "black"
>+					},
>+					".filesystemName": {
>+						"color": "rgb(21, 41, 53) !important"
>+					},
>+					".fixedToolbarHolder": {
>+						"background": "white"
>+					},
>+					".gitCommitMessage": {
>+						"gitCommitMessageTopRow": {
>+							"border": "1px solid rgb(61, 114, 179)"
>+						}
>+					},
>+					".gitCommitMessageSection": {
>+						"background-color": "rgba(61, 114, 179, 0.25)"
>+					},
>+					".gitCommitMore": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".gitStatusIcon": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".gitStatusSection": {
>+						"background-color": "rgba(61, 114, 179, 0.25)"
>+					},
>+					".gitStatusTitle": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".label.parameterInput": {
>+						"color": "white !important"
>+					},
>+					".launchConfigurationMenuItem.dropdownMenuItemActive": {
>+						"background": "#f5f7fa"
>+					},
>+					".launchConfigurationsButton": {
>+						".commandButton.orionButton.dropdownTrigger": {
>+							"color": "white !important"
>+						}
>+					},
>+					".launchConfigurationsWrapper>.launchConfigurationsButton.dropdownTrigger": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".launchConfsDropdown": {
>+						".dropdownDefaultButton": {
>+							"background-color": "rgb(61, 114, 179) !important",
>+							"color": "white !important"
>+						}
>+					},
>+					".launchConfsLabel": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".liveUpdateLabel": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".mainToolbar": {
>+						"background-color": "white",
>+						"color": "rgb(21, 41, 53) !important",
>+						".commandButton.orionButton.dropdownTrigger": {
>+							"border-color": "white !important",
>+							"color": "black !important",
>+							".dropdownTriggerButtonLabel": {
>+								"color": "white"
>+							}
>+						},
>+						".commandButton.orionButton.dropdownTrigger.launchConfigurationsButton": {
>+							"dropdownArrowDown": {
>+								"color": "white"
>+							}
>+						},
>+						".commandImage.dropdownTrigger": {
>+							"color": "rgb(21, 41, 53) !important"
>+						},
>+						".gitSectionLabel": {
>+							"background-color": "rgb(61, 114, 179) !important",
>+							"color": "white !important"
>+						},
>+						".sectionWrapper": {
>+							"background-color": "rgb(61, 114, 179) !important",
>+							"color": "white !important"
>+						}
>+					},
>+					".mainpane": {
>+						"background": "#c4c5c8 !important"
>+					},
>+					".navbar-item-selected": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".orionSwitchLabel": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".outlineExplorer": {
>+						".treeIterationCursorRow_Dotted": {
>+							"background-color": "rgb(61, 114, 179) !important",
>+							"color": "white !important"
>+						}
>+					},
>+					".primaryButton": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"border": "1px solid rgb(61, 114, 179) !important",
>+						"border-radius": "0 !important",
>+						"color": "white !important"
>+					},
>+					".primaryButton:hover,": {
>+						".primaryButton:focus": {
>+							"background": "rgb(61, 114, 179)",
>+							"border-color": "rgb(61, 114, 179)"
>+						}
>+					},
>+					".projectNavColumn": {
>+						"color": "black"
>+					},
>+					".searchResultsWrapperDiv": {
>+						".selectableNavRow:hover": {
>+							"background": "rgba(61, 114, 179, 0.25)",
>+							"border-left-color": "rgb(61, 114, 179)"
>+						}
>+					},
>+					".sectionTable": {
>+						"background-color": "white"
>+					},
>+					".sideMenu": {
>+						"background-color": "white"
>+					},
>+					".sideMenuItem": {
>+						"color": "rgb(21, 41, 53) !important"
>+					},
>+					".sideMenuItem>.submenu-trigger:hover": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".sideMenuItemActive": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".sideMenuItemActive:hover": {
>+						"background": "rgba(61, 114, 179, 0.25) !important",
>+						"color": "white"
>+					},
>+					".sidebarWrapper": {
>+						"background": "#f5f7fa !important",
>+						"color": "black"
>+					},
>+					".slideParameters": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"color": "white !important"
>+					},
>+					".splash": {
>+						"background": "#f5f7fa !important",
>+						"box-shadow": "none"
>+					},
>+					".splashAbout": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".splashDetailedMessage": {
>+						"color": "black"
>+					},
>+					".splashLoader": {
>+						"background": "#f5f7fa !important",
>+						"box-shadow": "none"
>+					},
>+					".splashLoadingImage": {
>+						"-webkit-animation": "rotateThis .5s infinite linear",
>+						"animation": "rotateThis .5s infinite linear",
>+						"background": "none",
>+						"border": "2px solid #00b299",
>+						"border-radius": "50%",
>+						"border-right-color": "transparent",
>+						"display": "inline-block",
>+						"height": "20px",
>+						"margin": "0",
>+						"opacity": ".4",
>+						"width": "20px"
>+					},
>+					".splashLoadingImage.initial": {
>+						"border-width": "4px",
>+						"height": "40px",
>+						"width": "40px"
>+					},
>+					".splashMessage": {
>+						"color": "black"
>+					},
>+					".splashVerbal": {
>+						"color": "rgb(61, 114, 179) !important"
>+					},
>+					".split": {
>+						"background": "#c4c5c8",
>+						"width": "4px"
>+					},
>+					".splitThumb": {
>+						"background": "#c4c5c8"
>+					},
>+					".status": {
>+						"color": "black"
>+					},
>+					".statusContainer": {
>+						"background": "#f5f7fa",
>+						"color": "black"
>+					},
>+					".statusLight": {
>+						"background": "lightgray"
>+					},
>+					".statusLight.statusLightAmber": {
>+						"background": "#FFE141"
>+					},
>+					".statusLight.statusLightGreen": {
>+						"background": "#13dd6d"
>+					},
>+					".statusLight.statusLightProgress": {
>+						"background": "transparent",
>+						"border-color": "lightgray",
>+						"border-top-color": "transparent"
>+					},
>+					".statusLight.statusLightRed": {
>+						"background": "#C1272D"
>+					},
>+					".textviewTooltip": {
>+						".commandButton": {
>+							"background-color": "inherit",
>+							"border": "1px solid #325C80",
>+							"border-color": "white",
>+							"color": "white",
>+							"margin-bottom": "2px"
>+						}
>+					},
>+					".titleActionContainer": {
>+						"background": "#f5f7fa !important",
>+						"color": "black"
>+					},
>+					".tooltip": {
>+						"background-color": "rgb(61, 114, 179) !important",
>+						"border": "1px solid rgb(61, 114, 170)",
>+						"color": "white !important",
>+						"h2": {
>+							"color": "white !important"
>+						},
>+						".navlinkonpage": {
>+							"background-color": "rgb(61, 114, 179) !important",
>+							"color": "white !important"
>+						},
>+						".operationError": {
>+							"color": "white !important"
>+						}
>+					},
>+					".tooltipTailFromabove:after": {
>+						"border-top-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFromabove:before": {
>+						"border-top-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFrombelow:after": {
>+						"border-bottom-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFrombelow:before": {
>+						"border-bottom-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFromleft:after": {
>+						"border-left-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFromleft:before": {
>+						"border-left-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFromright:after": {
>+						"border-right-color": "rgb(61, 114, 179)"
>+					},
>+					".tooltipTailFromright:before": {
>+						"border-right-color": "rgb(61, 114, 179)"
>+					},
>+					".treeIterationCursorRow": {
>+						"background-color": "rgba(61, 114, 179, 0.25)"
>+					},
>+					".treeIterationCursorRow_Dotted": {
>+						"background-color": "rgba(61, 114, 179, 0.25)"
>+					},
>+					".workingTarget": {
>+						"background-color": "white"
>+					}
>+				}
>+			};
>+			this.styles.push(orionPage);
> 			
>-			var orion2014 = new StyleSet();
>-			orion2014.name = 'Orion2014';
>-			orion2014.navbar = 'white';
>-			orion2014.button = '#EFEFEF';
>-			orion2014.location = '#EFEFEF';
>-			orion2014.selection = 'FEC';
>-			orion2014.sidepanel = '#EEEEEE';
>-			orion2014.mainpanel = '#EEEEEE';
>-			orion2014.toolpanel = '#EEEEEE';
>-			orion2014.navtext = '#BFBFBF';
>-			orion2014.content = '#333333';
>-			orion2014.search = '#444444';
>-			orion2014.breadcrumb = '#333333';
>-			orion2014.separator = '#333333';
>-			orion2014.bannerProgress = "orange";
>+//			var test = new StyleSet();
>+//			test.name = "Green Test",
>+//			test.primaryBackgroundColor = 'darkgreen';
>+//			test.primaryTextColor = 'white';
>+//			test.secondaryBackgroundColor = 'seagreen';
>+//			test.secondaryTextColor = 'grey';
>+//			test.tertiaryBackgroundColor = 'pink';
>+//			test.tertiaryTextColor = 'white';
>+//			test.flavorColor = 'orange';
>+//			this.styles.push(test);
>+			
>+//			var orion = new StyleSet();
>+//			orion.name = 'Orion';
>+//			orion.navbar = 'white'; // #404648 for dark banner
>+//			orion.button = '#EFEFEF';
>+//			orion.location = '#efefef';
>+//			orion.selection = 'FEC';
>+//			orion.sidepanel = '#FBFBFB';
>+//			orion.mainpanel = 'white';
>+//			orion.toolpanel = 'white';
>+//			orion.navtext = '#bfbfbf';
>+//			orion.content = '#3087B3';
>+//			orion.search = '#444';
>+//			orion.breadcrumb = '#3087B3';
>+//			orion.separator = '#333';
>+//			orion.bannerProgress = "whitesmoke";
>+//
>+//			this.styles.push( orion );		
>+//			
>+//			var orion2014 = new StyleSet();
>+//			orion2014.name = 'Orion2014';
>+//			orion2014.navbar = 'white';
>+//			orion2014.button = '#EFEFEF';
>+//			orion2014.location = '#EFEFEF';
>+//			orion2014.selection = 'FEC';
>+//			orion2014.sidepanel = '#EEEEEE';
>+//			orion2014.mainpanel = '#EEEEEE';
>+//			orion2014.toolpanel = '#EEEEEE';
>+//			orion2014.navtext = '#BFBFBF';
>+//			orion2014.content = '#333333';
>+//			orion2014.search = '#444444';
>+//			orion2014.breadcrumb = '#333333';
>+//			orion2014.separator = '#333333';
>+//			orion2014.bannerProgress = "orange";
>+//
>+//			this.styles.push( orion2014 );		
> 
>-			this.styles.push( orion2014 );		
> 
>-			var eire = new StyleSet();
>-			
>-			eire.name = 'Green Zone';
>-			eire.navbar = 'seagreen';
>-			eire.button = 'lavender';
>-			eire.location = 'darkseagreen';
>-			eire.selection = 'moccasin';
>-			eire.sidepanel = 'aliceblue';
>-			eire.mainpanel = 'white';
>-			eire.toolpanel = 'white';
>-			eire.navtext = '#FBFBFB';
>-			eire.content = 'darkgreen';
>-			eire.search = 'darkgreen';
>-			eire.breadcrumb = '#3087B3';
>-			eire.separator = 'seagreen';
>-			eire.bannerProgress = "#F2F2F2";
>-			
>-			this.styles.push( eire );
>-			
>-			var avril = new StyleSet();
>-			
>-			avril.name = 'Pretty In Pink';
>-			avril.navbar = 'plum';
>-			avril.button = 'lavender';
>-			avril.location = 'pink';
>-			avril.selection = 'lavender';
>-			avril.sidepanel = 'seashell';
>-			avril.mainpanel = 'white';
>-			avril.toolpanel = 'white';
>-			avril.navtext = '#FBFBFB';
>-			avril.content = 'mediumorchid';
>-			avril.search = 'violet';
>-			avril.breadcrumb = '#3087B3';
>-			avril.separator = 'plum';
>-			avril.bannerProgress = "#F2F2F2";
>-			
>-			this.styles.push( avril );
> 			
>-			var blue = new StyleSet();
> 			
>-			blue.name = 'Blue Monday';
>-			blue.navbar = 'cornflowerblue';
>-			blue.button = 'lavender';
>-			blue.location = 'skyblue';
>-			blue.selection = 'lavender';
>-			blue.sidepanel = 'aliceblue';
>-			blue.mainpanel = 'white';
>-			blue.toolpanel = 'white';
>-			blue.navtext = '#FBFBFB';
>-			blue.content = 'royalblue';
>-			blue.search = 'royalblue';
>-			blue.breadcrumb = '#3087B3';
>-			blue.separator = 'cornflowerblue';
>-			blue.bannerProgress = "#F2F2F2";
> 			
>-			this.styles.push( blue );
> 			
>-			var vanilla = new StyleSet();
> 			
>-			vanilla.name = 'Vanilla Skies';
>-			vanilla.navbar = 'sandybrown';
>-			vanilla.button = 'lemmonchiffon';
>-			vanilla.location = 'cornsilk';
>-			vanilla.selection = 'lemonchiffon';
>-			vanilla.sidepanel = 'white';
>-			vanilla.mainpanel = 'white';
>-			vanilla.toolpanel = 'white';
>-			vanilla.navtext = 'lemonchiffon';
>-			vanilla.content = 'chocolate';
>-			vanilla.search = 'moccasin';
>-			vanilla.breadcrumb = '#3087B3';
>-			vanilla.separator = 'sandybrown';
>-			vanilla.bannerProgress = "#F2F2F2";
> 			
>-			this.styles.push( vanilla );
>-			
>-			var beetlejuice = new StyleSet();
>-			
>-			beetlejuice.name = 'Beetlejuice';
>-			beetlejuice.navbar = 'indigo';
>-			beetlejuice.button = 'slateblue';
>-			beetlejuice.location = 'darkslateblue';
>-			beetlejuice.selection = 'silver';
>-			beetlejuice.sidepanel = 'lavender';
>-			beetlejuice.mainpanel = 'white';
>-			beetlejuice.toolpanel = 'white';
>-			beetlejuice.navtext = '#FBFBFB';
>-			beetlejuice.content = 'mediumslateblue';
>-			beetlejuice.search = '#444';
>-			beetlejuice.breadcrumb = '#3087B3';
>-			beetlejuice.separator = 'indigo';
>-			beetlejuice.bannerProgress = "#F2F2F2";
>-			
>-			this.styles.push( beetlejuice );
>-			
>-			var red = new StyleSet();
>-			
>-			red.name = 'Red';
>-			red.navbar = '#CD2127';
>-			red.button = '#777777';
>-			red.location = '#D85F56';
>-			red.selection = 'lightcoral';
>-			red.sidepanel = '#EFDAB2';
>-			red.mainpanel = '#FDFADD';
>-			red.toolpanel = '#FDFADD';
>-			red.navtext = '#FBFBFB';
>-			red.content = 'darkred';
>-			red.search = '#D85F56';
>-			red.breadcrumb = 'darkred';
>-			red.separator = '#CD2127';
>-			red.bannerProgress = "#F2F2F2";
>-			
>-			this.styles.push( red );		
>+//			var eire = new StyleSet();
>+//			
>+//			eire.name = 'Green Zone';
>+//			eire.navbar = 'seagreen';
>+//			eire.button = 'lavender';
>+//			eire.location = 'darkseagreen';
>+//			eire.selection = 'moccasin';
>+//			eire.sidepanel = 'aliceblue';
>+//			eire.mainpanel = 'white';
>+//			eire.toolpanel = 'white';
>+//			eire.navtext = '#FBFBFB';
>+//			eire.content = 'darkgreen';
>+//			eire.search = 'darkgreen';
>+//			eire.breadcrumb = '#3087B3';
>+//			eire.separator = 'seagreen';
>+//			eire.bannerProgress = "#F2F2F2";
>+//			
>+//			this.styles.push( eire );
>+//			
>+//			var avril = new StyleSet();
>+//			
>+//			avril.name = 'Pretty In Pink';
>+//			avril.navbar = 'plum';
>+//			avril.button = 'lavender';
>+//			avril.location = 'pink';
>+//			avril.selection = 'lavender';
>+//			avril.sidepanel = 'seashell';
>+//			avril.mainpanel = 'white';
>+//			avril.toolpanel = 'white';
>+//			avril.navtext = '#FBFBFB';
>+//			avril.content = 'mediumorchid';
>+//			avril.search = 'violet';
>+//			avril.breadcrumb = '#3087B3';
>+//			avril.separator = 'plum';
>+//			avril.bannerProgress = "#F2F2F2";
>+//			
>+//			this.styles.push( avril );
>+//			
>+//			var blue = new StyleSet();
>+//			
>+//			blue.name = 'Blue Monday';
>+//			blue.navbar = 'cornflowerblue';
>+//			blue.button = 'lavender';
>+//			blue.location = 'skyblue';
>+//			blue.selection = 'lavender';
>+//			blue.sidepanel = 'aliceblue';
>+//			blue.mainpanel = 'white';
>+//			blue.toolpanel = 'white';
>+//			blue.navtext = '#FBFBFB';
>+//			blue.content = 'royalblue';
>+//			blue.search = 'royalblue';
>+//			blue.breadcrumb = '#3087B3';
>+//			blue.separator = 'cornflowerblue';
>+//			blue.bannerProgress = "#F2F2F2";
>+//			
>+//			this.styles.push( blue );
>+//			
>+//			var vanilla = new StyleSet();
>+//			
>+//			vanilla.name = 'Vanilla Skies';
>+//			vanilla.navbar = 'sandybrown';
>+//			vanilla.button = 'lemmonchiffon';
>+//			vanilla.location = 'cornsilk';
>+//			vanilla.selection = 'lemonchiffon';
>+//			vanilla.sidepanel = 'white';
>+//			vanilla.mainpanel = 'white';
>+//			vanilla.toolpanel = 'white';
>+//			vanilla.navtext = 'lemonchiffon';
>+//			vanilla.content = 'chocolate';
>+//			vanilla.search = 'moccasin';
>+//			vanilla.breadcrumb = '#3087B3';
>+//			vanilla.separator = 'sandybrown';
>+//			vanilla.bannerProgress = "#F2F2F2";
>+//			
>+//			this.styles.push( vanilla );
>+//			
>+//			var beetlejuice = new StyleSet();
>+//			
>+//			beetlejuice.name = 'Beetlejuice';
>+//			beetlejuice.navbar = 'indigo';
>+//			beetlejuice.button = 'slateblue';
>+//			beetlejuice.location = 'darkslateblue';
>+//			beetlejuice.selection = 'silver';
>+//			beetlejuice.sidepanel = 'lavender';
>+//			beetlejuice.mainpanel = 'white';
>+//			beetlejuice.toolpanel = 'white';
>+//			beetlejuice.navtext = '#FBFBFB';
>+//			beetlejuice.content = 'mediumslateblue';
>+//			beetlejuice.search = '#444';
>+//			beetlejuice.breadcrumb = '#3087B3';
>+//			beetlejuice.separator = 'indigo';
>+//			beetlejuice.bannerProgress = "#F2F2F2";
>+//			
>+//			this.styles.push( beetlejuice );
>+//			
>+//			var red = new StyleSet();
>+//			
>+//			red.name = 'Red';
>+//			red.navbar = '#CD2127';
>+//			red.button = '#777777';
>+//			red.location = '#D85F56';
>+//			red.selection = 'lightcoral';
>+//			red.sidepanel = '#EFDAB2';
>+//			red.mainpanel = '#FDFADD';
>+//			red.toolpanel = '#FDFADD';
>+//			red.navtext = '#FBFBFB';
>+//			red.content = 'darkred';
>+//			red.search = '#D85F56';
>+//			red.breadcrumb = 'darkred';
>+//			red.separator = '#CD2127';
>+//			red.bannerProgress = "#F2F2F2";
>+//			
>+//			this.styles.push( red );		
> 		}
> 		
> 		function getStyles(){
>@@ -217,12 +599,27 @@ define([
> 		function getThemeStorageInfo(){
> 			return {
> 				storage:'/themes',
>-				styleset:'styles',
>-				defaultTheme:'Orion2014',
>-				selectedKey: 'selected',
>+				styleset:'containerStyles',
>+				//styleset: 'styles',
>+				defaultTheme:'lightPage',
>+				selectedKey: 'containerSelected',
>+				//selectedKey: 'containerSelected',
> 				version: THEMES_VERSION
> 			};
> 		}
>+		
>+		/*
>+		 * 		function getThemeStorageInfo(){
>+			return {
>+				storage:'/themes',
>+				styleset:'editorstyles',
>+				defaultTheme:'Prospecto',
>+				selectedKey: 'editorSelected',
>+				version: THEMES_VERSION
>+			}; 
>+		}
>+		 * 
>+		 */
> 
> 		ThemeData.prototype.getThemeStorageInfo = getThemeStorageInfo;
> 
>@@ -299,6 +696,8 @@ define([
> 		}
> 
> 		ThemeData.prototype.getViewData = getViewData;
>+
>+
> 		
> 		function processSettings( settings ){
> 			var sheetMaker = new ThemeSheetWriter.ThemeSheetWriter();
>@@ -311,7 +710,7 @@ define([
> 
> 		return{
> 			ThemeData:ThemeData,
>-			getStyles:getStyles
>+			getStyles:getStyles,
> 		};
> 	}
>-);
>\ No newline at end of file
>+);
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeSheetWriter.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeSheetWriter.js
>index 4d9cf53..f227948 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeSheetWriter.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/themes/container/ThemeSheetWriter.js
>@@ -7,381 +7,91 @@
>  * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). 
>  * 
>  * Contributors: Anton McConville - IBM Corporation - initial API and implementation
>+ * 				 Casey Flynn - Google Inc.
>  ******************************************************************************/
> /*eslint-env browser, amd*/
> 
>-define(['orion/widgets/themes/ThemeClass'], 
>+define(['orion/widgets/themes/ThemeClass',
>+],
> 	function(ThemeClass) {
>-		
>-		// These values are used to override various themeable element -> color mappings provided by theme data.
>-		var navbar = 'white';
>-		var button = '#777777';
>-		var location = '#EFEFEF';
>-		var selection = '#cedce7';
>-		var sidepanel = '#F7F7F7';
>-		var mainpanel = 'white';
>-		var navtext = '#bfbfbf';
>-		var content = '#3087B3';
>-		var search = '#444';
>-		var toolpanel = 'white';
>-		
>-		function ThemeSheetWriter(){}
>-		
>-		ThemeSheetWriter.prototype.navbar = navbar;
>-		ThemeSheetWriter.prototype.button = button;
>-		ThemeSheetWriter.prototype.location = location;
>-		ThemeSheetWriter.prototype.selection = selection;
>-		ThemeSheetWriter.prototype.sidepanel = sidepanel;
>-		ThemeSheetWriter.prototype.mainpanel = mainpanel;
>-		ThemeSheetWriter.prototype.navtext = navtext;
>-		ThemeSheetWriter.prototype.content = content;
>-		ThemeSheetWriter.prototype.search = search;
>-		ThemeSheetWriter.prototype.toolpanel = toolpanel;
>-		
>-		function writeNavigationStyle(){
>-		
>-			var styleBlock = '';
>-		
>-			var styles = [];
>-		
>-			var orionPage = new ThemeClass.ThemeClass( 'orionPage' );
>-			orionPage.style.backgroundColor = '#fdfdfd';
>-			orionPage.style.width = '100%';
>-			orionPage.style.height = '100%';
>-			
>-			styles.push( orionPage );
>-			
>-			var topRowBanner = new ThemeClass.ThemeClass( 'topRowBanner' );
>-			topRowBanner.style.margin = '0';
>-			topRowBanner.style.border = '0';
>-			topRowBanner.style.backgroundColor = this.navbar;
>-//			topRowBanner.style.background = 'linear-gradient(to bottom, #959595 0%,#0d0d0d 46%,#010101 50%,#0a0a0a 53%,#1b1b1b 100%)';
>-			/* topRowBanner.style.borderBottom = '1px solid #dddddd'; */
>-			topRowBanner.style.borderBottom = "none";
>-			topRowBanner.style.boxShadow = "0 2px 2px 0 rgba(0, 0, 0, 0.1),0 1px 0 0 rgba(0, 0, 0, 0.1)";
>-			topRowBanner.style.zIndex = "100";
>-			
>-			styles.push( topRowBanner );
>-			
>-			var a = new ThemeClass.ThemeClass( 'a' );
>-			a.style.textDecoration = 'none';
>-			a.style.color = this.content;
>-			
>-			styles.push( a );
> 
>-			var navlink = new ThemeClass.ThemeClass( 'navlink' );
>-			navlink.style.display = 'inline-block';
>-			navlink.style.padding = '2px';
>-			navlink.style.color = this.content;
>-			navlink.style.verticalAlign = 'bottom';
>-			
>-			styles.push( navlink );
> 
> 
>-		/*	var aVisited = new ThemeClass.ThemeClass( 'a:visited' );
>-			aVisited.style.color = this.content;
>-			
>-			styles.push( aVisited );
>-				
>-			var aActive = new ThemeClass.ThemeClass( 'a:active' );
>-			aActive.style.color = this.content;
>-			
>-			styles.push( aActive );
>-			
>-			var aHover = new ThemeClass.ThemeClass( 'a:hover' );
>-			aHover.style.textDecoration = 'underline';
>-			aHover.style.color = this.content;
>-			
>-			styles.push( aHover ); */
>-			
>-			var primaryNav = new ThemeClass.ThemeClass( 'primaryNav' );
>-			primaryNav.style.color = this.navtext;
>-			primaryNav.style.fontSize = '8pt';
>-			primaryNav.style.fontWeight = 'normal';
>-			primaryNav.style.paddingTop = '0';
>-			primaryNav.style.verticalAlign = 'baseline';
>-			
>-			styles.push( primaryNav );
>-			
>-			var primaryNavA = new ThemeClass.ThemeClass( 'primaryNav a' );
>-			primaryNavA.style.fontSize = '8pt'; 
>-			primaryNavA.style.color = this.navtext;
>-			primaryNavA.style.marginRight = '6px';
>-			primaryNavA.style.marginLeft = '6px'; 
>-			primaryNavA.style.verticalAlign = 'baseline';
>-			primaryNavA.style.textDecoration = 'none';
>-			
>-			styles.push( primaryNavA );
>-			
>-			var primaryNavAhover = new ThemeClass.ThemeClass( 'primaryNav a:hover' );
>-			primaryNavAhover.style.color = '#bfbfbf';
>-			primaryNavAhover.style.cursor = 'hand';
>-			primaryNavAhover.style.color = 'white';
>-			primaryNavAhover.style.fontWeight = 'normal';
>+		function PrototypeStyleWriter(settings) {
>+			var parseStyles = function(object, ancestors, className, result) {
>+				if (!ancestors) {
>+					parseStyles(object, "." + className, className, result);
>+					return;
>+				}
>+				var localResult = [];
>+				var keys = Object.keys(object);
>+				keys.forEach(function(key) {
>+					var value = object[key];
>+					if (typeof(value) === "string") { //$NON-NLS-0$
>+						localResult.push("\t" + key + ": " + value + ";"); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
>+					} else {
>+						parseStyles(
>+							value,
>+							className === key ? ancestors : ancestors + " " +  key, //$NON-NLS-1$ //$NON-NLS-0$
>+							className,
>+							result);
>+					}
>+				});
>+				if (localResult.length) {
>+					result.push(ancestors +  " {"); //$NON-NLS-0$
>+					result.push.apply(result, localResult);
>+					result.push("}"); //$NON-NLS-0$
>+				}
>+			};
> 
>-			styles.push( primaryNavAhover );
>-			
>-			for( var s in styles ){
>-				styleBlock = styleBlock + styles[s].toString();
>-			}
>-						     
>-			return styleBlock;
>+			var result = [""];
>+			parseStyles(settings.styles, "", "orionPage", result); //$NON-NLS-0$
>+			return result.join("\n"); //$NON-NLS-0$
> 		}
>-		
>-		ThemeSheetWriter.prototype.writeNavigationStyle = writeNavigationStyle;
>-		
>-		function writeLocationStyle(){
>-		
>-			var styleBlock = '';
>-		
>-			var styles = [];
>-			
>-			var titleArea = new ThemeClass.ThemeClass( 'titleArea' );
>-			titleArea.style.margin = '0';
>-			titleArea.style.paddingTop = '5px';
>-		    titleArea.style.border = '0';
>-		    titleArea.style.background = this.location;
>-			titleArea.style.background = '-webkit-gradient(linear, left top, left bottom, color-stop(0%,' + this.location + '), color-stop(100%,' + this.location + '))';
>-		    titleArea.style.borderBottom = '1px solid ' + this.location ;
>-		    titleArea.style.minHeight = '20px';
>-		    
>-		    styles.push( titleArea );
> 
>-			var breadcrumb = new ThemeClass.ThemeClass( 'breadcrumb' );
>-			breadcrumb.style.fontSize = '8pt';
>-			breadcrumb.style.textDecoration = 'none';
>-			breadcrumb.style.color = '#f1f1f2;';
>-			breadcrumb.style.paddingTop = '2px';
>-			
>-			styles.push( breadcrumb );
>-			
>-			var aBreadcrumbHover = new ThemeClass.ThemeClass( 'a.breadcrumb:hover' );
>-			aBreadcrumbHover.style.textDecoration = 'none';
>-			aBreadcrumbHover.style.borderBottom = '1px dotted';
>-			aBreadcrumbHover.style.color = '#F58B0F';
>-			aBreadcrumbHover.style.cursor = 'pointer';
>-			
>-			styles.push( aBreadcrumbHover );
>-
>-			var breadcrumbSeparator = new ThemeClass.ThemeClass( 'breadcrumbSeparator' );
>-			breadcrumbSeparator.style.fontSize = '8pt';
>-			breadcrumbSeparator.style.textDecoration = 'none';
>-			breadcrumbSeparator.style.color = this.separator;
>-			breadcrumbSeparator.style.fontWeight = 'bold';
>-			
>-			styles.push( breadcrumbSeparator );
>-			
>-			var currentLocation = new ThemeClass.ThemeClass( 'currentLocation' );
>-			currentLocation.style.fontWeight = 'bold';
>-			currentLocation.style.fontSize = '8pt';
>-			currentLocation.style.color = this.breadcrumb; //this.navbar; // should be a separate themeable item but hard coded for now.
>-			currentLocation.style.textDecoration = 'none';
>-			currentLocation.style.textWrap = 'normal';
>-			currentLocation.style.lineHeight = '10pt';
>-			
>-			styles.push( currentLocation );
>-			
>-			var currentLocationHover = new ThemeClass.ThemeClass( 'a.currentLocation:hover' );
>-			currentLocationHover.style.fontWeight = 'bold';
>-			currentLocationHover.style.fontSize = '10pt';
>-			currentLocationHover.style.color = '#666666';
>-			currentLocationHover.style.textDecoration = 'none';
>-			currentLocationHover.style.borderBottom = '0';
>-			
>-			styles.push( currentLocationHover );
>-			
>-			var navlinkonpage = new ThemeClass.ThemeClass( 'navlinkonpage' );
>-			navlinkonpage.style.color = this.content;
>-			navlinkonpage.style.verticalAlign = 'middle';
>-			
>-			styles.push( navlinkonpage );
>-			
>-			if (this.bannerProgress) {
>-				var progressIndicator = new ThemeClass.ThemeClass( 'topRowBanner .progressPane_running' );
>-				progressIndicator.style.borderColor = this.bannerProgress;
>-				styles.push( progressIndicator );
>-			}	
>-			
>-			for( var s in styles ){
>-				styleBlock = styleBlock + styles[s].toString();
>+		var scopeList = [
>+			{
>+				objPath: ["styles mainToolbar background-color","styles sectoinTable background-color", "styles sideMenu background-color", "styles workingTarget background-color"],
>+				id: "primaryBackgroundColor", //$NON-NLS-0$
>+				value: ""
>+			}, {
>+				objPath: ["styles dropdownButtonWithIcon color", ""],
>+				id: "primaryTextColor", //$NON-NLS-0$
>+				value: ""
>+			}, {
>+				objPath: [], //$NON-NLS-0$
>+				id: "secondaryBackgroundColor", //$NON-NLS-0$
>+				value: ""
>+			}, {
>+				objPath: [], //$NON-NLS-0$
>+				id: "secondaryTextColor", //$NON-NLS-0$
>+				value: ""
>+			}, {
>+				objPath: [], //$NON-NLS-0$
>+				id: "tertiaryBackgroundColor", //$NON-NLS-0$
>+				value: ""
>+			}, {
>+				objPath: [], //$NON-NLS-0$
>+				id: "tertiaryTextColor", //$NON-NLS-0$
>+				value: ""
>+			}, {
>+				objPath: [], //$NON-NLS-0$
>+				id: "flavorColor", //$NON-NLS-0$
>+				value: ""
> 			}
>-			
>-			return styleBlock;
>-		}
>-		
>-		ThemeSheetWriter.prototype.writeLocationStyle = writeLocationStyle;
>-		
>-		function writeSidePanelStyle(){
>-		
>-		}
>-		
>-		function writeButtonStyle(){
>+		]
> 		
>-			var styleBlock = '';
>-			var styles = [];
>-		
>-			var commandButton = new ThemeClass.ThemeClass( 'commandButton' );
>-			commandButton.style.color = '#666';
>-			commandButton.style.border = '1px solid #dedede'; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=386702#c2 
>-			commandButton.style.backgroundColor = '#ddd';//this.button;
>-			commandButton.style.textAlign = 'center';
>-			commandButton.style.verticalAlign = 'middle';
>-			commandButton.style.cursor = 'pointer';
>-		    commandButton.style.display = 'inline-block';
>-		    commandButton.style.padding = '4px 6px';
>-		    commandButton.style.borderRadius = '3px';
>-		    commandButton.style.lineHeight = '12px';
>-			commandButton.style.fontSize = '9pt';
>-			commandButton.style.userSelect = 'none';
>-			//	-webkit-touch-callout: none;
>-			//	-webkit-user-select: none;
>-			//	-khtml-user-select: none;
>-			//	-moz-user-select: none;
>-			//	-ms-user-select: none;
>-			styles.push( commandButton );
>-			
>-			var commandButtonOver = new ThemeClass.ThemeClass( 'commandButton:over' );
>-			commandButtonOver.style.backgroundColor = '#e6e6e6';
>-			commandButtonOver.style.border = '1px solid #808080';
>-			styles.push( commandButtonOver );
>-
>-			var commandMenu = new ThemeClass.ThemeClass( 'commandMenu' );
>-			commandMenu.style.color = '#222';
>-			commandMenu.style.display = 'inline-block';
>-			commandMenu.style.verticalAlign = 'baseline';
>-			commandMenu.style.margin = '0';
>-			commandMenu.style.fontSize = '8pt';
>-			commandMenu.style.fontWeight = 'normal';
>-			commandMenu.style.border = '1px solid #dedede'; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=386702#c2
>-			commandMenu.style.backgroundColor = '#efefef';
>-		    commandMenu.style.cursor = 'pointer';
>-		    commandMenu.style.borderRadius = '1px';
>-			styles.push( commandMenu );
>-	
>-			var commandMenuItem = new ThemeClass.ThemeClass( 'commandMenuItem' );
>-			commandMenuItem.style.border = '0';
>-			commandMenuItem.style.padding = '0';
>-			commandMenuItem.style.margin = '0';
>-			styles.push( commandMenuItem );
>-			
>-			for( var s in styles ){
>-				styleBlock = styleBlock + styles[s].toString();
>-			}
>+		function ApplyTheme() {
> 			
>-			return styleBlock;
> 		}
> 		
>-		ThemeSheetWriter.prototype.writeButtonStyle = writeButtonStyle;
>-		
>-		function writeMainStyle(){
>-		
>-			var styleBlock = '';
>-		
>-			var styles = [];
>-			
>-			var searchbox = new ThemeClass.ThemeClass( 'searchbox' );
>-			searchbox.style.backgroundImage = 'url(../images/core_sprites.png)';
>-		    searchbox.style.backgroundRepeat = 'no-repeat'; 
>-		    searchbox.style.backgroundPosition = '4px -297px'; 
>-			searchbox.style.width = '12px'; 
>-			searchbox.style.height = '12px';
>-		    searchbox.style.backgroundColor = this.search;
>-			searchbox.style.border = '1px solid ' + this.search;
>-			searchbox.style.fontSize = '11px';
>-			searchbox.style.width = '15em';
>-			searchbox.style.height = '16px';
>-			searchbox.style.borderRadius = '10px'; /* 10px */
>-			searchbox.style.color = '#999';
>-			searchbox.style.padding = '0';
>-			searchbox.style.paddingLeft = '20px';
>-			searchbox.style.marginLeft = '5px';
>-			searchbox.style.marginTop = '6px !important';
>-			searchbox.style.font = '7pt Lucida Sans Unicode,Lucida Grande,Verdana,Arial,Helvetica,Myriad,Tahoma,clean,sans-serif !important';
>-			
>-			styles.push( searchbox );
>-			
>-			var searchboxFocus = new ThemeClass.ThemeClass( 'searchbox:focus' );
>-			searchboxFocus.style.color = 'white';
>-			searchboxFocus.style.outline = 'none';
>-			
>-			styles.push( searchboxFocus );
>-			
>-			var checkedRow = new ThemeClass.ThemeClass( 'checkedRow' );
>-			checkedRow.style.cssText = 'background-color:' + this.selection + ' !important;';
>-			
>-			styles.push( checkedRow );
>-			
>-			var navItemSelected = new ThemeClass.ThemeClass( 'navbar-item-selected' );
>-			navItemSelected.style.background = this.selection;
>-			navItemSelected.style.color = this.content;
>-			
>-			styles.push( navItemSelected );
>-			
>-			var auxpane = new ThemeClass.ThemeClass( 'auxpane' );
>-			auxpane.style.border = '0';
>-			auxpane.style.background = this.sidepanel;
>-			styles.push( auxpane );
>-			
>-			var mainpane = new ThemeClass.ThemeClass( 'mainpane' );
>-			mainpane.style.background = this.mainpanel;
>-			mainpane.style.border = 0;
>-			
>-			styles.push( mainpane );
>-			
>-			var mainToolbar = new ThemeClass.ThemeClass( 'mainToolbar' );
>-			mainToolbar.style.background = this.toolpanel;
>-			styles.push( mainToolbar );
>-	
>-			for( var s in styles ){
>-				styleBlock = styleBlock + styles[s].toString();
>-			}
>-			
>-			return styleBlock;
>-		}
>-		
>-		ThemeSheetWriter.prototype.writeMainStyle = writeMainStyle;
>-		
>-		function render( anchor ){
>-			console.log( this.writeNavigationStyle() );
>-			console.log( this.writeLocationStyle() );
>-			console.log( this.writeMainStyle() );
>-			console.log( this.writeButtonStyle() );
>-		}
>-		
>-		ThemeSheetWriter.prototype.render = render;
>+		function ThemeSheetWriter(){}
>+
> 		
> 		function getSheet( settings ){
> 			//TODO - temporarily disabled
>-			return "";
>-//			if( settings.navbar.value ){	
>-//				this.navbar = settings.navbar.value;
>-//				this.button = settings.button.value;
>-//				this.location = settings.location.value;
>-//				this.selection = settings.selection.value;
>-//				this.sidepanel = settings.sidepanel.value;
>-//				this.mainpanel = settings.mainpanel.value;
>-//				this.navtext = settings.navtext.value;
>-//				this.search = settings.search.value;
>-//				this.content = settings.content.value;
>-//				this.toolpanel = settings.toolpanel.value;
>-//				this.bannerProgress = settings.bannerProgress.value;
>-//			}else{
>-//				this.navbar = settings.navbar;
>-//				this.button = settings.button;
>-//				this.location = settings.location;
>-//				this.selection = settings.selection;
>-//				this.sidepanel = settings.sidepanel;
>-//				this.mainpanel = settings.mainpanel;
>-//				this.navtext = settings.navtext;
>-//				this.search = settings.search;
>-//				this.content = settings.content;
>-//				this.toolpanel = settings.toolpanel;
>-//				this.bannerProgress = settings.bannerProgress;
>-//			}
>-//			
>-//			var sheet = this.writeNavigationStyle() + this.writeLocationStyle() + this.writeMainStyle() + this.writeButtonStyle();
>-//			
>-//			return sheet;
>+			var sheet = PrototypeStyleWriter(settings);
>+			return sheet;
> 		}
> 		
> 		ThemeSheetWriter.prototype.getSheet = getSheet;
>@@ -391,4 +101,4 @@ define(['orion/widgets/themes/ThemeClass'],
> 		};
> 
> 	}
>-);
>+);

Actions: View | Diff

Attachments on bug 507788: 265724 | 265758