cleanup global import to skip icons unless requested. misc css fixes

lib/facades/helpers/navigation.rb

@@ -19,11 +19,13 @@ def nav(options = {}, &block)
       # 
       def nav_link(text, href, options = {})
         options.merge!(:path => request.path)
+        wrapper = options.delete(:wrapper)
+
         link = NavigationLink.new(text, href, options)
         if link.active?
           link.options = Navigator.merge_html_classes('active', link.options)
         end
-        if wrapper = options.delete(:wrapper)
+        if wrapper
           if wrapper.is_a?(Hash)
             wrap_attrs = wrapper
             wrapper    = :li

lib/facades/sass_extensions/icons.rb

@@ -22,13 +22,17 @@ def icon_glyph(name, use_entity = false)
 
       def icon_names(set = "ui")
         listing = icon_translations(set)
-        Sass::Script::List.new((listing.keys || []))
+        keys = (listing.keys || [])
+        keys = keys.collect{ |k| Sass::Script::String.new(k) }
+        Sass::Script::List.new(keys, ',')
       end
 
       private
 
       def icon_translations(set = "ui")
+        set = set.value if set.respond_to?(:value)
         glyphs = Icons.glyph_sets[set] || YAML::load(File.open(File.join(Facades.image_path, 'icons', set, 'icons.yml')))
+        puts glyphs.inspect
         Icons.glyph_sets[set] ||= Hash[glyphs.map{ |k, v| [k.to_s.gsub("_", "-"), v] }]
         Icons.glyph_sets[set]
       end

src/scss/facades/_global.scss

@@ -16,7 +16,6 @@
 @import 'facades/patterns/pills';
 @import 'facades/patterns/twipsy';
 @import 'facades/buttons';
-@import 'facades/icons';
 
 $facades-global-import-used: true;
 
@@ -78,16 +77,6 @@ html.lt-ie8{
 	}
 }
 
-@include icon-classes;
-
-.icon-16{ @include icon-rect(16px); }
-.icon-32{ @include icon-rect(32px); }
-.icon-24{ @include icon-rect(24px); }
-
-[class^="icon-"], [class*=" icon-"] {
-	display: inline; width: auto; height: auto; line-height: inherit; vertical-align: baseline;
-}
-
 form{ 
 	@include form;
 

src/scss/facades/_mixins.scss

@@ -67,6 +67,11 @@ $experimental-support-for-khtml: false !default;
 	}
 }
 
+@mixin user-select($val: "none"){
+	@include experimental("user-select", unquote($val), -moz, -webkit, -khtml, -ms, official);
+	@include experimental("touch-callout", unquote($val), -webkit, official, not -moz, not -khtml, not -ms);
+}
+
 //
 // Clip properties
 // Creates a clip rect, including IE specific version.

src/scss/facades/icons/_classes.scss

@@ -28,4 +28,16 @@
 		  font-size: 1.3333333333333333em;
 	}
 
+	[class^="#{$prefix}"], [class*=" #{$prefix}"] {
+		display: inline; width: auto; height: auto; line-height: inherit; vertical-align: baseline;
+	}
+
+
+
+}
+
+@mixin icon-rect-classes{
+	.icon-16{ @include icon-rect(16px); }
+	.icon-32{ @include icon-rect(32px); }
+	.icon-24{ @include icon-rect(24px); }	
 }

src/scss/facades/layout/_lists.scss

@@ -29,6 +29,7 @@
 @mixin floated-list{
 	list-style:none;
 	display:block;
+	margin-left:0;
 
 	li{
 		display:block;