test/dummy/tmp/cache/assets/D0E/7D0/sprockets%2F89200785fe2710582a6c1b8d04ae7fbe in cytoplasm-0.2.3 vs test/dummy/tmp/cache/assets/D0E/7D0/sprockets%2F89200785fe2710582a6c1b8d04ae7fbe in cytoplasm-0.2.4
- old
+ new
@@ -1,8 +1,8 @@
-o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1359072749.163905: @value"Ü3{I"
+o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1359408960.220065: @value"Ö0{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-24T19:12:29-05:00; FI" length; Fiï1I" digest; F"%5afc6ebe61db988f26a32e3cccb3d1cfI" source; FI"ï1// CytoPlasm jQuery Setup v0.1
+mtime; FI" 2013-01-28T16:35:36-05:00; FI" length; Fié.I" digest; F"%682e772978e3568abdcf579ea31a42aaI" source; FI"é.// CytoPlasm jQuery Setup v0.1
// By MacKinley Smith
// Initialize global JS variables
var Cytoplasm;
@@ -153,19 +153,20 @@
$.each(readyFunctions,function(i,f){f.apply();});
});
}
});
},
- setStyles:function(){
+ setStyles:function(userstyles){
+ if (typeof userstyles != "object") userstyles = {};
// Remove existing cytoplasm styles
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 styles = {
+ var styles = $.extend(true,{},{
body:{
background:vars.colors.global.background,
font:vars.fonts.sizes.normal+" "+vars.fonts.faces.regular,
color:vars.colors.global.text,
padding:vars.layout.padding
@@ -212,10 +213,13 @@
margin:vars.layout.footer.margin,
padding:vars.layout.footer.padding
},
'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}
}
},
@@ -227,11 +231,11 @@
"&.active,&:active":{
background:reverseGradient(vars.colors.plugins.cytoButton.background),
"box-shadow":vars.layout.plugins.cytoButton.shadow
}
}
- };
+ },userstyles);
// Heading sizes
(function(){
var verbose = false;
var huge = parseInt(vars.fonts.sizes.huge), normal = parseInt(vars.fonts.sizes.normal);
@@ -251,34 +255,11 @@
// Compile the styles for HTML and add to <head>
$.each(styles,function(e,s){styletag += compileStyles(e,s);});
var parser = new(less.Parser)({});
parser.parse(styletag,function(e,tree){$("<style type='text/css' rel='stylesheet' media='screen' id='cytoplasm_dynamic_styles'>"+tree.toCSS({compress:true})+"</style>").appendTo("head");});
- $('body').css({background:'url(/tileable-bacteria-1.png) repeat',"background-size":"200px"});
},
- conf:function(which,value){
- var returnvar;
- if (which==null) return conf;
- if (typeof which != "string") return console.warn("Incorrect argument type passed to $.Cytoplasm(\"conf\")!");
- if (which.indexOf(".")>-1) {
- returnvar = conf;
- var levels = [];
- $.each(which.split("."),function(i,level){
- levels.push(level);
- if (returnvar[level]!=null) returnvar = returnvar[level];
- });
- } else returnvar = conf[which];
- if (returnvar==null) return console.warn("Failed to find Cytoplasm config variable "+which+"!");
- if (value==null) return returnvar;
- else {
- if (levels==null || levels==[]) return conf[which] = value;
- var exp = "conf";
- $.each(levels,function(i,level){exp += "["+level.toString()+"]"});
- exp += " = "+value.toString();
- return eval(exp);
- }
- },
vars:function(which,value){
var returnvar;
if (which==null) return vars;
if (typeof which != "string") return console.warn("Incorrect argument type passed to $.Cytoplasm(\"vars\")!");
if (which.indexOf(".")>-1) {
@@ -323,6 +304,6 @@
};
$.Cytoplasm();
})(jQuery);
-; FI"required_assets_digest; F"%3e4319b0afa019625fe2fe4839cb7f67I"
_version; F"%6776f581a4329e299531e1d52aa59832
+; FI"required_assets_digest; F"%2027ad30fc7ca15ed99c1e162e0fa7e5I"
_version; F"%6776f581a4329e299531e1d52aa59832
\ No newline at end of file