Merge branch 'no_rails_integration' of github.com:chriseppstein/compass into no_rails_integration
This commit is contained in:
commit
7b263fab5c
@ -2,5 +2,5 @@
|
|||||||
:major: 0
|
:major: 0
|
||||||
:minor: 12
|
:minor: 12
|
||||||
:state: alpha
|
:state: alpha
|
||||||
:build: 3
|
:build: 4
|
||||||
:name: Alnilam
|
:name: Alnilam
|
||||||
|
@ -3,7 +3,8 @@ require File.join(path, 'compass/version')
|
|||||||
|
|
||||||
Gem::Specification.new do |gemspec|
|
Gem::Specification.new do |gemspec|
|
||||||
gemspec.name = "compass"
|
gemspec.name = "compass"
|
||||||
gemspec.version = Compass::VERSION # Update the VERSION.yml file to set this.
|
gemspec.date = Date.today
|
||||||
|
gemspec.version = Compass::VERSION # Update VERSION.yml file to set this.
|
||||||
gemspec.description = "Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS."
|
gemspec.description = "Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS."
|
||||||
gemspec.homepage = "http://compass-style.org"
|
gemspec.homepage = "http://compass-style.org"
|
||||||
gemspec.authors = ["Chris Eppstein", "Eric A. Meyer", "Brandon Mathis", "Nico Hagenburger", "Scott Davis"]
|
gemspec.authors = ["Chris Eppstein", "Eric A. Meyer", "Brandon Mathis", "Nico Hagenburger", "Scott Davis"]
|
||||||
|
@ -10,7 +10,7 @@ Contributing Stylesheets to Compass
|
|||||||
|
|
||||||
Thank you for your interest in contributing to Compass. Our goal is to make it as easy
|
Thank you for your interest in contributing to Compass. Our goal is to make it as easy
|
||||||
as we can for you to contribute changes to compass -- So if there's something here that
|
as we can for you to contribute changes to compass -- So if there's something here that
|
||||||
seems harder than it aught to be, please let us know.
|
seems harder than it ought to be, please let us know.
|
||||||
|
|
||||||
If you find a bug **in this document**, you are bound to contribute a fix. Stop reading now
|
If you find a bug **in this document**, you are bound to contribute a fix. Stop reading now
|
||||||
if you do not wish to abide by this rule.
|
if you do not wish to abide by this rule.
|
||||||
|
@ -13,12 +13,22 @@ body_id: home
|
|||||||
%li
|
%li
|
||||||
%a{:href=>"#{i.path}#function-#{f.name}"}= f.sass_signature(:html)
|
%a{:href=>"#{i.path}#function-#{f.name}"}= f.sass_signature(:html)
|
||||||
|
|
||||||
|
- sass_function_list = []
|
||||||
%h1#logo All Ruby Based Functions
|
%h1#logo All Ruby Based Functions
|
||||||
|
%h3 Compass Functions
|
||||||
%ul
|
%ul
|
||||||
- Sass::Script::Functions.public_instance_methods.sort_by{|m| m.to_s}.each do |m|
|
- Sass::Script::Functions.public_instance_methods.sort_by{|m| m.to_s}.each do |m|
|
||||||
%li
|
|
||||||
- name = m.to_s.gsub("_","-")
|
- name = m.to_s.gsub("_","-")
|
||||||
|
- unless name =~ /^\-compass/ # Private Fuctions!
|
||||||
- if i = item_for_function_name(name)
|
- if i = item_for_function_name(name)
|
||||||
|
%li
|
||||||
%a{:href=>"#{i.path}##{name}"}= name
|
%a{:href=>"#{i.path}##{name}"}= name
|
||||||
|
- elsif sass_functions().include? m
|
||||||
|
- sass_function_list << '<a href="http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#%s-instance_method">%s</a>' % [m.to_s, name]
|
||||||
- else
|
- else
|
||||||
|
%li
|
||||||
= name
|
= name
|
||||||
|
%h3 Sass Functions
|
||||||
|
%ul
|
||||||
|
- sass_function_list.each do |m|
|
||||||
|
%li= m
|
@ -183,6 +183,12 @@ def all_functions
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Sass Only Functions from 3.1.10 (Brainy Betty)
|
||||||
|
# Not as elegant, but does the trick.
|
||||||
|
def sass_functions
|
||||||
|
[:rgb, :rgba, :hsl, :hsla, :red, :green, :blue, :hue, :saturation, :lightness, :alpha, :opacity, :opacify, :fade_in, :transparentize, :fade_out, :lighten, :darken, :saturate, :desaturate, :adjust_hue, :adjust_color, :scale_color, :change_color, :mix, :grayscale, :complement, :invert, :unquote, :quote, :type_of, :unit, :unitless, :comparable, :percentage, :round, :ceil, :floor, :abs, :length, :nth, :join, :append, :zip, :index, :if]
|
||||||
|
end
|
||||||
|
|
||||||
def example_items
|
def example_items
|
||||||
@site.cached("examples") do
|
@site.cached("examples") do
|
||||||
@items.select do |i|
|
@items.select do |i|
|
||||||
|
@ -35,8 +35,8 @@ $default-background-clip: padding-box !default;
|
|||||||
@include experimental(background-clip, $clip,
|
@include experimental(background-clip, $clip,
|
||||||
not -moz,
|
not -moz,
|
||||||
not -webkit,
|
not -webkit,
|
||||||
-o,
|
not -o,
|
||||||
-ms,
|
not -ms,
|
||||||
-khtml,
|
-khtml,
|
||||||
official
|
official
|
||||||
);
|
);
|
||||||
|
@ -67,7 +67,6 @@ module Compass
|
|||||||
if options.include?(:debug_info) && options[:debug_info]
|
if options.include?(:debug_info) && options[:debug_info]
|
||||||
compiler_opts[:sass][:debug_info] = options.delete(:debug_info)
|
compiler_opts[:sass][:debug_info] = options.delete(:debug_info)
|
||||||
end
|
end
|
||||||
puts compiler_opts.inspect
|
|
||||||
compiler_opts
|
compiler_opts
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ module Compass::SassExtensions::Functions::Trig
|
|||||||
private
|
private
|
||||||
def trig(operation, number)
|
def trig(operation, number)
|
||||||
if number.numerator_units == ["deg"] && number.denominator_units == []
|
if number.numerator_units == ["deg"] && number.denominator_units == []
|
||||||
Sass::Script::Number.new(Math.send(operation, (number.value * Math::PI / 180)))
|
Sass::Script::Number.new(Math.send(operation, Math::PI * number.value / 180))
|
||||||
else
|
else
|
||||||
Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units)
|
Sass::Script::Number.new(Math.send(operation, number.value), number.numerator_units, number.denominator_units)
|
||||||
end
|
end
|
||||||
|
10
test/fixtures/stylesheets/compass/css/background-clip.css
vendored
Normal file
10
test/fixtures/stylesheets/compass/css/background-clip.css
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
.background-clip {
|
||||||
|
-webkit-background-clip: border;
|
||||||
|
-moz-background-clip: border;
|
||||||
|
background-clip: border-box; }
|
||||||
|
|
||||||
|
.background-clip-khtml {
|
||||||
|
-webkit-background-clip: border;
|
||||||
|
-moz-background-clip: border;
|
||||||
|
-khtml-background-clip: border-box;
|
||||||
|
background-clip: border-box; }
|
8
test/fixtures/stylesheets/compass/sass/background-clip.scss
vendored
Normal file
8
test/fixtures/stylesheets/compass/sass/background-clip.scss
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
@import "compass/css3/background-clip";
|
||||||
|
|
||||||
|
.background-clip { @include background-clip('border-box'); }
|
||||||
|
|
||||||
|
.background-clip-khtml {
|
||||||
|
$experimental-support-for-khtml:true;
|
||||||
|
@include background-clip('border-box');
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user