cytoplasm.rb in cytoplasm-0.1.6

- old
+ new

@@ -21,12 +21,14 @@
 	# List of all Cytoplasm variables, with their corresponding default values.
 	# Create a YAML file at config/initializers/cytoplasm.vars.yml to extend the default values.
 	@vars = {
 		:layout => {
 			:mode => "fluid",
-			:padding => "20px",
+			:padding => "0px",
 			:header => {
+				:margin => "0px",
+				:padding => "10px",
 				:logo => {
 					:enabled => true,
 					:position => "absolute",
 					:align => "left",
 					:x => "0px",
@@ -38,14 +40,16 @@
 					:background => "transparent",
 					:font => "light"
 				}
 			},
 			:content => {
-				
+				:margin => "0px",
+				:padding => "20px"
 			},
 			:footer => {
-				
+				:margin => "0px",
+				:padding => "10px"
 			},
 			:plugins => {
 				:cytoButton => {
 					:shadow => "inset 0px 0px 10px rgba(0,0,0,0.5)"
 				}
@@ -128,11 +132,12 @@
   		'cytoRadio',
 	  	'cytoSlider',
   		'cytoUpload',
   		'cytoColorPicker',
   		'cytoField',
-  		'cytoTable'
+  		'cytoTable',
+  		'cytoLogo'
   	]
   };
 	
 	def initialize
 		configure_with("config/initializers/cytoplasm.yml")
@@ -327,13 +332,16 @@
 				elsif dir == "googlewebfonts"
 					sheet = "http://fonts.googleapis.com/css?family="+fam
 					sheet += ":" + variants.join(",") if variants.any?
 					sheets << sheet
 				end
-				#sheets << ((dir == "fontsquirrel") ? "/fonts/"+fam+"/stylesheet.css" : "http://fonts.googleapis.com/css?family="+fam)
 			end
 		end
 		return sheets
+	end
+	
+	def self.generate_uid
+		(0...50).map{('a'..'z').to_a[rand(26)]}.join
 	end
 	
 	# Instantiate engine
 	module Rails
 		class Engine < ::Rails::Engine
\ No newline at end of file