test/dummy/tmp/cache/assets/D0E/7D0/sprockets%2F89200785fe2710582a6c1b8d04ae7fbe in cytoplasm-0.2.6 vs test/dummy/tmp/cache/assets/D0E/7D0/sprockets%2F89200785fe2710582a6c1b8d04ae7fbe in cytoplasm-0.2.7
- old
+ new
@@ -1,8 +1,8 @@
-o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1359408960.220065: @value"Ö0{I"
+o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1359749313.213664: @value"4{I"
class:EFI"BundledAsset; FI"logical_path; FI"cytoplasm/cytoplasm.js; FI"
pathname; FI"f/Applications/XAMPP/xamppfiles/htdocs/cytoplasm/app/assets/javascripts/cytoplasm/cytoplasm.js.erb; FI"content_type; FI"application/javascript; FI"
-mtime; FI" 2013-01-28T16:35:36-05:00; FI" length; Fié.I" digest; F"%682e772978e3568abdcf579ea31a42aaI" source; FI"é.// CytoPlasm jQuery Setup v0.1
+mtime; FI" 2013-02-01T15:08:32-05:00; FI" length; Fi#2I" digest; F"%5f844420cc62d9efe3358bfffb156b1bI" source; FI"#2// CytoPlasm jQuery Setup v0.1
// By MacKinley Smith
// Initialize global JS variables
var Cytoplasm;
@@ -161,11 +161,11 @@
if ($('#cytoplasm_dynamic_styles').is("*")) $('#cytoplasm_dynamic_styles').remove();
// Set variables
var boldweight = (vars.fonts.faces.bold==vars.fonts.faces.regular)?"bold":"normal";
var lightweight = (vars.fonts.faces.light==vars.fonts.faces.regular)?"lighter":"normal";
- var styletag = "body{margin:0;height:100%;overflow-y:scroll}h1,h2,h3,h4,h5,h6{margin:20px 0}header{overflow:hidden;h1{margin:0;white-space:nowrap;cursor:pointer;display:inline;text-shadow:0 0 10px rgba(0,0,0,0.5)}#logo{z-index:1000}}nav{ul{padding:0;list-style:none;li{display:inline-block}}}#main_content{min-height:400px;background:white;overflow:hidden;box-shadow:0 0 10px rgba(0,0,0,0.8);clear:both;&>:first-child{margin-top:0;padding-top:0}&>:last-child{margin-bottom:0;padding-bottom:0}}footer{overflow:hidden}table.cytoTable{width:100%;margin-bottom:15px;box-shadow:0 0 10px rgba(0,0,0,0.5);td{padding:10px;&.labelcell{width:100px}&>h1,&>h2,&>h3,&>h4,&>h5,&>h6{margin:0;padding:0}}}.cytoField{width:100%;border:1px solid #aaa;border-radius:5px;font-size:14px;box-shadow:inset 0 0 5px rgba(0,0,0,0.25);&[type=text],&[type=password],&[type=email]{height:28px;padding:0 7px}}textarea.cytoField{resize:none;height:200px;padding:7px}button,input[type=submit]{&.cytoButton{border-radius:5px;cursor:pointer;&.large{width:100%;height:50px}}}";
+ var styletag = "body{margin:0;height:100%;overflow-y:scroll}h1,h2,h3,h4,h5,h6{margin:20px 0}header{overflow:hidden;h1{margin:0;white-space:nowrap;cursor:pointer;display:inline;text-shadow:0 0 10px rgba(0,0,0,0.5)}#logo{z-index:1000}}nav{ul{padding:0;list-style:none;li{display:inline-block}}}section{min-height:400px;background:white;overflow:hidden;box-shadow:0 0 10px rgba(0,0,0,0.8);clear:both;&>:first-child{margin-top:0;padding-top:0}&>:last-child{margin-bottom:0;padding-bottom:0}}footer{overflow:hidden}table.cytoTable{width:100%;margin-bottom:15px;box-shadow:0 0 10px rgba(0,0,0,0.5);td{padding:10px;&.labelcell{width:100px}&>h1,&>h2,&>h3,&>h4,&>h5,&>h6{margin:0;padding:0}}}.cytoField{width:100%;border:1px solid #aaa;border-radius:5px;font-size:14px;box-shadow:inset 0 0 5px rgba(0,0,0,0.25);&[type=text],&[type=password],&[type=email]{height:28px;padding:0 7px}}textarea.cytoField{resize:none;height:200px;padding:7px}button,input[type=submit]{&.cytoButton{border-radius:5px;cursor:pointer;&.large{width:100%;height:50px}}}";
var styles = $.extend(true,{},{
body:{
background:vars.colors.global.background,
font:vars.fonts.sizes.normal+" "+vars.fonts.faces.regular,
color:vars.colors.global.text,
@@ -192,37 +192,58 @@
"font-weight":lightweight
},
header:{
margin:vars.layout.header.margin,
padding:vars.layout.header.padding,
+ height:vars.layout.header.height,
+ background:vars.colors.header.background,
+ color:vars.colors.header.text,
'#logo':{
position:vars.layout.header.logo.position,
top:vars.layout.header.logo.y+10
},
h1:{
- color:"contrast("+vars.colors.global.background+",black,white)",
+ color:"contrast("+vars.colors.header.text+",black,white)",
"&:hover":{
color:vars.colors.global.accent
}
}
},
- '#main_content':{
- margin:vars.layout.content.margin,
- padding:vars.layout.content.padding
+ section:{
+ background:vars.colors.section.background,
+ color:vars.colors.section.text,
+ margin:vars.layout.section.margin,
+ padding:vars.layout.section.padding
},
- 'footer':{
+ footer:{
+ background:vars.colors.footer.background,
+ color:vars.colors.footer.text,
margin:vars.layout.footer.margin,
padding:vars.layout.footer.padding
},
+ a:{
+ '&:link':{
+ color:vars.colors.links.unvisited.text
+ },
+ '&:visited':{
+ color:vars.colors.links.visited.text
+ },
+ '&:hover':{
+ color:vars.colors.links.hover.text
+ },
+ '&:active':{
+ color:vars.colors.links.active.text
+ }
+ },
'table.cytoTable':{
background:vars.colors.plugins.cytoTable.background,
table:{
'margin-bottom':'0px'
},
td:{
border:vars.colors.plugins.cytoTable.border,
- "&.labelcell":{"font-size":vars.fonts.sizes.small}
+ "&[data-type=label]":{"font-size":vars.fonts.sizes.small}
}
},
'.cytoField':{"font-family":vars.fonts.faces.regular},
'.cytoButton':{
border:vars.colors.plugins.cytoButton.border,
@@ -230,21 +251,27 @@
"&:not(.active),&:not(:active)":{background:vars.colors.plugins.cytoButton.background},
"&.active,&:active":{
background:reverseGradient(vars.colors.plugins.cytoButton.background),
"box-shadow":vars.layout.plugins.cytoButton.shadow
}
+ },
+ '.cytoColorPicker-wrapper':{
+ '.ui-slider[data-attr=hue]':{
+ background:"linear-gradient(to right,#ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%)",
+ "box-shadow":"inset 0px 0px 5px hsla(0,0%,0%,0.5)"
+ }
}
},userstyles);
// Heading sizes
(function(){
var verbose = false;
var huge = parseInt(vars.fonts.sizes.huge), normal = parseInt(vars.fonts.sizes.normal);
var hRange = huge - normal;
$.each([1,2,3,4,5,6],function(i,num){
if (verbose) console.log("----- H"+num+" -----");
- var factor = Math.pow(vars.fonts.sizes.heading_factor,i);
+ var factor = Math.pow(vars.fonts.heading_factor,i);
if (verbose) console.log("Factor: "+factor);
var size = parseInt(vars.fonts.sizes.normal) + (hRange/factor);
if (verbose) console.log("Size: "+size);
$('h'+num.toString()).css("font-size",size);
});
@@ -298,12 +325,12 @@
};
$.Cytoplasm = function(method){
if (methods[method]) return methods[method].apply(this,Array.prototype.slice.call(arguments,1));
else if (typeof method == 'object' || !method) return methods.init.apply(this,arguments);
- else $.error('Method ' + method + ' does not exist on jQuery.Cytoplasm!');
+ else $.error('Method ' + method + ' does not exist on $.Cytoplasm!');
};
$.Cytoplasm();
})(jQuery);
-; FI"required_assets_digest; F"%2027ad30fc7ca15ed99c1e162e0fa7e5I"
_version; F"%6776f581a4329e299531e1d52aa59832
+; FI"required_assets_digest; F"%fb3f48ef70361525c447cff03dcb64bdI"
_version; F"%6776f581a4329e299531e1d52aa59832
\ No newline at end of file