compass 0.10.1 → 0.10.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION.yml +1 -1
- data/features/command_line.feature +35 -11
- data/features/extensions.feature +4 -2
- data/features/step_definitions/command_line_steps.rb +3 -0
- data/features/step_definitions/extension_steps.rb +10 -1
- data/frameworks/blueprint/stylesheets/blueprint/_utilities.scss +1 -1
- data/frameworks/blueprint/templates/basic/manifest.rb +1 -1
- data/frameworks/blueprint/templates/basic/screen.sass +1 -0
- data/frameworks/blueprint/templates/project/ie.sass +1 -1
- data/frameworks/blueprint/templates/project/print.sass +1 -1
- data/frameworks/blueprint/templates/project/screen.sass +6 -3
- data/frameworks/blueprint/templates/semantic/manifest.rb +1 -1
- data/frameworks/blueprint/templates/semantic/print.sass +0 -3
- data/frameworks/compass/stylesheets/compass/css3/_gradient.scss +9 -6
- data/frameworks/compass/stylesheets/compass/css3/_transition.scss +3 -1
- data/lib/compass/app_integration/rails.rb +8 -0
- data/lib/compass/app_integration/rails/installer.rb +1 -1
- data/lib/compass/commands/help.rb +1 -11
- data/lib/compass/commands/installer_command.rb +1 -5
- data/lib/compass/commands/list_frameworks.rb +19 -2
- data/lib/compass/commands/project_base.rb +4 -2
- data/lib/compass/commands/update_project.rb +7 -3
- data/lib/compass/configuration/helpers.rb +2 -2
- data/lib/compass/frameworks.rb +21 -0
- data/lib/compass/sass_extensions/functions/image_size.rb +2 -2
- data/lib/compass/stats.rb +3 -1
- data/test/command_line_test.rb +0 -5
- data/test/compass_test.rb +21 -8
- data/test/fixtures/stylesheets/blueprint/css/ie.css +60 -0
- data/test/fixtures/stylesheets/blueprint/css/print.css +56 -0
- data/test/fixtures/stylesheets/blueprint/css/screen.css +804 -0
- data/test/fixtures/stylesheets/blueprint/css/single-imports/utilities.css +37 -0
- data/test/fixtures/stylesheets/blueprint/sass/single-imports/utilities.sass +3 -0
- data/test/fixtures/stylesheets/compass/css/print.css +1 -2
- data/test/fixtures/stylesheets/compass/sass/utilities.scss +9 -0
- data/test/fixtures/stylesheets/image_urls/css/screen.css +0 -2
- data/test/fixtures/stylesheets/image_urls/sass/screen.sass +2 -2
- data/test/fixtures/stylesheets/relative/css/ie.css +1 -1
- data/test/rails_integration_test.rb +2 -2
- metadata +15 -5
- data/test/fixtures/stylesheets/compass/sass/utilities.sass +0 -7
@@ -78,7 +78,7 @@ module Compass
|
|
78
78
|
options = args.last.is_a?(Hash) ? args.pop : {}
|
79
79
|
configuration_file_path = args.shift || detect_configuration_file
|
80
80
|
raise ArgumentError, "Too many arguments" if args.any?
|
81
|
-
if configuration_file_path
|
81
|
+
if configuration_file_path && File.exists?(configuration_file_path)
|
82
82
|
|
83
83
|
data = configuration_for(configuration_file_path)
|
84
84
|
|
@@ -92,7 +92,7 @@ module Compass
|
|
92
92
|
|
93
93
|
add_configuration(data)
|
94
94
|
else
|
95
|
-
add_configuration(options[:project_type] || configuration.
|
95
|
+
add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
|
96
96
|
end
|
97
97
|
end
|
98
98
|
|
data/lib/compass/frameworks.rb
CHANGED
@@ -97,6 +97,27 @@ module Compass
|
|
97
97
|
end
|
98
98
|
end
|
99
99
|
|
100
|
+
def pretty_print
|
101
|
+
result = ""
|
102
|
+
max = Compass::Frameworks::ALL.inject(0) do |gm, framework|
|
103
|
+
fm = framework.template_directories.inject(0) do |lm,pattern|
|
104
|
+
[lm, 7 + framework.name.size + pattern.size].max
|
105
|
+
end
|
106
|
+
[gm, fm].max
|
107
|
+
end
|
108
|
+
Compass::Frameworks::ALL.each do |framework|
|
109
|
+
next if framework.name =~ /^_/
|
110
|
+
result << " * #{framework.name}\n"
|
111
|
+
framework.template_directories.each do |pattern|
|
112
|
+
result << " - #{framework.name}/#{pattern}".ljust(max)
|
113
|
+
if description = framework.manifest(pattern).description
|
114
|
+
result << " - #{description}"
|
115
|
+
end
|
116
|
+
result << "\n"
|
117
|
+
end
|
118
|
+
end
|
119
|
+
result
|
120
|
+
end
|
100
121
|
end
|
101
122
|
end
|
102
123
|
|
@@ -38,11 +38,11 @@ private
|
|
38
38
|
|
39
39
|
private
|
40
40
|
def get_size_for_png
|
41
|
-
|
41
|
+
File.open(@file, "rb") {|io| io.read}[0x10..0x18].unpack('NN')
|
42
42
|
end
|
43
43
|
|
44
44
|
def get_size_for_gif
|
45
|
-
|
45
|
+
File.open(@file, "rb") {|io| io.read}[6..10].unpack('SS')
|
46
46
|
end
|
47
47
|
|
48
48
|
def get_size_for_jpg
|
data/lib/compass/stats.rb
CHANGED
@@ -62,7 +62,9 @@ module Compass
|
|
62
62
|
@contents ||= File.read(path)
|
63
63
|
end
|
64
64
|
def tree
|
65
|
-
|
65
|
+
opts = Compass.configuration.to_sass_engine_options
|
66
|
+
opts[:syntax] = path[-4..-1].to_sym
|
67
|
+
@tree = Sass::Engine.new(contents, opts).to_tree
|
66
68
|
end
|
67
69
|
def visit_tree!
|
68
70
|
@visitor = StatsVisitor.new
|
data/test/command_line_test.rb
CHANGED
@@ -18,11 +18,6 @@ class CommandLineTest < Test::Unit::TestCase
|
|
18
18
|
assert_match /\d+\.\d+\.\d+( [0-9a-f]+)?/, @last_result
|
19
19
|
end
|
20
20
|
|
21
|
-
def test_list_frameworks
|
22
|
-
compass "--list-frameworks"
|
23
|
-
assert_equal(%w(blueprint compass), @last_result.split.sort)
|
24
|
-
end
|
25
|
-
|
26
21
|
def test_basic_install
|
27
22
|
within_tmp_directory do
|
28
23
|
compass "--boring", "basic"
|
data/test/compass_test.rb
CHANGED
@@ -33,7 +33,9 @@ class CompassTest < Test::Unit::TestCase
|
|
33
33
|
each_css_file(proj.css_path) do |css_file|
|
34
34
|
assert_no_errors css_file, :blueprint
|
35
35
|
end
|
36
|
-
|
36
|
+
each_sass_file do |sass_file|
|
37
|
+
assert_renders_correctly sass_file
|
38
|
+
end
|
37
39
|
end
|
38
40
|
end
|
39
41
|
|
@@ -42,7 +44,9 @@ class CompassTest < Test::Unit::TestCase
|
|
42
44
|
each_css_file(proj.css_path) do |css_file|
|
43
45
|
assert_no_errors css_file, 'compass'
|
44
46
|
end
|
45
|
-
|
47
|
+
each_sass_file do |sass_file|
|
48
|
+
assert_renders_correctly sass_file
|
49
|
+
end
|
46
50
|
end
|
47
51
|
end
|
48
52
|
|
@@ -51,16 +55,20 @@ class CompassTest < Test::Unit::TestCase
|
|
51
55
|
each_css_file(proj.css_path) do |css_file|
|
52
56
|
assert_no_errors css_file, 'image_urls'
|
53
57
|
end
|
54
|
-
|
58
|
+
each_sass_file do |sass_file|
|
59
|
+
assert_renders_correctly sass_file
|
60
|
+
end
|
55
61
|
end
|
56
62
|
end
|
57
63
|
|
58
|
-
def
|
64
|
+
def test_relative
|
59
65
|
within_project('relative') do |proj|
|
60
66
|
each_css_file(proj.css_path) do |css_file|
|
61
67
|
assert_no_errors css_file, 'relative'
|
62
68
|
end
|
63
|
-
|
69
|
+
each_sass_file do |sass_file|
|
70
|
+
assert_renders_correctly sass_file
|
71
|
+
end
|
64
72
|
end
|
65
73
|
end
|
66
74
|
|
@@ -104,9 +112,14 @@ private
|
|
104
112
|
raise
|
105
113
|
end
|
106
114
|
|
107
|
-
def each_css_file(dir)
|
108
|
-
Dir.glob("#{dir}/**/*.css").each
|
109
|
-
|
115
|
+
def each_css_file(dir, &block)
|
116
|
+
Dir.glob("#{dir}/**/*.css").each(&block)
|
117
|
+
end
|
118
|
+
|
119
|
+
def each_sass_file(sass_dir = nil)
|
120
|
+
sass_dir ||= template_path(@current_project)
|
121
|
+
Dir.glob("#{sass_dir}/**/*.s[ac]ss").each do |sass_file|
|
122
|
+
yield sass_file[(sass_dir.length+1)..-6]
|
110
123
|
end
|
111
124
|
end
|
112
125
|
|
@@ -0,0 +1,60 @@
|
|
1
|
+
body {
|
2
|
+
text-align: center; }
|
3
|
+
* html body legend {
|
4
|
+
margin: 0px -8px 16px 0;
|
5
|
+
padding: 0; }
|
6
|
+
html > body p code {
|
7
|
+
*white-space: normal; }
|
8
|
+
|
9
|
+
.container {
|
10
|
+
text-align: left; }
|
11
|
+
|
12
|
+
sup {
|
13
|
+
vertical-align: text-top; }
|
14
|
+
|
15
|
+
sub {
|
16
|
+
vertical-align: text-bottom; }
|
17
|
+
|
18
|
+
hr {
|
19
|
+
margin: -8px auto 11px; }
|
20
|
+
|
21
|
+
img {
|
22
|
+
-ms-interpolation-mode: bicubic; }
|
23
|
+
|
24
|
+
fieldset {
|
25
|
+
padding-top: 0; }
|
26
|
+
|
27
|
+
textarea {
|
28
|
+
overflow: auto; }
|
29
|
+
|
30
|
+
input.text {
|
31
|
+
margin: 0.5em 0;
|
32
|
+
background-color: white;
|
33
|
+
border: 1px solid #bbbbbb; }
|
34
|
+
input.text:focus {
|
35
|
+
border: 1px solid #666666; }
|
36
|
+
input.title {
|
37
|
+
margin: 0.5em 0;
|
38
|
+
background-color: white;
|
39
|
+
border: 1px solid #bbbbbb; }
|
40
|
+
input.title:focus {
|
41
|
+
border: 1px solid #666666; }
|
42
|
+
input.checkbox {
|
43
|
+
position: relative;
|
44
|
+
top: 0.25em; }
|
45
|
+
input.radio {
|
46
|
+
position: relative;
|
47
|
+
top: 0.25em; }
|
48
|
+
input.button {
|
49
|
+
position: relative;
|
50
|
+
top: 0.25em; }
|
51
|
+
|
52
|
+
textarea {
|
53
|
+
margin: 0.5em 0; }
|
54
|
+
|
55
|
+
select {
|
56
|
+
margin: 0.5em 0; }
|
57
|
+
|
58
|
+
button {
|
59
|
+
position: relative;
|
60
|
+
top: 0.25em; }
|
@@ -0,0 +1,56 @@
|
|
1
|
+
body {
|
2
|
+
line-height: 1.5;
|
3
|
+
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
4
|
+
color: black;
|
5
|
+
background: none;
|
6
|
+
font-size: 10pt; }
|
7
|
+
|
8
|
+
.container {
|
9
|
+
background: none; }
|
10
|
+
|
11
|
+
hr {
|
12
|
+
background: #cccccc;
|
13
|
+
color: #cccccc;
|
14
|
+
width: 100%;
|
15
|
+
height: 2px;
|
16
|
+
margin: 2em 0;
|
17
|
+
padding: 0;
|
18
|
+
border: none; }
|
19
|
+
hr.space {
|
20
|
+
background: white;
|
21
|
+
color: white; }
|
22
|
+
|
23
|
+
h1, h2, h3, h4, h5, h6 {
|
24
|
+
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
|
25
|
+
|
26
|
+
code {
|
27
|
+
font-size: 0.9em;
|
28
|
+
font-family: "andale mono", "lucida console", monospace; }
|
29
|
+
|
30
|
+
a img {
|
31
|
+
border: none; }
|
32
|
+
a:link, a:visited {
|
33
|
+
background: transparent;
|
34
|
+
font-weight: 700;
|
35
|
+
text-decoration: underline; }
|
36
|
+
|
37
|
+
p img.top {
|
38
|
+
margin-top: 0; }
|
39
|
+
|
40
|
+
blockquote {
|
41
|
+
margin: 1.5em;
|
42
|
+
padding: 1em;
|
43
|
+
font-style: italic;
|
44
|
+
font-size: 0.9em; }
|
45
|
+
|
46
|
+
.small {
|
47
|
+
font-size: 0.9em; }
|
48
|
+
|
49
|
+
.large {
|
50
|
+
font-size: 1.1em; }
|
51
|
+
|
52
|
+
.quiet {
|
53
|
+
color: #999999; }
|
54
|
+
|
55
|
+
.hide {
|
56
|
+
display: none; }
|
@@ -0,0 +1,804 @@
|
|
1
|
+
html, body, div, span, applet, object, iframe,
|
2
|
+
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
3
|
+
a, abbr, acronym, address, big, cite, code,
|
4
|
+
del, dfn, em, font, img, ins, kbd, q, s, samp,
|
5
|
+
small, strike, strong, sub, sup, tt, var,
|
6
|
+
dl, dt, dd, ol, ul, li,
|
7
|
+
fieldset, form, label, legend,
|
8
|
+
table, caption, tbody, tfoot, thead, tr, th, td {
|
9
|
+
margin: 0;
|
10
|
+
padding: 0;
|
11
|
+
border: 0;
|
12
|
+
outline: 0;
|
13
|
+
font-weight: inherit;
|
14
|
+
font-style: inherit;
|
15
|
+
font-size: 100%;
|
16
|
+
font-family: inherit;
|
17
|
+
vertical-align: baseline; }
|
18
|
+
|
19
|
+
body {
|
20
|
+
line-height: 1;
|
21
|
+
color: black;
|
22
|
+
background: white; }
|
23
|
+
|
24
|
+
ol, ul {
|
25
|
+
list-style: none; }
|
26
|
+
|
27
|
+
table {
|
28
|
+
border-collapse: separate;
|
29
|
+
border-spacing: 0;
|
30
|
+
vertical-align: middle; }
|
31
|
+
|
32
|
+
caption, th, td {
|
33
|
+
text-align: left;
|
34
|
+
font-weight: normal;
|
35
|
+
vertical-align: middle; }
|
36
|
+
|
37
|
+
q, blockquote {
|
38
|
+
quotes: "" ""; }
|
39
|
+
q:before, q:after, blockquote:before, blockquote:after {
|
40
|
+
content: ""; }
|
41
|
+
|
42
|
+
a img {
|
43
|
+
border: none; }
|
44
|
+
|
45
|
+
body {
|
46
|
+
line-height: 1.5;
|
47
|
+
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
48
|
+
color: #333333;
|
49
|
+
font-size: 75%; }
|
50
|
+
|
51
|
+
h1, h2, h3, h4, h5, h6 {
|
52
|
+
font-weight: normal;
|
53
|
+
color: #222222; }
|
54
|
+
h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {
|
55
|
+
margin: 0; }
|
56
|
+
|
57
|
+
h1 {
|
58
|
+
font-size: 3em;
|
59
|
+
line-height: 1;
|
60
|
+
margin-bottom: 0.50em; }
|
61
|
+
|
62
|
+
h2 {
|
63
|
+
font-size: 2em;
|
64
|
+
margin-bottom: 0.75em; }
|
65
|
+
|
66
|
+
h3 {
|
67
|
+
font-size: 1.5em;
|
68
|
+
line-height: 1;
|
69
|
+
margin-bottom: 1.00em; }
|
70
|
+
|
71
|
+
h4 {
|
72
|
+
font-size: 1.2em;
|
73
|
+
line-height: 1.25;
|
74
|
+
margin-bottom: 1.25em; }
|
75
|
+
|
76
|
+
h5 {
|
77
|
+
font-size: 1em;
|
78
|
+
font-weight: bold;
|
79
|
+
margin-bottom: 1.50em; }
|
80
|
+
|
81
|
+
h6 {
|
82
|
+
font-size: 1em;
|
83
|
+
font-weight: bold; }
|
84
|
+
|
85
|
+
p {
|
86
|
+
margin: 0 0 1.5em; }
|
87
|
+
p img.left {
|
88
|
+
display: inline;
|
89
|
+
float: left;
|
90
|
+
margin: 1.5em 1.5em 1.5em 0;
|
91
|
+
padding: 0; }
|
92
|
+
p img.right {
|
93
|
+
display: inline;
|
94
|
+
float: right;
|
95
|
+
margin: 1.5em 0 1.5em 1.5em;
|
96
|
+
padding: 0; }
|
97
|
+
|
98
|
+
a {
|
99
|
+
text-decoration: underline;
|
100
|
+
color: #000099; }
|
101
|
+
a:visited {
|
102
|
+
color: #000066; }
|
103
|
+
a:focus {
|
104
|
+
color: black; }
|
105
|
+
a:hover {
|
106
|
+
color: black; }
|
107
|
+
a:active {
|
108
|
+
color: #cc0099; }
|
109
|
+
|
110
|
+
blockquote {
|
111
|
+
margin: 1.5em;
|
112
|
+
color: #666666;
|
113
|
+
font-style: italic; }
|
114
|
+
|
115
|
+
strong {
|
116
|
+
font-weight: bold; }
|
117
|
+
|
118
|
+
em {
|
119
|
+
font-style: italic; }
|
120
|
+
|
121
|
+
dfn {
|
122
|
+
font-style: italic;
|
123
|
+
font-weight: bold; }
|
124
|
+
|
125
|
+
sup, sub {
|
126
|
+
line-height: 0; }
|
127
|
+
|
128
|
+
abbr, acronym {
|
129
|
+
border-bottom: 1px dotted #666666; }
|
130
|
+
|
131
|
+
address {
|
132
|
+
margin: 0 0 1.5em;
|
133
|
+
font-style: italic; }
|
134
|
+
|
135
|
+
del {
|
136
|
+
color: #666666; }
|
137
|
+
|
138
|
+
pre {
|
139
|
+
margin: 1.5em 0;
|
140
|
+
white-space: pre; }
|
141
|
+
|
142
|
+
pre, code, tt {
|
143
|
+
font: 1em "andale mono", "lucida console", monospace;
|
144
|
+
line-height: 1.5; }
|
145
|
+
|
146
|
+
li ul, li ol {
|
147
|
+
margin: 0; }
|
148
|
+
|
149
|
+
ul, ol {
|
150
|
+
margin: 0 1.5em 1.5em 0;
|
151
|
+
padding-left: 3.333em; }
|
152
|
+
|
153
|
+
ul {
|
154
|
+
list-style-type: disc; }
|
155
|
+
|
156
|
+
ol {
|
157
|
+
list-style-type: decimal; }
|
158
|
+
|
159
|
+
dl {
|
160
|
+
margin: 0 0 1.5em 0; }
|
161
|
+
dl dt {
|
162
|
+
font-weight: bold; }
|
163
|
+
|
164
|
+
dd {
|
165
|
+
margin-left: 1.5em; }
|
166
|
+
|
167
|
+
table {
|
168
|
+
margin-bottom: 1.4em;
|
169
|
+
width: 100%; }
|
170
|
+
|
171
|
+
th {
|
172
|
+
font-weight: bold; }
|
173
|
+
|
174
|
+
thead th {
|
175
|
+
background: #c3d9ff; }
|
176
|
+
|
177
|
+
th, td, caption {
|
178
|
+
padding: 4px 10px 4px 5px; }
|
179
|
+
|
180
|
+
tr.even td {
|
181
|
+
background: #e5ecf9; }
|
182
|
+
|
183
|
+
tfoot {
|
184
|
+
font-style: italic; }
|
185
|
+
|
186
|
+
caption {
|
187
|
+
background: #eeeeee; }
|
188
|
+
|
189
|
+
.quiet {
|
190
|
+
color: #666666; }
|
191
|
+
|
192
|
+
.loud {
|
193
|
+
color: #111111; }
|
194
|
+
|
195
|
+
.clear {
|
196
|
+
clear: both; }
|
197
|
+
|
198
|
+
.nowrap {
|
199
|
+
white-space: nowrap; }
|
200
|
+
|
201
|
+
.clearfix {
|
202
|
+
overflow: hidden;
|
203
|
+
display: inline-block; }
|
204
|
+
.clearfix {
|
205
|
+
display: block; }
|
206
|
+
|
207
|
+
.small {
|
208
|
+
font-size: 0.8em;
|
209
|
+
margin-bottom: 1.875em;
|
210
|
+
line-height: 1.875em; }
|
211
|
+
|
212
|
+
.large {
|
213
|
+
font-size: 1.2em;
|
214
|
+
line-height: 2.5em;
|
215
|
+
margin-bottom: 1.25em; }
|
216
|
+
|
217
|
+
.first {
|
218
|
+
margin-left: 0;
|
219
|
+
padding-left: 0; }
|
220
|
+
|
221
|
+
.last {
|
222
|
+
margin-right: 0;
|
223
|
+
padding-right: 0; }
|
224
|
+
|
225
|
+
.top {
|
226
|
+
margin-top: 0;
|
227
|
+
padding-top: 0; }
|
228
|
+
|
229
|
+
.bottom {
|
230
|
+
margin-bottom: 0;
|
231
|
+
padding-bottom: 0; }
|
232
|
+
|
233
|
+
.container {
|
234
|
+
width: 950px;
|
235
|
+
margin: 0 auto;
|
236
|
+
overflow: hidden;
|
237
|
+
display: inline-block; }
|
238
|
+
.container {
|
239
|
+
display: block; }
|
240
|
+
|
241
|
+
.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {
|
242
|
+
display: inline;
|
243
|
+
float: left;
|
244
|
+
margin-right: 10px; }
|
245
|
+
* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {
|
246
|
+
overflow-x: hidden; }
|
247
|
+
|
248
|
+
.last, div.last {
|
249
|
+
margin-right: 0; }
|
250
|
+
|
251
|
+
.span-1 {
|
252
|
+
width: 30px; }
|
253
|
+
|
254
|
+
.span-2 {
|
255
|
+
width: 70px; }
|
256
|
+
|
257
|
+
.span-3 {
|
258
|
+
width: 110px; }
|
259
|
+
|
260
|
+
.span-4 {
|
261
|
+
width: 150px; }
|
262
|
+
|
263
|
+
.span-5 {
|
264
|
+
width: 190px; }
|
265
|
+
|
266
|
+
.span-6 {
|
267
|
+
width: 230px; }
|
268
|
+
|
269
|
+
.span-7 {
|
270
|
+
width: 270px; }
|
271
|
+
|
272
|
+
.span-8 {
|
273
|
+
width: 310px; }
|
274
|
+
|
275
|
+
.span-9 {
|
276
|
+
width: 350px; }
|
277
|
+
|
278
|
+
.span-10 {
|
279
|
+
width: 390px; }
|
280
|
+
|
281
|
+
.span-11 {
|
282
|
+
width: 430px; }
|
283
|
+
|
284
|
+
.span-12 {
|
285
|
+
width: 470px; }
|
286
|
+
|
287
|
+
.span-13 {
|
288
|
+
width: 510px; }
|
289
|
+
|
290
|
+
.span-14 {
|
291
|
+
width: 550px; }
|
292
|
+
|
293
|
+
.span-15 {
|
294
|
+
width: 590px; }
|
295
|
+
|
296
|
+
.span-16 {
|
297
|
+
width: 630px; }
|
298
|
+
|
299
|
+
.span-17 {
|
300
|
+
width: 670px; }
|
301
|
+
|
302
|
+
.span-18 {
|
303
|
+
width: 710px; }
|
304
|
+
|
305
|
+
.span-19 {
|
306
|
+
width: 750px; }
|
307
|
+
|
308
|
+
.span-20 {
|
309
|
+
width: 790px; }
|
310
|
+
|
311
|
+
.span-21 {
|
312
|
+
width: 830px; }
|
313
|
+
|
314
|
+
.span-22 {
|
315
|
+
width: 870px; }
|
316
|
+
|
317
|
+
.span-23 {
|
318
|
+
width: 910px; }
|
319
|
+
|
320
|
+
.span-24, div.span-24 {
|
321
|
+
width: 950px;
|
322
|
+
margin: 0; }
|
323
|
+
|
324
|
+
input.span-1, textarea.span-1, select.span-1 {
|
325
|
+
width: 30px !important; }
|
326
|
+
input.span-2, textarea.span-2, select.span-2 {
|
327
|
+
width: 70px !important; }
|
328
|
+
input.span-3, textarea.span-3, select.span-3 {
|
329
|
+
width: 110px !important; }
|
330
|
+
input.span-4, textarea.span-4, select.span-4 {
|
331
|
+
width: 150px !important; }
|
332
|
+
input.span-5, textarea.span-5, select.span-5 {
|
333
|
+
width: 190px !important; }
|
334
|
+
input.span-6, textarea.span-6, select.span-6 {
|
335
|
+
width: 230px !important; }
|
336
|
+
input.span-7, textarea.span-7, select.span-7 {
|
337
|
+
width: 270px !important; }
|
338
|
+
input.span-8, textarea.span-8, select.span-8 {
|
339
|
+
width: 310px !important; }
|
340
|
+
input.span-9, textarea.span-9, select.span-9 {
|
341
|
+
width: 350px !important; }
|
342
|
+
input.span-10, textarea.span-10, select.span-10 {
|
343
|
+
width: 390px !important; }
|
344
|
+
input.span-11, textarea.span-11, select.span-11 {
|
345
|
+
width: 430px !important; }
|
346
|
+
input.span-12, textarea.span-12, select.span-12 {
|
347
|
+
width: 470px !important; }
|
348
|
+
input.span-13, textarea.span-13, select.span-13 {
|
349
|
+
width: 510px !important; }
|
350
|
+
input.span-14, textarea.span-14, select.span-14 {
|
351
|
+
width: 550px !important; }
|
352
|
+
input.span-15, textarea.span-15, select.span-15 {
|
353
|
+
width: 590px !important; }
|
354
|
+
input.span-16, textarea.span-16, select.span-16 {
|
355
|
+
width: 630px !important; }
|
356
|
+
input.span-17, textarea.span-17, select.span-17 {
|
357
|
+
width: 670px !important; }
|
358
|
+
input.span-18, textarea.span-18, select.span-18 {
|
359
|
+
width: 710px !important; }
|
360
|
+
input.span-19, textarea.span-19, select.span-19 {
|
361
|
+
width: 750px !important; }
|
362
|
+
input.span-20, textarea.span-20, select.span-20 {
|
363
|
+
width: 790px !important; }
|
364
|
+
input.span-21, textarea.span-21, select.span-21 {
|
365
|
+
width: 830px !important; }
|
366
|
+
input.span-22, textarea.span-22, select.span-22 {
|
367
|
+
width: 870px !important; }
|
368
|
+
input.span-23, textarea.span-23, select.span-23 {
|
369
|
+
width: 910px !important; }
|
370
|
+
input.span-24, textarea.span-24, select.span-24 {
|
371
|
+
width: 950px !important; }
|
372
|
+
|
373
|
+
.append-1 {
|
374
|
+
padding-right: 40px; }
|
375
|
+
|
376
|
+
.append-2 {
|
377
|
+
padding-right: 80px; }
|
378
|
+
|
379
|
+
.append-3 {
|
380
|
+
padding-right: 120px; }
|
381
|
+
|
382
|
+
.append-4 {
|
383
|
+
padding-right: 160px; }
|
384
|
+
|
385
|
+
.append-5 {
|
386
|
+
padding-right: 200px; }
|
387
|
+
|
388
|
+
.append-6 {
|
389
|
+
padding-right: 240px; }
|
390
|
+
|
391
|
+
.append-7 {
|
392
|
+
padding-right: 280px; }
|
393
|
+
|
394
|
+
.append-8 {
|
395
|
+
padding-right: 320px; }
|
396
|
+
|
397
|
+
.append-9 {
|
398
|
+
padding-right: 360px; }
|
399
|
+
|
400
|
+
.append-10 {
|
401
|
+
padding-right: 400px; }
|
402
|
+
|
403
|
+
.append-11 {
|
404
|
+
padding-right: 440px; }
|
405
|
+
|
406
|
+
.append-12 {
|
407
|
+
padding-right: 480px; }
|
408
|
+
|
409
|
+
.append-13 {
|
410
|
+
padding-right: 520px; }
|
411
|
+
|
412
|
+
.append-14 {
|
413
|
+
padding-right: 560px; }
|
414
|
+
|
415
|
+
.append-15 {
|
416
|
+
padding-right: 600px; }
|
417
|
+
|
418
|
+
.append-16 {
|
419
|
+
padding-right: 640px; }
|
420
|
+
|
421
|
+
.append-17 {
|
422
|
+
padding-right: 680px; }
|
423
|
+
|
424
|
+
.append-18 {
|
425
|
+
padding-right: 720px; }
|
426
|
+
|
427
|
+
.append-19 {
|
428
|
+
padding-right: 760px; }
|
429
|
+
|
430
|
+
.append-20 {
|
431
|
+
padding-right: 800px; }
|
432
|
+
|
433
|
+
.append-21 {
|
434
|
+
padding-right: 840px; }
|
435
|
+
|
436
|
+
.append-22 {
|
437
|
+
padding-right: 880px; }
|
438
|
+
|
439
|
+
.append-23 {
|
440
|
+
padding-right: 920px; }
|
441
|
+
|
442
|
+
.prepend-1 {
|
443
|
+
padding-left: 40px; }
|
444
|
+
|
445
|
+
.prepend-2 {
|
446
|
+
padding-left: 80px; }
|
447
|
+
|
448
|
+
.prepend-3 {
|
449
|
+
padding-left: 120px; }
|
450
|
+
|
451
|
+
.prepend-4 {
|
452
|
+
padding-left: 160px; }
|
453
|
+
|
454
|
+
.prepend-5 {
|
455
|
+
padding-left: 200px; }
|
456
|
+
|
457
|
+
.prepend-6 {
|
458
|
+
padding-left: 240px; }
|
459
|
+
|
460
|
+
.prepend-7 {
|
461
|
+
padding-left: 280px; }
|
462
|
+
|
463
|
+
.prepend-8 {
|
464
|
+
padding-left: 320px; }
|
465
|
+
|
466
|
+
.prepend-9 {
|
467
|
+
padding-left: 360px; }
|
468
|
+
|
469
|
+
.prepend-10 {
|
470
|
+
padding-left: 400px; }
|
471
|
+
|
472
|
+
.prepend-11 {
|
473
|
+
padding-left: 440px; }
|
474
|
+
|
475
|
+
.prepend-12 {
|
476
|
+
padding-left: 480px; }
|
477
|
+
|
478
|
+
.prepend-13 {
|
479
|
+
padding-left: 520px; }
|
480
|
+
|
481
|
+
.prepend-14 {
|
482
|
+
padding-left: 560px; }
|
483
|
+
|
484
|
+
.prepend-15 {
|
485
|
+
padding-left: 600px; }
|
486
|
+
|
487
|
+
.prepend-16 {
|
488
|
+
padding-left: 640px; }
|
489
|
+
|
490
|
+
.prepend-17 {
|
491
|
+
padding-left: 680px; }
|
492
|
+
|
493
|
+
.prepend-18 {
|
494
|
+
padding-left: 720px; }
|
495
|
+
|
496
|
+
.prepend-19 {
|
497
|
+
padding-left: 760px; }
|
498
|
+
|
499
|
+
.prepend-20 {
|
500
|
+
padding-left: 800px; }
|
501
|
+
|
502
|
+
.prepend-21 {
|
503
|
+
padding-left: 840px; }
|
504
|
+
|
505
|
+
.prepend-22 {
|
506
|
+
padding-left: 880px; }
|
507
|
+
|
508
|
+
.prepend-23 {
|
509
|
+
padding-left: 920px; }
|
510
|
+
|
511
|
+
.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {
|
512
|
+
display: inline;
|
513
|
+
float: left;
|
514
|
+
position: relative; }
|
515
|
+
|
516
|
+
.pull-1 {
|
517
|
+
margin-left: -40px; }
|
518
|
+
|
519
|
+
.pull-2 {
|
520
|
+
margin-left: -80px; }
|
521
|
+
|
522
|
+
.pull-3 {
|
523
|
+
margin-left: -120px; }
|
524
|
+
|
525
|
+
.pull-4 {
|
526
|
+
margin-left: -160px; }
|
527
|
+
|
528
|
+
.pull-5 {
|
529
|
+
margin-left: -200px; }
|
530
|
+
|
531
|
+
.pull-6 {
|
532
|
+
margin-left: -240px; }
|
533
|
+
|
534
|
+
.pull-7 {
|
535
|
+
margin-left: -280px; }
|
536
|
+
|
537
|
+
.pull-8 {
|
538
|
+
margin-left: -320px; }
|
539
|
+
|
540
|
+
.pull-9 {
|
541
|
+
margin-left: -360px; }
|
542
|
+
|
543
|
+
.pull-10 {
|
544
|
+
margin-left: -400px; }
|
545
|
+
|
546
|
+
.pull-11 {
|
547
|
+
margin-left: -440px; }
|
548
|
+
|
549
|
+
.pull-12 {
|
550
|
+
margin-left: -480px; }
|
551
|
+
|
552
|
+
.pull-13 {
|
553
|
+
margin-left: -520px; }
|
554
|
+
|
555
|
+
.pull-14 {
|
556
|
+
margin-left: -560px; }
|
557
|
+
|
558
|
+
.pull-15 {
|
559
|
+
margin-left: -600px; }
|
560
|
+
|
561
|
+
.pull-16 {
|
562
|
+
margin-left: -640px; }
|
563
|
+
|
564
|
+
.pull-17 {
|
565
|
+
margin-left: -680px; }
|
566
|
+
|
567
|
+
.pull-18 {
|
568
|
+
margin-left: -720px; }
|
569
|
+
|
570
|
+
.pull-19 {
|
571
|
+
margin-left: -760px; }
|
572
|
+
|
573
|
+
.pull-20 {
|
574
|
+
margin-left: -800px; }
|
575
|
+
|
576
|
+
.pull-21 {
|
577
|
+
margin-left: -840px; }
|
578
|
+
|
579
|
+
.pull-22 {
|
580
|
+
margin-left: -880px; }
|
581
|
+
|
582
|
+
.pull-23 {
|
583
|
+
margin-left: -920px; }
|
584
|
+
|
585
|
+
.pull-24 {
|
586
|
+
margin-left: -960px; }
|
587
|
+
|
588
|
+
.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {
|
589
|
+
display: inline;
|
590
|
+
float: right;
|
591
|
+
position: relative; }
|
592
|
+
|
593
|
+
.push-1 {
|
594
|
+
margin: 0 -40px 1.5em 40px; }
|
595
|
+
|
596
|
+
.push-2 {
|
597
|
+
margin: 0 -80px 1.5em 80px; }
|
598
|
+
|
599
|
+
.push-3 {
|
600
|
+
margin: 0 -120px 1.5em 120px; }
|
601
|
+
|
602
|
+
.push-4 {
|
603
|
+
margin: 0 -160px 1.5em 160px; }
|
604
|
+
|
605
|
+
.push-5 {
|
606
|
+
margin: 0 -200px 1.5em 200px; }
|
607
|
+
|
608
|
+
.push-6 {
|
609
|
+
margin: 0 -240px 1.5em 240px; }
|
610
|
+
|
611
|
+
.push-7 {
|
612
|
+
margin: 0 -280px 1.5em 280px; }
|
613
|
+
|
614
|
+
.push-8 {
|
615
|
+
margin: 0 -320px 1.5em 320px; }
|
616
|
+
|
617
|
+
.push-9 {
|
618
|
+
margin: 0 -360px 1.5em 360px; }
|
619
|
+
|
620
|
+
.push-10 {
|
621
|
+
margin: 0 -400px 1.5em 400px; }
|
622
|
+
|
623
|
+
.push-11 {
|
624
|
+
margin: 0 -440px 1.5em 440px; }
|
625
|
+
|
626
|
+
.push-12 {
|
627
|
+
margin: 0 -480px 1.5em 480px; }
|
628
|
+
|
629
|
+
.push-13 {
|
630
|
+
margin: 0 -520px 1.5em 520px; }
|
631
|
+
|
632
|
+
.push-14 {
|
633
|
+
margin: 0 -560px 1.5em 560px; }
|
634
|
+
|
635
|
+
.push-15 {
|
636
|
+
margin: 0 -600px 1.5em 600px; }
|
637
|
+
|
638
|
+
.push-16 {
|
639
|
+
margin: 0 -640px 1.5em 640px; }
|
640
|
+
|
641
|
+
.push-17 {
|
642
|
+
margin: 0 -680px 1.5em 680px; }
|
643
|
+
|
644
|
+
.push-18 {
|
645
|
+
margin: 0 -720px 1.5em 720px; }
|
646
|
+
|
647
|
+
.push-19 {
|
648
|
+
margin: 0 -760px 1.5em 760px; }
|
649
|
+
|
650
|
+
.push-20 {
|
651
|
+
margin: 0 -800px 1.5em 800px; }
|
652
|
+
|
653
|
+
.push-21 {
|
654
|
+
margin: 0 -840px 1.5em 840px; }
|
655
|
+
|
656
|
+
.push-22 {
|
657
|
+
margin: 0 -880px 1.5em 880px; }
|
658
|
+
|
659
|
+
.push-23 {
|
660
|
+
margin: 0 -920px 1.5em 920px; }
|
661
|
+
|
662
|
+
.push-24 {
|
663
|
+
margin: 0 -960px 1.5em 960px; }
|
664
|
+
|
665
|
+
.prepend-top {
|
666
|
+
margin-top: 1.5em; }
|
667
|
+
|
668
|
+
.append-bottom {
|
669
|
+
margin-bottom: 1.5em; }
|
670
|
+
|
671
|
+
.showgrid {
|
672
|
+
background: url('/images/grid.png?1275242906'); }
|
673
|
+
|
674
|
+
.error {
|
675
|
+
padding: 0.8em;
|
676
|
+
margin-bottom: 1em;
|
677
|
+
border: 2px solid #dddddd;
|
678
|
+
background: #fbe3e4;
|
679
|
+
color: #8a1f11;
|
680
|
+
border-color: #fbc2c4; }
|
681
|
+
.error a {
|
682
|
+
color: #8a1f11; }
|
683
|
+
|
684
|
+
.notice {
|
685
|
+
padding: 0.8em;
|
686
|
+
margin-bottom: 1em;
|
687
|
+
border: 2px solid #dddddd;
|
688
|
+
background: #fff6bf;
|
689
|
+
color: #514721;
|
690
|
+
border-color: #ffd324; }
|
691
|
+
.notice a {
|
692
|
+
color: #514721; }
|
693
|
+
|
694
|
+
.success {
|
695
|
+
padding: 0.8em;
|
696
|
+
margin-bottom: 1em;
|
697
|
+
border: 2px solid #dddddd;
|
698
|
+
background: #e6efc2;
|
699
|
+
color: #264409;
|
700
|
+
border-color: #c6d880; }
|
701
|
+
.success a {
|
702
|
+
color: #264409; }
|
703
|
+
|
704
|
+
.hide {
|
705
|
+
display: none; }
|
706
|
+
|
707
|
+
.highlight {
|
708
|
+
background: yellow; }
|
709
|
+
|
710
|
+
.added {
|
711
|
+
background: #006600;
|
712
|
+
color: white; }
|
713
|
+
|
714
|
+
.removed {
|
715
|
+
background: #990000;
|
716
|
+
color: white; }
|
717
|
+
|
718
|
+
label {
|
719
|
+
font-weight: bold; }
|
720
|
+
|
721
|
+
fieldset {
|
722
|
+
padding: 1.4em;
|
723
|
+
margin: 0 0 1.5em 0; }
|
724
|
+
|
725
|
+
legend {
|
726
|
+
font-weight: bold;
|
727
|
+
font-size: 1.2em; }
|
728
|
+
|
729
|
+
input.text, input.title, input[type=text], input[type=password] {
|
730
|
+
margin: 0.5em 0;
|
731
|
+
background-color: white;
|
732
|
+
padding: 5px; }
|
733
|
+
input.title {
|
734
|
+
font-size: 1.5em; }
|
735
|
+
input[type=checkbox], input.checkbox, input[type=radio], input.radio {
|
736
|
+
position: relative;
|
737
|
+
top: 0.25em; }
|
738
|
+
|
739
|
+
textarea {
|
740
|
+
margin: 0.5em 0;
|
741
|
+
padding: 5px; }
|
742
|
+
|
743
|
+
select {
|
744
|
+
margin: 0.5em 0; }
|
745
|
+
|
746
|
+
fieldset {
|
747
|
+
border: 1px solid #cccccc; }
|
748
|
+
|
749
|
+
input.text, input.title, input[type=text], input[type=password],
|
750
|
+
textarea, select {
|
751
|
+
border: 1px solid #bbbbbb; }
|
752
|
+
input.text:focus, input.title:focus, input[type=text]:focus, input[type=password]:focus,
|
753
|
+
textarea:focus, select:focus {
|
754
|
+
border: 1px solid #666666; }
|
755
|
+
|
756
|
+
input.text, input.title, input[type=text], input[type=password] {
|
757
|
+
width: 300px; }
|
758
|
+
|
759
|
+
textarea {
|
760
|
+
width: 390px;
|
761
|
+
height: 250px; }
|
762
|
+
|
763
|
+
#main.container #top {
|
764
|
+
display: inline;
|
765
|
+
float: left;
|
766
|
+
margin-right: 0;
|
767
|
+
width: 950px; }
|
768
|
+
* html #main.container #top {
|
769
|
+
overflow-x: hidden; }
|
770
|
+
#main.container #middle {
|
771
|
+
display: inline;
|
772
|
+
float: left;
|
773
|
+
margin-right: 0;
|
774
|
+
width: 950px; }
|
775
|
+
* html #main.container #middle {
|
776
|
+
overflow-x: hidden; }
|
777
|
+
#main.container #middle #left {
|
778
|
+
display: inline;
|
779
|
+
float: left;
|
780
|
+
margin-right: 10px;
|
781
|
+
width: 230px; }
|
782
|
+
* html #main.container #middle #left {
|
783
|
+
overflow-x: hidden; }
|
784
|
+
#main.container #middle #content {
|
785
|
+
display: inline;
|
786
|
+
float: left;
|
787
|
+
margin-right: 10px;
|
788
|
+
width: 470px; }
|
789
|
+
* html #main.container #middle #content {
|
790
|
+
overflow-x: hidden; }
|
791
|
+
#main.container #middle #right {
|
792
|
+
display: inline;
|
793
|
+
float: left;
|
794
|
+
margin-right: 0;
|
795
|
+
width: 230px; }
|
796
|
+
* html #main.container #middle #right {
|
797
|
+
overflow-x: hidden; }
|
798
|
+
#main.container #bottom {
|
799
|
+
display: inline;
|
800
|
+
float: left;
|
801
|
+
margin-right: 0;
|
802
|
+
width: 950px; }
|
803
|
+
* html #main.container #bottom {
|
804
|
+
overflow-x: hidden; }
|