Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed line endings

  • Loading branch information...
commit 31a8d8cd148e573e28e6d883fdf6883af6cdbd1b 1 parent 071e471
Waldemar Kornewald authored
View
1  .hgeol
@@ -2,6 +2,7 @@
**.txt = native
**.pyva = native
**.py = native
+**.rb = native
**.c = native
**.cpp = native
**.cu = native
View
2  base_project/settings.py
@@ -70,8 +70,6 @@
USE_I18N = False
-MEDIA_ROOT = os.path.join(_project_root, 'media')
-
TEMPLATE_DIRS = (os.path.join(_project_root, 'templates'),)
ROOT_URLCONF = 'urls'
View
2  mediagenerator/filters/sass.py
@@ -12,6 +12,8 @@
# Emits extra debug info that can be used by the FireSass Firebug plugin
SASS_DEBUG_INFO = getattr(settings, 'SASS_DEBUG_INFO', False)
SASS_FRAMEWORKS = getattr(settings, 'SASS_FRAMEWORKS', ())
+if isinstance(SASS_FRAMEWORKS, basestring):
+ SASS_FRAMEWORKS = (SASS_FRAMEWORKS,)
_RE_FLAGS = re.MULTILINE | re.UNICODE
multi_line_comment_re = re.compile(r'/\*.*?\*/', _RE_FLAGS | re.DOTALL)
View
132 mediagenerator/filters/sass_compass.rb
@@ -1,66 +1,66 @@
-require "rubygems"
-require "compass"
-
-module Compass::SassExtensions::Functions::Urls
-
- def stylesheet_url(path, only_path = Sass::Script::Bool.new(false))
- if only_path.to_bool
- Sass::Script::String.new(clean_path(path))
- else
- clean_url(path)
- end
- end
-
- def font_url(path, only_path = Sass::Script::Bool.new(false))
- path = path.value # get to the string value of the literal.
-
- # Short curcuit if they have provided an absolute url.
- if absolute_path?(path)
- return Sass::Script::String.new("url(#{path})")
- end
-
- if only_path.to_bool
- Sass::Script::String.new(clean_path(path))
- else
- clean_url(path)
- end
- end
-
- def image_url(path, only_path = Sass::Script::Bool.new(false))
- print "#{@options}\n"
- path = path.value # get to the string value of the literal.
-
- if absolute_path?(path)
- # Short curcuit if they have provided an absolute url.
- return Sass::Script::String.new("url(#{path})")
- end
-
- if only_path.to_bool
- Sass::Script::String.new(clean_path(path))
- else
- clean_url(path)
- end
- end
-
- private
-
- # Emits a path, taking off any leading "./"
- def clean_path(url)
- url = url.to_s
- url = url[0..1] == "./" ? url[2..-1] : url
- end
-
- # Emits a url, taking off any leading "./"
- def clean_url(url)
- Sass::Script::String.new("url('#{clean_path(url)}')")
- end
-
- def absolute_path?(path)
- path[0..0] == "/" || path[0..3] == "http"
- end
-
-end
-
-module Sass::Script::Functions
- include Compass::SassExtensions::Functions::Urls
-end
+require "rubygems"
+require "compass"
+
+module Compass::SassExtensions::Functions::Urls
+
+ def stylesheet_url(path, only_path = Sass::Script::Bool.new(false))
+ if only_path.to_bool
+ Sass::Script::String.new(clean_path(path))
+ else
+ clean_url(path)
+ end
+ end
+
+ def font_url(path, only_path = Sass::Script::Bool.new(false))
+ path = path.value # get to the string value of the literal.
+
+ # Short curcuit if they have provided an absolute url.
+ if absolute_path?(path)
+ return Sass::Script::String.new("url(#{path})")
+ end
+
+ if only_path.to_bool
+ Sass::Script::String.new(clean_path(path))
+ else
+ clean_url(path)
+ end
+ end
+
+ def image_url(path, only_path = Sass::Script::Bool.new(false))
+ print "#{@options}\n"
+ path = path.value # get to the string value of the literal.
+
+ if absolute_path?(path)
+ # Short curcuit if they have provided an absolute url.
+ return Sass::Script::String.new("url(#{path})")
+ end
+
+ if only_path.to_bool
+ Sass::Script::String.new(clean_path(path))
+ else
+ clean_url(path)
+ end
+ end
+
+ private
+
+ # Emits a path, taking off any leading "./"
+ def clean_path(url)
+ url = url.to_s
+ url = url[0..1] == "./" ? url[2..-1] : url
+ end
+
+ # Emits a url, taking off any leading "./"
+ def clean_url(url)
+ Sass::Script::String.new("url('#{clean_path(url)}')")
+ end
+
+ def absolute_path?(path)
+ path[0..0] == "/" || path[0..3] == "http"
+ end
+
+end
+
+module Sass::Script::Functions
+ include Compass::SassExtensions::Functions::Urls
+end
View
24 mediagenerator/filters/sass_paths.rb
@@ -1,12 +1,12 @@
-require "rubygems"
-require "sass"
-require "compass"
-
-ARGV.each do |arg|
- require arg
-end
-
-Compass::Frameworks::ALL.each do |framework|
- next if framework.name =~ /^_/
- print "#{File.expand_path(framework.stylesheets_directory)}\n"
-end
+require "rubygems"
+require "sass"
+require "compass"
+
+ARGV.each do |arg|
+ require arg
+end
+
+Compass::Frameworks::ALL.each do |framework|
+ next if framework.name =~ /^_/
+ print "#{File.expand_path(framework.stylesheets_directory)}\n"
+end
Please sign in to comment.
Something went wrong with that request. Please try again.