Theme: Add new theme called "Base"

Keep "Smoothness" and "UI Lightness" in the gallery, while the new
theme will be available as "Base" and it will be the default.

Ref jquery/jquery-ui#1384

Author: rxaviers

app/src/images/themeGallery/theme_30_base.png

@@ -6,6 +6,11 @@
 			"label": "Stable",
 			"stable": true
 		},
+		{
+			"version": "1a10f10cb0a39281e91eec5a53b5bb874497c629",
+			"dependsOn": "jQuery1.6+",
+			"label": "Experimental"
+		},
 		{
 			"version": "1.10.4",
 			"dependsOn": "jQuery1.6+",

app/src/images/themeGallery/theme_90_base.png

@@ -4,6 +4,63 @@ var themeGallery,
 	ThemeRoller = require( "./themeroller" );
 
 var themeGallery = [{
+	thumb: "theme_base.png",
+	cachedZThemeParams: "5d00000100ca05000000000000003d8888d844329a8dfe02723de3e5700bbb34ecf36cdef1e1654faa0015427bdb9eb45ebe89aaede0ec5f0d924190a01a32ee3c72f020c6358f8799fcf93f2d3731276f37ef0c48ada71e8147eba114a9884902236f35aa8ee90c548f44abf6a3e4556cbf4978c663a1599e4aae1cfca5180a9fe97f3e56d594e6bf581101717708b9eacf24336440252126968f2e5859ee510ed034d6e6b9b027d45ac3621c2b6b9fe40db6a9586d2a05c831986806848d89144c2cdd1f972ad3e01d85b46d582b2960f034c6f75cd8998e965f6618271d860b33f0ed0b8f2f75757ecb9baf8317f10a4b3ea06a3345681cf3aa04dcb993b68401167f10dfdaba1f185fbae800375454a223a128d818ed3c1889d3882582dc772b07c0a8edab6b94c55ddc1de59a1959d3a2e45a9631d05ef8cf9c4d01ee508155357364566760337fc295b14b848e0ee143ad3c467b1d4adf818bdf4fb36c06dfb532b0fc95bad538b4ada07d10ef880876df4933ec2c733dc5cba61fffa2af8710e735fed6162db620da8f5f38e0d75ac74428f9524aaed9b55575a3f3371a8fcbc05dfcf20a2682ddd226639509ad61f9c8a10bb5b0cfc044dbb84892d258c882e6d2d6db079c415438a5b038eb43d6fe342384",
+	vars: {
+		name: "Base",
+		"ffDefault": "Arial,Helvetica,sans-serif",
+		"fsDefault": "1em",
+		"fwDefault": "normal",
+		"cornerRadius": "3px",
+		"bgColorHeader": "e9e9e9",
+		"bgTextureHeader": "none",
+		"borderColorHeader": "dddddd",
+		"fcHeader": "333333",
+		"iconColorHeader": "444444",
+		"bgColorContent": "ffffff",
+		"bgTextureContent": "none",
+		"borderColorContent": "dddddd",
+		"fcContent": "333333",
+		"iconColorContent": "444444",
+		"bgColorDefault": "f6f6f6",
+		"bgTextureDefault": "none",
+		"borderColorDefault": "c5c5c5",
+		"fcDefault": "454545",
+		"iconColorDefault": "777777",
+		"bgColorHover": "ededed",
+		"bgTextureHover": "none",
+		"borderColorHover": "cccccc",
+		"fcHover": "2b2b2b",
+		"iconColorHover": "555555",
+		"bgColorActive": "007fff",
+		"bgTextureActive": "none",
+		"borderColorActive": "003eff",
+		"fcActive": "ffffff",
+		"iconColorActive": "ffffff",
+		"bgColorHighlight": "fffa90",
+		"bgTextureHighlight": "none",
+		"borderColorHighlight": "dad55e",
+		"fcHighlight": "777620",
+		"iconColorHighlight": "777620",
+		"bgColorError": "fddfdf",
+		"bgTextureError": "none",
+		"borderColorError": "f1a899",
+		"fcError": "5f3f3f",
+		"iconColorError": "cc0000",
+		"bgColorOverlay": "aaaaaa",
+		"bgTextureOverlay": "flat",
+		"bgImgOpacityOverlay": "0",
+		"opacityOverlay": "30",
+		"bgColorShadow": "aaaaaa",
+		"bgTextureShadow": "flat",
+		"bgImgOpacityShadow": "0",
+		"opacityShadow": "30",
+		"thicknessShadow": "8px",
+		"offsetTopShadow": "-8px",
+		"offsetLeftShadow": "-8px",
+		"cornerRadiusShadow": "8px"
+	}
+}, {
 	thumb: "theme_90_ui_light.png",
 	cachedZThemeParams: "5d000001001406000000000000003d8888d844329a8dfe02723de3e5701dc2cb2be0d98fe676bb46e85f3b85ff2d347a9c5170a6c17a4a3d926b08b9d199c4e573fcbf9cc1a2dd092a9d80b6fda5395ff84763f9e74d6cee21250c8f33243ef1589abab919cf7e8298f8769fec181781bf142e5e800e171d39cdf17e9a71fa3f781e8d76766b23c44b6d7f1e75c1abeef4410d820c31ef0620d79195b33d4cfc1e768094ce05fee304b2ad41db26904aed74c8c374ce1ff1c0a5c42f56dac08ad8961127638038b61b2703209b4091d7fb93a47a1d3e43a67c5a94b7e29c959f13c24559cb1a76b1bec1a71f1949db710f4557f3d1da2d39f90aff28f2b6ba8dd96ed5f5a0015166ef5567f70537d248d57b05c70e4fcc5845d9e1610b45d0d394c32ba0d5f992c00dca92aefe65863782767fcedea56a04e59e78457e74c5f1b23fdcd98c0b6bf4dbbe623d93fcb961477a3b6ff6f49245a0d75647ac7dcf1c860ed9882370de9a120924b3eaa4d72b858c41bd8bfbc944508a9fda3a42ff055dfa6e2ef96330dff48fe7a403db64306e0229493b498532edda2985338cbfd2dca06a59153f6300753623a533e25248b8dca8c2261083a9ebf73103a260168b2f957d138e17a4c80b5a901f1b748cff996db44f467265f09d1234456b9819fee221715dc98870f7e120db924d76acd66a3c270b2ee627140195c5c9e869d89c5acdf9330a84af5ae2c6c31792faa3aa55240bbecb844cb72dc1718194fff63506a7",
 	vars: {

config.json

@@ -19,7 +19,11 @@ themeStaticCss = {};
 
 // Hard coded css Y image positioning - context accepts button or panel
 function cssYPos( texture, context ){
-	var YPos = "50%";
+	var YPos;
+	if ( texture === "none" ) {
+		return "";
+	}
+	YPos = "50%";
 	if( context === "panel" ){
 		if( texture === "highlight_soft" || texture === "highlight_hard" || texture === "gloss_wave" ){
 			YPos = "top";
@@ -39,9 +43,12 @@ function cssYPos( texture, context ){
 
 // Hard coded css X image positioning - context accepts button or panel
 function cssXPos( texture, context ){
-	var XPos = "50%";
-	// No conditions yet, may need some for vertical slider patterns
-	return XPos;
+	if ( texture === "none" ) {
+		return "";
+	}
+	// No conditions yet, may need some for vertical slider patterns.
+	// XPos = "50%";
+	return "50%";
 }
 
 // Add '#' in the beginning of the colors if needed
@@ -224,7 +231,11 @@ function ThemeRoller( options ) {
 
 ThemeRoller.prototype = {
 	_cssRepeat: function( textureType ) {
-		var texture = textures[ textureType ];
+		var texture;
+		if ( textureType === "none" ) {
+			return "";
+		}
+		texture = textures[ textureType ];
 		if ( typeof texture === "undefined" ) {
 			throw new Error( "Texture \"" + textureType + "\" not defined" );
 		}
@@ -248,8 +259,11 @@ ThemeRoller.prototype = {
 	},
 
 	_textureUrl: function( color, textureType, opacity ) {
-		var image,
-			texture = textures[ textureType ];
+		var image, texture;
+		if ( textureType === "none" ) {
+			return "";
+		}
+		texture = textures[ textureType ];
 		if ( typeof texture === "undefined" ) {
 			throw new Error( "No dimensions set for texture \"" + textureType + "\"" );
 		}
@@ -276,9 +290,9 @@ ThemeRoller.prototype = {
 		}
 		if ( !this._css ) {
 			var vars = this.vars;
-			this._css = themeStaticCss[ this.jqueryUi.pkg.version ].replace( /[\s]+[\S]+\/\*\{([^\}\*\/]+)\}\*\//g, function( match, p1 ) {
+			this._css = themeStaticCss[ this.jqueryUi.pkg.version ].replace( /([\s]+[\S]+| )\/\*\{([^\}\*\/]+)\}\*\//g, function( match, g1, p1 ) {
 				return " " + vars[ p1 ];
-			});
+			}).replace( /[\s]+;/g, ";" );
 			if ( this.scope ) {
 				this._css = util.scope( this._css, this.scope );
 			}

lib/themeroller-themegallery.js

@@ -67,7 +67,7 @@ Frontend.prototype = {
 					themeGallery: themeGallery
 				})
 			}),
-			baseVars: themeGallery[ 2 ].serializedVars,
+			baseVars: themeGallery[ 0 ].serializedVars,
 			compGroupA: compGroupATemplate({
 				production: production
 			}),
@@ -82,6 +82,7 @@ Frontend.prototype = {
 
 	css: function( vars ) {
 		var theme = new ThemeRoller({
+			version: "1.12.0-pre",
 			vars: _.extend({
 				dynamicImage: true,
 				dynamicImageHost: this.host