livingstyleguide 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cbcec7f0167e25bb21a1800fbb1182f1e17af12
-  data.tar.gz: 49b40194d63fc6ed94b6adfa2f64cac8d09726e8
+  metadata.gz: d5d64f5ecac23f7aa496d41d29fe7c52ff57cf13
+  data.tar.gz: 1b4b9b3063fe8e43c40bade3ee2ea7712c59802b
 SHA512:
-  metadata.gz: d6663050da0e050928c2c6aadf6a18292e412cf80d47da7d9644a23ee0f5496160df9f47c1ed249f01d3bae1b40f4b1a6bc4867c3f78352f2fc9b169f48bf93e
-  data.tar.gz: 23ca79ab95de43d9fb3d797a382c558bd24885ca85994636e17154fd5cca241177c175c8c6c867b7e33ec97e45548b7ed50318a7a5a3fd0c244f120835041539
+  metadata.gz: c2f9f46707af29a9101565aa8251b049bfaec4f67b5569c8556147582c62ec3a3478244be0922ea17d56f9f63ecdf32b2fbd30b9252c5a5d4e2f699c3fb11a1d
+  data.tar.gz: fc7b35a8f96ea4ebfadb52518828bb3d5d563595a2b264f742dffadbc1a3de0affad49e3fe1d1298015eff4ea56d0dd0ee74d743499122c2a99dba695dde0c17

data/lib/livingstyleguide/engine.rb

@@ -7,7 +7,8 @@ module LivingStyleGuide
       default_language: 'example',
       title: 'Living Style Guide',
       header: '<h1 class="livingstyleguide--page-title">Living Style Guide</h1>',
-      footer: '<div class="livingstyleguide--footer"><a class="livingstyleguide--logo" href="http://livingstyleguide.org">Made with the LivingStyleGuide gem.</a></div>'
+      footer: '<div class="livingstyleguide--footer"><a class="livingstyleguide--logo" href="http://livingstyleguide.org">Made with the LivingStyleGuide gem.</a></div>',
+      root: '/'
     }
 
     def self.default_options
@@ -72,9 +73,7 @@ module LivingStyleGuide
     end
 
     def head
-      (@engine.options[:javascript_before] || []).map do |src|
-        %Q(<script src="#{src}"></script>)
-      end.join("\n")
+      javascript_tags_for(@engine.options[:javascript_before]).join("\n")
     end
 
     def header
@@ -84,12 +83,22 @@ module LivingStyleGuide
 
     def footer
       contents = [@engine.options[:footer]]
-      contents << (@engine.options[:javascript_after] || []).map do |src|
-        %Q(<script src="#{src}"></script>)
-      end
+      contents << javascript_tags_for(@engine.options[:javascript_after])
       contents.join("\n")
     end
 
+    private
+    def javascript_tags_for(list)
+      return [] unless list
+      list.map do |src|
+        if src =~ /\.js$/
+          %Q(<script src="#{src}"></script>)
+        else
+          %Q(<script>#{src}</script>)
+        end
+      end
+    end
+
   end
 
 end

data/lib/livingstyleguide/tilt_template.rb

@@ -46,6 +46,8 @@ module ::Tilt
       end
       @options[:syntax] = @options.has_key?(:styleguide_sass) ? :sass : :scss
       @options[:source] ||= File.basename(file, '.html.lsg')
+      @options[:filename] = file
+      @options[:root] ||= root
     end
 
     private
@@ -75,10 +77,22 @@ module ::Tilt
       if @scope.respond_to?(:environment)
         @scope.environment.root
       else
-        File.dirname(@file)
+        find_root_path
       end
     end
 
+    private
+    def find_root_path
+      path = File.dirname(@file)
+      while path.length > 0 do
+        if File.exists?(File.join(path, 'Gemfile')) or File.exists?(File.join(path, '.git'))
+          break
+        end
+        path = File.expand_path('..', path)
+      end
+      path
+    end
+
     private
     def style_variables
       return unless @options.has_key?(:style)

data/lib/livingstyleguide/variables_importer.rb

@@ -20,9 +20,6 @@ module LivingStyleGuide
       nil
     end
 
-    def root
-    end
-
     def find_relative(uri, base, options)
       nil
     end
@@ -64,9 +61,9 @@ module LivingStyleGuide
 
     def all_variables
       variables = []
-      test = /^#{File.dirname(@options[:filename])}/
+      test = /^#{File.expand_path(@options[:living_style_guide].options[:root])}/
       @options[:living_style_guide].files.each do |file|
-        if file =~ test
+        if File.expand_path(file) =~ test
           sass = File.read(file)
           variables << sass.scan(%r(\$([a-z\-_]+)\s*:))
         end

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 end

data/stylesheets/_livingstyleguide.scss

@@ -8,9 +8,11 @@ $livingstyleguide--base-font: 'Georgia', 'Times New Roman', serif !default;
 $livingstyleguide--base-font-size: 14px !default;
 $livingstyleguide--base-font-weight: normal !default;
 $livingstyleguide--base-line-height: 1.4 !default;
-$livingstyleguide--headline-font: $livingstyleguide--base-font !default;
+$livingstyleguide--base-text-align: left !default;
 $livingstyleguide--page-title-font-size: 30px !default;
+$livingstyleguide--headline-font: $livingstyleguide--base-font !default;
 $livingstyleguide--headline-font-size: 22px !default;
+$livingstyleguide--headline-text-align: left !default;
 $livingstyleguide--sub-headline-font-size: 16px !default;
 $livingstyleguide--sub-sub-headline-font-size: $livingstyleguide--base-font-size !default;
 $livingstyleguide--headline-font-weight: bold !default;

data/stylesheets/livingstyleguide/_content.scss

@@ -9,6 +9,7 @@
   font-weight: $livingstyleguide--base-font-weight;
   line-height: $livingstyleguide--base-line-height;
   margin: $livingstyleguide--gap-width auto;
+  text-align: $livingstyleguide--base-text-align;
   width: $livingstyleguide--width;
   -webkit-font-smoothing: antialiased;
 }
@@ -16,7 +17,7 @@
 .livingstyleguide--unordered-list-item,
 .livingstyleguide--ordered-list-item {
   @extend %livingstyleguide--reset;
-  display: block;
+  display: list-item;
   list-style: disc;
   margin: ceil($livingstyleguide--gap-width / 2) 0 ceil($livingstyleguide--gap-width / 2) (2 * $livingstyleguide--gap-width);
 }
@@ -33,6 +34,7 @@
   font-weight: $livingstyleguide--headline-font-weight;
   line-height: $livingstyleguide--headline-line-height;
   margin: (3 * $livingstyleguide--gap-width) auto $livingstyleguide--gap-width;
+  text-align: $livingstyleguide--headline-text-align;
   width: $livingstyleguide--width;
   -webkit-font-smoothing: antialiased;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax