compass 0.12.0 → 0.12.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/README.markdown +18 -46
- data/Rakefile +34 -3
- data/bin/compass +2 -1
- data/features/command_line.feature +1 -0
- data/features/step_definitions/command_line_steps.rb +1 -1
- data/frameworks/compass/stylesheets/compass/_css3.scss +4 -0
- data/frameworks/compass/stylesheets/compass/_support.scss +4 -0
- data/frameworks/compass/stylesheets/compass/css3/_appearance.scss +7 -3
- data/frameworks/compass/stylesheets/compass/css3/_border-radius.scss +4 -10
- data/frameworks/compass/stylesheets/compass/css3/_box.scss +2 -2
- data/frameworks/compass/stylesheets/compass/css3/_columns.scss +107 -10
- data/frameworks/compass/stylesheets/compass/css3/_filter.scss +23 -0
- data/frameworks/compass/stylesheets/compass/css3/_font-face.scss +4 -4
- data/frameworks/compass/stylesheets/compass/css3/_hyphenation.scss +77 -0
- data/frameworks/compass/stylesheets/compass/css3/_images.scss +2 -2
- data/frameworks/compass/stylesheets/compass/css3/_inline-block.scss +13 -7
- data/frameworks/compass/stylesheets/compass/css3/_regions.scss +22 -0
- data/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss +52 -13
- data/frameworks/compass/stylesheets/compass/css3/_transform.scss +20 -20
- data/frameworks/compass/stylesheets/compass/css3/_transition.scss +128 -61
- data/frameworks/compass/stylesheets/compass/reset/_utilities.scss +4 -2
- data/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +69 -62
- data/frameworks/compass/stylesheets/compass/typography/text/_replacement.scss +35 -9
- data/frameworks/compass/stylesheets/compass/utilities/general/_hacks.scss +1 -1
- data/lib/compass/actions.rb +6 -4
- data/lib/compass/commands.rb +4 -3
- data/lib/compass/commands/extension_command.rb +60 -0
- data/lib/compass/commands/project_base.rb +7 -1
- data/lib/compass/commands/update_project.rb +2 -2
- data/lib/compass/compiler.rb +1 -2
- data/lib/compass/configuration/adapters.rb +8 -2
- data/lib/compass/configuration/data.rb +1 -0
- data/lib/compass/exec/global_options_parser.rb +8 -1
- data/lib/compass/exec/project_options_parser.rb +8 -0
- data/lib/compass/sass_extensions/functions/colors.rb +14 -0
- data/lib/compass/sass_extensions/functions/constants.rb +9 -0
- data/lib/compass/sass_extensions/functions/font_files.rb +4 -2
- data/lib/compass/sass_extensions/functions/gradient_support.rb +11 -4
- data/lib/compass/sass_extensions/functions/math.rb +1 -1
- data/lib/compass/sass_extensions/functions/sprites.rb +10 -2
- data/lib/compass/sass_extensions/sprites/engines.rb +3 -3
- data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb +8 -6
- data/lib/compass/sass_extensions/sprites/sprite_methods.rb +3 -2
- data/lib/compass/sprite_importer.rb +1 -1
- data/lib/compass/version.rb +15 -11
- data/test/fixtures/stylesheets/blueprint/css/screen.css +3 -4
- data/test/fixtures/stylesheets/blueprint/css/single-imports/buttons.css +6 -8
- data/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css +1 -2
- data/test/fixtures/stylesheets/blueprint/css/single-imports/fancy-type.css +1 -1
- data/test/fixtures/stylesheets/blueprint/css/single-imports/reset-utilities.css +8 -2
- data/test/fixtures/stylesheets/compass/css/border_radius.css +0 -6
- data/test/fixtures/stylesheets/compass/css/columns.css +126 -12
- data/test/fixtures/stylesheets/compass/css/filters.css +29 -0
- data/test/fixtures/stylesheets/compass/css/fonts.css +1 -1
- data/test/fixtures/stylesheets/compass/css/gradients.css +1 -25
- data/test/fixtures/stylesheets/compass/css/grid_background.css +7 -14
- data/test/fixtures/stylesheets/compass/css/hyphenation.css +16 -0
- data/test/fixtures/stylesheets/compass/css/lists.css +6 -8
- data/test/fixtures/stylesheets/compass/css/pie.css +0 -1
- data/test/fixtures/stylesheets/compass/css/regions.css +7 -0
- data/test/fixtures/stylesheets/compass/css/replacement.css +59 -0
- data/test/fixtures/stylesheets/compass/css/reset.css +2 -2
- data/test/fixtures/stylesheets/compass/css/text_shadow.css +22 -4
- data/test/fixtures/stylesheets/compass/css/transform.css +108 -0
- data/test/fixtures/stylesheets/compass/css/transition.css +67 -10
- data/test/fixtures/stylesheets/compass/css/vertical_rhythm.css +25 -25
- data/test/fixtures/stylesheets/compass/sass/columns.scss +19 -0
- data/test/fixtures/stylesheets/compass/sass/filters.scss +24 -0
- data/test/fixtures/stylesheets/compass/sass/gradients.sass +2 -4
- data/test/fixtures/stylesheets/compass/sass/hyphenation.scss +11 -0
- data/test/fixtures/stylesheets/compass/sass/regions.scss +4 -0
- data/test/fixtures/stylesheets/compass/sass/replacement.scss +22 -0
- data/test/fixtures/stylesheets/compass/sass/text_shadow.scss +6 -1
- data/test/fixtures/stylesheets/compass/sass/transition.scss +12 -0
- data/test/helpers/test_case.rb +8 -1
- data/test/integrations/sprites_test.rb +5 -5
- data/test/test_helper.rb +2 -1
- data/test/units/compass_module_test.rb +1 -1
- data/test/units/configuration_test.rb +15 -0
- data/test/units/regressions_test.rb +35 -0
- data/test/units/sass_extensions_test.rb +33 -11
- metadata +62 -222
- data/VERSION.yml +0 -5
- data/bin/compass.compiled.rbc +0 -707
- data/examples/compass/images/emblem-a043c4f148.png +0 -0
- data/examples/compass/images/flag-03c3b29b35.png +0 -0
- data/examples/compass/images/flag-21cfbfbfc8.png +0 -0
- data/examples/css3/extensions/fancy-fonts/templates/project/Prociono.otf +0 -0
- data/examples/css3/extensions/fancy-fonts/templates/project/bgrove.otf +0 -0
- data/examples/css3/extensions/fancy-fonts/templates/project/bgrove.ttf +0 -0
- data/lib/compass.rbc +0 -796
- data/lib/compass/actions.rbc +0 -2736
- data/lib/compass/app_integration.rbc +0 -836
- data/lib/compass/app_integration/merb.rbc +0 -106
- data/lib/compass/app_integration/rails.rbc +0 -2096
- data/lib/compass/app_integration/rails/configuration_defaults.rbc +0 -2430
- data/lib/compass/app_integration/rails/installer.rbc +0 -3677
- data/lib/compass/app_integration/stand_alone.rbc +0 -589
- data/lib/compass/app_integration/stand_alone/configuration_defaults.rbc +0 -721
- data/lib/compass/app_integration/stand_alone/installer.rbc +0 -1487
- data/lib/compass/browser_support.rbc +0 -1144
- data/lib/compass/commands.rbc +0 -307
- data/lib/compass/commands/base.rbc +0 -1044
- data/lib/compass/commands/clean_project.rbc +0 -1856
- data/lib/compass/commands/create_project.rbc +0 -2691
- data/lib/compass/commands/default.rbc +0 -1677
- data/lib/compass/commands/generate_grid_background.rbc +0 -1939
- data/lib/compass/commands/help.rbc +0 -1921
- data/lib/compass/commands/imports.rbc +0 -969
- data/lib/compass/commands/installer_command.rbc +0 -807
- data/lib/compass/commands/interactive.rbc +0 -1341
- data/lib/compass/commands/list_frameworks.rbc +0 -1111
- data/lib/compass/commands/print_version.rbc +0 -2478
- data/lib/compass/commands/project_base.rbc +0 -2085
- data/lib/compass/commands/project_stats.rbc +0 -4202
- data/lib/compass/commands/registry.rbc +0 -1350
- data/lib/compass/commands/sprite.rbc +0 -2212
- data/lib/compass/commands/stamp_pattern.rbc +0 -2011
- data/lib/compass/commands/unpack_extension.rbc +0 -2348
- data/lib/compass/commands/update_project.rbc +0 -3002
- data/lib/compass/commands/validate_project.rbc +0 -1686
- data/lib/compass/commands/watch_project.rbc +0 -4155
- data/lib/compass/commands/write_configuration.rbc +0 -2896
- data/lib/compass/compiler.rbc +0 -4913
- data/lib/compass/configuration.rbc +0 -1398
- data/lib/compass/configuration/adapters.rbc +0 -2088
- data/lib/compass/configuration/comments.rbc +0 -843
- data/lib/compass/configuration/data.rbc +0 -2633
- data/lib/compass/configuration/defaults.rbc +0 -3617
- data/lib/compass/configuration/file_data.rbc +0 -643
- data/lib/compass/configuration/helpers.rbc +0 -3500
- data/lib/compass/configuration/inheritance.rbc +0 -3592
- data/lib/compass/configuration/paths.rbc +0 -412
- data/lib/compass/configuration/serialization.rbc +0 -1996
- data/lib/compass/dependencies.rbc +0 -232
- data/lib/compass/errors.rbc +0 -176
- data/lib/compass/exec.rbc +0 -500
- data/lib/compass/exec/command_option_parser.rbc +0 -676
- data/lib/compass/exec/global_options_parser.rbc +0 -1306
- data/lib/compass/exec/helpers.rbc +0 -758
- data/lib/compass/exec/project_options_parser.rbc +0 -1515
- data/lib/compass/exec/sub_command_ui.rbc +0 -1191
- data/lib/compass/frameworks.rbc +0 -3640
- data/lib/compass/grid_builder.rbc +0 -0
- data/lib/compass/installers.rbc +0 -152
- data/lib/compass/installers/bare_installer.rbc +0 -939
- data/lib/compass/installers/base.rbc +0 -4427
- data/lib/compass/installers/manifest.rbc +0 -3335
- data/lib/compass/installers/manifest_installer.rbc +0 -1591
- data/lib/compass/installers/template_context.rbc +0 -1030
- data/lib/compass/logger.rbc +0 -2317
- data/lib/compass/quick_cache.rbc +0 -324
- data/lib/compass/sass_extensions.rbc +0 -213
- data/lib/compass/sass_extensions/functions.rbc +0 -808
- data/lib/compass/sass_extensions/functions/colors.rbc +0 -1279
- data/lib/compass/sass_extensions/functions/constants.rbc +0 -1921
- data/lib/compass/sass_extensions/functions/cross_browser_support.rbc +0 -1966
- data/lib/compass/sass_extensions/functions/display.rbc +0 -1227
- data/lib/compass/sass_extensions/functions/enumerate.rbc +0 -446
- data/lib/compass/sass_extensions/functions/env.rbc +0 -299
- data/lib/compass/sass_extensions/functions/font_files.rbc +0 -821
- data/lib/compass/sass_extensions/functions/gradient_support.rbc +0 -14147
- data/lib/compass/sass_extensions/functions/image_size.rbc +0 -3152
- data/lib/compass/sass_extensions/functions/inline_image.rbc +0 -1678
- data/lib/compass/sass_extensions/functions/lists.rbc +0 -2601
- data/lib/compass/sass_extensions/functions/selectors.rbc +0 -1592
- data/lib/compass/sass_extensions/functions/sprites.rbc +0 -3792
- data/lib/compass/sass_extensions/functions/trig.rbc +0 -811
- data/lib/compass/sass_extensions/functions/urls.rbc +0 -5248
- data/lib/compass/sass_extensions/monkey_patches.rbc +0 -134
- data/lib/compass/sass_extensions/monkey_patches/browser_support.rbc +0 -2169
- data/lib/compass/sass_extensions/monkey_patches/traversal.rbc +0 -660
- data/lib/compass/sass_extensions/sprites.rbc +0 -363
- data/lib/compass/sass_extensions/sprites/base.rbc +0 -4529
- data/lib/compass/sass_extensions/sprites/engines.rbc +0 -662
- data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rbc +0 -1074
- data/lib/compass/sass_extensions/sprites/image.rbc +0 -2961
- data/lib/compass/sass_extensions/sprites/image_methods.rbc +0 -900
- data/lib/compass/sass_extensions/sprites/image_row.rbc +0 -1168
- data/lib/compass/sass_extensions/sprites/layout_methods.rbc +0 -3236
- data/lib/compass/sass_extensions/sprites/row_fitter.rbc +0 -2067
- data/lib/compass/sass_extensions/sprites/sprite_map.rbc +0 -1991
- data/lib/compass/sass_extensions/sprites/sprite_methods.rbc +0 -3190
- data/lib/compass/sass_extensions/sprites/sprites.rbc +0 -1573
- data/lib/compass/sprite_importer.rbc +0 -3573
- data/lib/compass/util.rbc +0 -552
- data/lib/compass/version.rbc +0 -1245
- data/test/fixtures/stylesheets/busted_image_urls/tmp/screen.css +0 -9
- data/test/fixtures/stylesheets/envtest/tmp/env.css +0 -2
- data/test/helpers/command_line.rbc +0 -2820
- data/test/helpers/diff.rbc +0 -1104
- data/test/helpers/io.rbc +0 -962
- data/test/helpers/rails.rbc +0 -1116
- data/test/helpers/test_case.rbc +0 -1255
- data/test/integrations/compass_test.rbc +0 -6589
- data/test/integrations/rails_integration_test.rbc +0 -1342
- data/test/integrations/sprites_test.rbc +0 -6192
- data/test/test_helper.rbc +0 -1694
- data/test/units/actions_test.rbc +0 -644
- data/test/units/command_line_test.rbc +0 -1532
- data/test/units/compass_png_test.rbc +0 -0
- data/test/units/configuration_test.rbc +0 -3833
- data/test/units/rails_configuration_test.rbc +0 -1032
- data/test/units/sass_extensions_test.rbc +0 -3586
- data/test/units/sprites/engine_test.rbc +0 -962
- data/test/units/sprites/image_row_test.rbc +0 -1578
- data/test/units/sprites/image_test.rbc +0 -2836
- data/test/units/sprites/importer_test.rbc +0 -2620
- data/test/units/sprites/row_fitter_test.rbc +0 -1479
- data/test/units/sprites/sprite_command_test.rbc +0 -1147
- data/test/units/sprites/sprite_map_test.rbc +0 -6515
@@ -28,7 +28,13 @@ module Compass
|
|
28
28
|
end
|
29
29
|
|
30
30
|
def add_project_configuration
|
31
|
-
|
31
|
+
defaults = Compass.configuration_for(options, "cli_defaults")
|
32
|
+
if options[:project_type]
|
33
|
+
project_type_config = Compass.configuration_for(options[:project_type])
|
34
|
+
project_type_config.inherit_from!(Compass.default_configuration)
|
35
|
+
defaults.inherit_from!(project_type_config)
|
36
|
+
end
|
37
|
+
Compass.add_project_configuration(options[:configuration_file], :defaults => defaults) do
|
32
38
|
options[:project_type]
|
33
39
|
end
|
34
40
|
end
|
@@ -9,7 +9,7 @@ module Compass
|
|
9
9
|
Usage: compass compile [path/to/project] [path/to/project/src/file.sass ...] [options]
|
10
10
|
|
11
11
|
Description:
|
12
|
-
compile project at the path specified or the current
|
12
|
+
compile project at the path specified or the current directory if not specified.
|
13
13
|
|
14
14
|
Options:
|
15
15
|
}.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
|
@@ -22,7 +22,7 @@ module Compass
|
|
22
22
|
self.options[:debug_info]= true
|
23
23
|
end
|
24
24
|
|
25
|
-
opts.on("--no-debug-info", "Turns
|
25
|
+
opts.on("--no-debug-info", "Turns off sass's debuging information") do
|
26
26
|
self.options[:debug_info]= false
|
27
27
|
end
|
28
28
|
super
|
data/lib/compass/compiler.rb
CHANGED
@@ -134,7 +134,6 @@ module Compass
|
|
134
134
|
|
135
135
|
# Compile one Sass file
|
136
136
|
def compile(sass_filename, css_filename)
|
137
|
-
start_time = end_time = nil
|
138
137
|
css_content = logger.red do
|
139
138
|
timed do
|
140
139
|
engine(sass_filename, css_filename).render
|
@@ -153,7 +152,7 @@ module Compass
|
|
153
152
|
def engine(sass_filename, css_filename)
|
154
153
|
syntax = (sass_filename =~ /\.(s[ac]ss)$/) && $1.to_sym || :sass
|
155
154
|
opts = sass_options.merge(:filename => sass_filename, :css_filename => css_filename, :syntax => syntax)
|
156
|
-
Sass::Engine.new(
|
155
|
+
Sass::Engine.new(File.read(sass_filename), opts)
|
157
156
|
end
|
158
157
|
|
159
158
|
# Place the syntax error into the target css file,
|
@@ -13,8 +13,13 @@ module Compass
|
|
13
13
|
Compass::Frameworks::ALL.each do |framework|
|
14
14
|
locations << [framework.stylesheets_directory, File.join(css_path || css_dir || ".", framework.name)]
|
15
15
|
end
|
16
|
+
load_paths = []
|
16
17
|
resolve_additional_import_paths.each do |additional_path|
|
17
|
-
|
18
|
+
if additional_path.is_a?(String)
|
19
|
+
locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))]
|
20
|
+
else
|
21
|
+
load_paths << additional_path
|
22
|
+
end
|
18
23
|
end
|
19
24
|
plugin_opts = {:template_location => locations}
|
20
25
|
plugin_opts[:style] = output_style if output_style
|
@@ -23,13 +28,14 @@ module Compass
|
|
23
28
|
plugin_opts[:cache_location] = cache_path unless cache_path.nil?
|
24
29
|
plugin_opts.merge!(sass_options || {})
|
25
30
|
plugin_opts[:load_paths] ||= []
|
31
|
+
plugin_opts[:load_paths] += load_paths
|
26
32
|
plugin_opts[:load_paths] << Compass::SpriteImporter.new
|
27
33
|
plugin_opts
|
28
34
|
end
|
29
35
|
|
30
36
|
def resolve_additional_import_paths
|
31
37
|
(additional_import_paths || []).map do |path|
|
32
|
-
if project_path && !absolute_path?(path)
|
38
|
+
if path.is_a?(String) && project_path && !absolute_path?(path)
|
33
39
|
File.join(project_path, path)
|
34
40
|
else
|
35
41
|
path
|
@@ -79,6 +79,7 @@ module Compass
|
|
79
79
|
end
|
80
80
|
|
81
81
|
def add_import_path(*paths)
|
82
|
+
paths.map!{|p| defined?(Pathname) && Pathname === p ? p.to_s : p}
|
82
83
|
# The @added_import_paths variable works around an issue where
|
83
84
|
# the additional_import_paths gets overwritten during parse
|
84
85
|
@added_import_paths ||= []
|
@@ -26,6 +26,13 @@ module Compass::Exec::GlobalOptionsParser
|
|
26
26
|
::Compass.configuration.discover Pathname.new(frameworks_dir).realpath
|
27
27
|
end
|
28
28
|
|
29
|
+
opts.on('-I IMPORT_PATH', '--import-path IMPORT_PATH',
|
30
|
+
"Makes files under the IMPORT_PATH folder findable by Sass's @import directive."
|
31
|
+
) do |import_path|
|
32
|
+
require 'pathname'
|
33
|
+
::Compass.configuration.add_import_path Pathname.new(import_path).realpath
|
34
|
+
end
|
35
|
+
|
29
36
|
opts.on('-q', '--quiet', :NONE, 'Quiet mode.') do
|
30
37
|
self.options[:quiet] = true
|
31
38
|
end
|
@@ -34,7 +41,7 @@ module Compass::Exec::GlobalOptionsParser
|
|
34
41
|
self.options[:trace] = true
|
35
42
|
end
|
36
43
|
|
37
|
-
opts.on('--force', :NONE, 'Allows
|
44
|
+
opts.on('--force', :NONE, 'Allows compass to overwrite existing files.') do
|
38
45
|
self.options[:force] = true
|
39
46
|
end
|
40
47
|
|
@@ -20,6 +20,10 @@ module Compass::Exec::ProjectOptionsParser
|
|
20
20
|
self.options[:project_type] = project_type.to_sym
|
21
21
|
end
|
22
22
|
|
23
|
+
opts.on('--app-dir PATH', 'The base directory for your application.') do |project_path|
|
24
|
+
self.options[:project_path] = project_path
|
25
|
+
end
|
26
|
+
|
23
27
|
opts.on('--sass-dir SRC_DIR', "The source directory where you keep your sass stylesheets.") do |sass_dir|
|
24
28
|
set_dir_or_path(:sass, sass_dir)
|
25
29
|
end
|
@@ -36,6 +40,10 @@ module Compass::Exec::ProjectOptionsParser
|
|
36
40
|
set_dir_or_path(:javascripts, javascripts_dir)
|
37
41
|
end
|
38
42
|
|
43
|
+
opts.on('--fonts-dir FONTS_DIR', "The directory where you keep your fonts.") do |fonts_dir|
|
44
|
+
set_dir_or_path(:fonts, fonts_dir)
|
45
|
+
end
|
46
|
+
|
39
47
|
opts.on('-e ENV', '--environment ENV', [:development, :production], 'Use sensible defaults for your current environment.',
|
40
48
|
' One of: development (default), production') do |env|
|
41
49
|
self.options[:environment] = env
|
@@ -32,6 +32,20 @@ module Compass::SassExtensions::Functions::Colors
|
|
32
32
|
color.with(:saturation => scale_color_value(color.saturation, amount.value))
|
33
33
|
end
|
34
34
|
|
35
|
+
def shade(color, percentage)
|
36
|
+
assert_type color, :Color
|
37
|
+
assert_type percentage, :Number
|
38
|
+
black = Sass::Script::Color.new([0, 0, 0])
|
39
|
+
mix(black, color, percentage)
|
40
|
+
end
|
41
|
+
|
42
|
+
def tint(color, percentage)
|
43
|
+
assert_type color, :Color
|
44
|
+
assert_type percentage, :Number
|
45
|
+
white = Sass::Script::Color.new([255, 255, 255])
|
46
|
+
mix(white, color, percentage)
|
47
|
+
end
|
48
|
+
|
35
49
|
# returns an IE hex string for a color with an alpha channel
|
36
50
|
# suitable for passing to IE filters.
|
37
51
|
def ie_hex_str(color)
|
@@ -45,6 +45,15 @@ module Compass::SassExtensions::Functions::Constants
|
|
45
45
|
position
|
46
46
|
end
|
47
47
|
end
|
48
|
+
|
49
|
+
def is_url(string)
|
50
|
+
if string.is_a?(Sass::Script::String)
|
51
|
+
is_url = !!(string.value =~ /^url\(.*\)$/)
|
52
|
+
Sass::Script::Bool.new(is_url)
|
53
|
+
else
|
54
|
+
Sass::Script::Bool.new(false)
|
55
|
+
end
|
56
|
+
end
|
48
57
|
else
|
49
58
|
# returns the opposite position of a side or corner.
|
50
59
|
def opposite_position(position)
|
@@ -5,7 +5,8 @@ module Compass::SassExtensions::Functions::FontFiles
|
|
5
5
|
:opentype => 'opentype',
|
6
6
|
:ttf => 'truetype',
|
7
7
|
:truetype => 'truetype',
|
8
|
-
:svg => 'svg'
|
8
|
+
:svg => 'svg',
|
9
|
+
:eot => 'embedded-opentype'
|
9
10
|
}
|
10
11
|
|
11
12
|
def font_files(*args)
|
@@ -24,7 +25,8 @@ module Compass::SassExtensions::Functions::FontFiles
|
|
24
25
|
if FONT_TYPES.key? type
|
25
26
|
skip_next = true
|
26
27
|
else
|
27
|
-
|
28
|
+
# let pass url like font.type?thing#stuff
|
29
|
+
type = arg.to_s.split('.').last.gsub(/(\?(.*))?(#(.*))?"/, '').to_sym
|
28
30
|
end
|
29
31
|
|
30
32
|
if FONT_TYPES.key? type
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Compass::SassExtensions::Functions::GradientSupport
|
2
2
|
|
3
|
-
GRADIENT_ASPECTS = %w(webkit moz svg pie css2 o owg
|
3
|
+
GRADIENT_ASPECTS = %w(webkit moz svg pie css2 o owg).freeze
|
4
4
|
|
5
5
|
class ColorStop < Sass::Script::Literal
|
6
6
|
attr_accessor :color, :stop
|
@@ -112,7 +112,6 @@ module Compass::SassExtensions::Functions::GradientSupport
|
|
112
112
|
standardized_prefix :webkit
|
113
113
|
standardized_prefix :moz
|
114
114
|
standardized_prefix :o
|
115
|
-
standardized_prefix :ms
|
116
115
|
|
117
116
|
def to_owg(options = self.options)
|
118
117
|
args = [
|
@@ -168,8 +167,16 @@ module Compass::SassExtensions::Functions::GradientSupport
|
|
168
167
|
standardized_prefix :webkit
|
169
168
|
standardized_prefix :moz
|
170
169
|
standardized_prefix :o
|
171
|
-
|
172
|
-
|
170
|
+
|
171
|
+
def supports?(aspect)
|
172
|
+
# I don't know how to support degree-based gradients in old webkit gradients (owg) or svg so we just disable them.
|
173
|
+
if %w(owg svg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Number) && position_or_angle.numerator_units.include?("deg")
|
174
|
+
false
|
175
|
+
else
|
176
|
+
super
|
177
|
+
end
|
178
|
+
end
|
179
|
+
|
173
180
|
# Output the original webkit gradient syntax
|
174
181
|
def to_owg(options = self.options)
|
175
182
|
args = []
|
@@ -110,7 +110,7 @@ module Compass::SassExtensions::Functions::Sprites
|
|
110
110
|
unless VALID_SELECTORS.include?(selector.value)
|
111
111
|
raise Sass::SyntaxError, "Invalid Selctor did you mean one of: #{VALID_SELECTORS.join(', ')}"
|
112
112
|
end
|
113
|
-
Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite)
|
113
|
+
Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite.value)
|
114
114
|
end
|
115
115
|
|
116
116
|
Sass::Script::Functions.declare :sprite_has_selector, [:map, :sprite, :selector]
|
@@ -176,10 +176,18 @@ module Compass::SassExtensions::Functions::Sprites
|
|
176
176
|
|
177
177
|
protected
|
178
178
|
|
179
|
+
def reversed_color_names
|
180
|
+
if Sass::Script::Color.const_defined?(:HTML4_COLORS_REVERSE)
|
181
|
+
Sass::Script::Color::HTML4_COLORS_REVERSE
|
182
|
+
else
|
183
|
+
Sass::Script::Color::COLOR_NAMES_REVERSE
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
179
187
|
def convert_sprite_name(sprite)
|
180
188
|
case sprite
|
181
189
|
when Sass::Script::Color
|
182
|
-
Sass::Script::String.new(
|
190
|
+
Sass::Script::String.new(reversed_color_names[sprite.rgb])
|
183
191
|
when Sass::Script::Bool
|
184
192
|
Sass::Script::String.new(sprite.to_s)
|
185
193
|
else
|
@@ -9,11 +9,11 @@ module Compass
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def construct_sprite
|
12
|
-
raise ::Compass::Error, "You must
|
12
|
+
raise ::Compass::Error, "You must implement construct_sprite"
|
13
13
|
end
|
14
14
|
|
15
15
|
def save(filename)
|
16
|
-
raise ::Compass::Error, "You must
|
16
|
+
raise ::Compass::Error, "You must implement save(filename)"
|
17
17
|
end
|
18
18
|
|
19
19
|
end
|
@@ -22,4 +22,4 @@ module Compass
|
|
22
22
|
end
|
23
23
|
|
24
24
|
|
25
|
-
require 'compass/sass_extensions/sprites/engines/chunky_png_engine'
|
25
|
+
require 'compass/sass_extensions/sprites/engines/chunky_png_engine'
|
@@ -15,17 +15,19 @@ module Compass
|
|
15
15
|
input_png = ChunkyPNG::Image.from_file(image.file)
|
16
16
|
canvas.replace! input_png, image.left, image.top
|
17
17
|
end
|
18
|
-
end
|
19
|
-
|
18
|
+
end
|
19
|
+
|
20
20
|
def save(filename)
|
21
21
|
if canvas.nil?
|
22
22
|
construct_sprite
|
23
23
|
end
|
24
|
-
|
25
|
-
|
24
|
+
|
25
|
+
Sass::Util.atomic_create_and_write_file(filename) do |file|
|
26
|
+
canvas.write(file, Compass.configuration.chunky_png_options)
|
27
|
+
end
|
26
28
|
end
|
27
|
-
|
29
|
+
|
28
30
|
end
|
29
31
|
end
|
30
32
|
end
|
31
|
-
end
|
33
|
+
end
|
@@ -68,7 +68,8 @@ module Compass
|
|
68
68
|
end
|
69
69
|
|
70
70
|
def cleanup_old_sprites
|
71
|
-
Dir[File.join(Compass.configuration.
|
71
|
+
Dir[File.join(Compass.configuration.generated_images_path, "#{path}-s*.png")].each do |file|
|
72
|
+
next if file[filename]
|
72
73
|
log :remove, file
|
73
74
|
FileUtils.rm file
|
74
75
|
Compass.configuration.run_sprite_removed(file)
|
@@ -138,4 +139,4 @@ module Compass
|
|
138
139
|
end
|
139
140
|
end
|
140
141
|
end
|
141
|
-
end
|
142
|
+
end
|
@@ -97,7 +97,7 @@ module Compass
|
|
97
97
|
|
98
98
|
# Returns the sass_options for this sprite
|
99
99
|
def self.sass_options(uri, importer, options)
|
100
|
-
options.merge!(:filename => uri, :syntax => :scss, :importer => importer)
|
100
|
+
options.merge!(:filename => uri.gsub(%r{\*/},"*\\/"), :syntax => :scss, :importer => importer)
|
101
101
|
end
|
102
102
|
|
103
103
|
# Returns a Sass::Engine for this sprite object
|
data/lib/compass/version.rb
CHANGED
@@ -1,5 +1,12 @@
|
|
1
1
|
module Compass
|
2
2
|
module Version
|
3
|
+
VERSION_DETAILS = {
|
4
|
+
:major => 0,
|
5
|
+
:minor => 12,
|
6
|
+
:build => 7,
|
7
|
+
:name => "Alnilam"
|
8
|
+
}
|
9
|
+
|
3
10
|
# Returns a hash representing the version.
|
4
11
|
# The :major, :minor, and :teeny keys have their respective numbers.
|
5
12
|
# The :string key contains a human-readable string representation of the version.
|
@@ -21,13 +28,13 @@ module Compass
|
|
21
28
|
end
|
22
29
|
|
23
30
|
def read_version
|
24
|
-
|
25
|
-
@version = YAML::load(File.read(scope('VERSION.yml')))
|
31
|
+
@version = VERSION_DETAILS.dup
|
26
32
|
@version[:teeny] = @version[:patch]
|
27
33
|
@version[:string] = "#{@version[:major]}.#{@version[:minor]}"
|
28
34
|
@version[:string] << ".#{@version[:patch]}" if @version[:patch]
|
29
|
-
@version[:string] << ".#{@version[:state]}" if @version[:state]
|
30
35
|
@version[:string] << ".#{@version[:build]}" if @version[:build]
|
36
|
+
@version[:string] << ".#{@version[:state]}" if @version[:state]
|
37
|
+
@version[:string] << ".#{@version[:iteration]}" if @version[:iteration]
|
31
38
|
if !ENV['OFFICIAL'] && r = revision
|
32
39
|
@version[:string] << ".#{r[0..6]}"
|
33
40
|
end
|
@@ -44,16 +51,13 @@ module Compass
|
|
44
51
|
`git rev-parse HEAD`
|
45
52
|
end
|
46
53
|
end
|
54
|
+
rescue
|
55
|
+
nil
|
47
56
|
end
|
48
57
|
|
49
58
|
end
|
59
|
+
|
50
60
|
extend Compass::Version
|
51
|
-
|
52
|
-
|
53
|
-
if const == :VERSION
|
54
|
-
version[:string]
|
55
|
-
else
|
56
|
-
super
|
57
|
-
end
|
58
|
-
end
|
61
|
+
|
62
|
+
VERSION = version[:string]
|
59
63
|
end
|
@@ -14,11 +14,11 @@ time, mark, audio, video {
|
|
14
14
|
margin: 0;
|
15
15
|
padding: 0;
|
16
16
|
border: 0;
|
17
|
-
font-size: 100%;
|
18
17
|
font: inherit;
|
18
|
+
font-size: 100%;
|
19
19
|
vertical-align: baseline; }
|
20
20
|
|
21
|
-
|
21
|
+
html {
|
22
22
|
line-height: 1; }
|
23
23
|
|
24
24
|
ol, ul {
|
@@ -665,11 +665,10 @@ input.span-24, textarea.span-24, select.span-24 {
|
|
665
665
|
margin-bottom: 1.5em; }
|
666
666
|
|
667
667
|
.showgrid {
|
668
|
-
background-image: -webkit-gradient(linear, 50% 100%, 50% 0%, color-stop(5%, rgba(0, 0, 0, 0.5)), color-stop(5%, rgba(0, 0, 0, 0))), -webkit-gradient(linear, 0% 50%, 960 50%, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(0%, rgba(100, 100, 225, 0.25)), color-stop(3.125%, rgba(100, 100, 225, 0.25)), color-stop(3.125%, rgba(0, 0, 0, 0)), color-stop(4.
|
668
|
+
background-image: -webkit-gradient(linear, 50% 100%, 50% 0%, color-stop(5%, rgba(0, 0, 0, 0.5)), color-stop(5%, rgba(0, 0, 0, 0))), -webkit-gradient(linear, 0% 50%, 960 50%, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(0%, rgba(100, 100, 225, 0.25)), color-stop(3.125%, rgba(100, 100, 225, 0.25)), color-stop(3.125%, rgba(0, 0, 0, 0)), color-stop(4.16667%, rgba(0, 0, 0, 0)), color-stop(4.16667%, rgba(100, 100, 225, 0.25)), color-stop(7.29167%, rgba(100, 100, 225, 0.25)), color-stop(7.29167%, rgba(0, 0, 0, 0)), color-stop(8.33333%, rgba(0, 0, 0, 0)), color-stop(8.33333%, rgba(100, 100, 225, 0.25)), color-stop(11.45833%, rgba(100, 100, 225, 0.25)), color-stop(11.45833%, rgba(0, 0, 0, 0)), color-stop(12.5%, rgba(0, 0, 0, 0)), color-stop(12.5%, rgba(100, 100, 225, 0.25)), color-stop(15.625%, rgba(100, 100, 225, 0.25)), color-stop(15.625%, rgba(0, 0, 0, 0)), color-stop(16.66667%, rgba(0, 0, 0, 0)), color-stop(16.66667%, rgba(100, 100, 225, 0.25)), color-stop(19.79167%, rgba(100, 100, 225, 0.25)), color-stop(19.79167%, rgba(0, 0, 0, 0)), color-stop(20.83333%, rgba(0, 0, 0, 0)), color-stop(20.83333%, rgba(100, 100, 225, 0.25)), color-stop(23.95833%, rgba(100, 100, 225, 0.25)), color-stop(23.95833%, rgba(0, 0, 0, 0)), color-stop(25%, rgba(0, 0, 0, 0)), color-stop(25%, rgba(100, 100, 225, 0.25)), color-stop(28.125%, rgba(100, 100, 225, 0.25)), color-stop(28.125%, rgba(0, 0, 0, 0)), color-stop(29.16667%, rgba(0, 0, 0, 0)), color-stop(29.16667%, rgba(100, 100, 225, 0.25)), color-stop(32.29167%, rgba(100, 100, 225, 0.25)), color-stop(32.29167%, rgba(0, 0, 0, 0)), color-stop(33.33333%, rgba(0, 0, 0, 0)), color-stop(33.33333%, rgba(100, 100, 225, 0.25)), color-stop(36.45833%, rgba(100, 100, 225, 0.25)), color-stop(36.45833%, rgba(0, 0, 0, 0)), color-stop(37.5%, rgba(0, 0, 0, 0)), color-stop(37.5%, rgba(100, 100, 225, 0.25)), color-stop(40.625%, rgba(100, 100, 225, 0.25)), color-stop(40.625%, rgba(0, 0, 0, 0)), color-stop(41.66667%, rgba(0, 0, 0, 0)), color-stop(41.66667%, rgba(100, 100, 225, 0.25)), color-stop(44.79167%, rgba(100, 100, 225, 0.25)), color-stop(44.79167%, rgba(0, 0, 0, 0)), color-stop(45.83333%, rgba(0, 0, 0, 0)), color-stop(45.83333%, rgba(100, 100, 225, 0.25)), color-stop(48.95833%, rgba(100, 100, 225, 0.25)), color-stop(48.95833%, rgba(0, 0, 0, 0)), color-stop(50%, rgba(0, 0, 0, 0)), color-stop(50%, rgba(100, 100, 225, 0.25)), color-stop(53.125%, rgba(100, 100, 225, 0.25)), color-stop(53.125%, rgba(0, 0, 0, 0)), color-stop(54.16667%, rgba(0, 0, 0, 0)), color-stop(54.16667%, rgba(100, 100, 225, 0.25)), color-stop(57.29167%, rgba(100, 100, 225, 0.25)), color-stop(57.29167%, rgba(0, 0, 0, 0)), color-stop(58.33333%, rgba(0, 0, 0, 0)), color-stop(58.33333%, rgba(100, 100, 225, 0.25)), color-stop(61.45833%, rgba(100, 100, 225, 0.25)), color-stop(61.45833%, rgba(0, 0, 0, 0)), color-stop(62.5%, rgba(0, 0, 0, 0)), color-stop(62.5%, rgba(100, 100, 225, 0.25)), color-stop(65.625%, rgba(100, 100, 225, 0.25)), color-stop(65.625%, rgba(0, 0, 0, 0)), color-stop(66.66667%, rgba(0, 0, 0, 0)), color-stop(66.66667%, rgba(100, 100, 225, 0.25)), color-stop(69.79167%, rgba(100, 100, 225, 0.25)), color-stop(69.79167%, rgba(0, 0, 0, 0)), color-stop(70.83333%, rgba(0, 0, 0, 0)), color-stop(70.83333%, rgba(100, 100, 225, 0.25)), color-stop(73.95833%, rgba(100, 100, 225, 0.25)), color-stop(73.95833%, rgba(0, 0, 0, 0)), color-stop(75%, rgba(0, 0, 0, 0)), color-stop(75%, rgba(100, 100, 225, 0.25)), color-stop(78.125%, rgba(100, 100, 225, 0.25)), color-stop(78.125%, rgba(0, 0, 0, 0)), color-stop(79.16667%, rgba(0, 0, 0, 0)), color-stop(79.16667%, rgba(100, 100, 225, 0.25)), color-stop(82.29167%, rgba(100, 100, 225, 0.25)), color-stop(82.29167%, rgba(0, 0, 0, 0)), color-stop(83.33333%, rgba(0, 0, 0, 0)), color-stop(83.33333%, rgba(100, 100, 225, 0.25)), color-stop(86.45833%, rgba(100, 100, 225, 0.25)), color-stop(86.45833%, rgba(0, 0, 0, 0)), color-stop(87.5%, rgba(0, 0, 0, 0)), color-stop(87.5%, rgba(100, 100, 225, 0.25)), color-stop(90.625%, rgba(100, 100, 225, 0.25)), color-stop(90.625%, rgba(0, 0, 0, 0)), color-stop(91.66667%, rgba(0, 0, 0, 0)), color-stop(91.66667%, rgba(100, 100, 225, 0.25)), color-stop(94.79167%, rgba(100, 100, 225, 0.25)), color-stop(94.79167%, rgba(0, 0, 0, 0)), color-stop(95.83333%, rgba(0, 0, 0, 0)), color-stop(95.83333%, rgba(100, 100, 225, 0.25)), color-stop(98.95833%, rgba(100, 100, 225, 0.25)), color-stop(98.95833%, rgba(0, 0, 0, 0)), color-stop(100%, rgba(0, 0, 0, 0)));
|
669
669
|
background-image: -webkit-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -webkit-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px);
|
670
670
|
background-image: -moz-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -moz-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px);
|
671
671
|
background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -o-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px);
|
672
|
-
background-image: -ms-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -ms-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px);
|
673
672
|
background-image: linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px);
|
674
673
|
-webkit-background-size: 100% 18px, auto;
|
675
674
|
-moz-background-size: 100% 18px, auto;
|
@@ -1,9 +1,10 @@
|
|
1
1
|
a {
|
2
|
-
display: -moz-inline-
|
3
|
-
-moz-box-orient: vertical;
|
2
|
+
display: -moz-inline-stack;
|
4
3
|
display: inline-block;
|
5
4
|
vertical-align: middle;
|
6
5
|
*vertical-align: auto;
|
6
|
+
zoom: 1;
|
7
|
+
*display: inline;
|
7
8
|
margin: 0.7em 0.5em 0.7em 0;
|
8
9
|
border-width: 1px;
|
9
10
|
border-style: solid;
|
@@ -14,8 +15,6 @@ a {
|
|
14
15
|
text-decoration: none;
|
15
16
|
cursor: pointer;
|
16
17
|
padding: 5px 10px 5px 7px; }
|
17
|
-
a {
|
18
|
-
*display: inline; }
|
19
18
|
a img {
|
20
19
|
margin: 0 3px -3px 0 !important;
|
21
20
|
padding: 0;
|
@@ -25,11 +24,12 @@ a {
|
|
25
24
|
float: none; }
|
26
25
|
|
27
26
|
button {
|
28
|
-
display: -moz-inline-
|
29
|
-
-moz-box-orient: vertical;
|
27
|
+
display: -moz-inline-stack;
|
30
28
|
display: inline-block;
|
31
29
|
vertical-align: middle;
|
32
30
|
*vertical-align: auto;
|
31
|
+
zoom: 1;
|
32
|
+
*display: inline;
|
33
33
|
margin: 0.7em 0.5em 0.7em 0;
|
34
34
|
border-width: 1px;
|
35
35
|
border-style: solid;
|
@@ -42,8 +42,6 @@ button {
|
|
42
42
|
width: auto;
|
43
43
|
overflow: visible;
|
44
44
|
padding: 4px 10px 3px 7px; }
|
45
|
-
button {
|
46
|
-
*display: inline; }
|
47
45
|
button img {
|
48
46
|
margin: 0 3px -3px 0 !important;
|
49
47
|
padding: 0;
|