From 67a7a37b429eb4a5d4080eb1a0a5d10b2342231a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 22 Nov 2009 22:14:18 -0800 Subject: [PATCH 01/10] Changes for blueprint commit 9be685760014b3258dcd83913b9b19f130551b2f --- .../frameworks/blueprint/stylesheets/blueprint/_ie.sass | 2 ++ .../frameworks/blueprint/stylesheets/blueprint/_print.sass | 3 --- .../frameworks/blueprint/stylesheets/blueprint/_reset.sass | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass index 5f732316..f4f6b2ca 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass @@ -68,6 +68,8 @@ -ms-interpolation-mode: bicubic fieldset padding-top: 0 + textarea + overflow: auto input &.text margin: 0.5em 0 diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass index 4ed82b27..25424725 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass @@ -62,9 +62,6 @@ font: size: .9em family= !blueprint_fixed_font_family - img - +float-left - margin: 1.5em 1.5em 1.5em 0 a img border: none diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass index 2045a794..a821fb48 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass @@ -3,6 +3,8 @@ =blueprint-global-reset html, body +blueprint-reset + html + font-size: 100.01% +blueprint-nested-reset // Reset all elements within some selector scope.To reset the selector itself, From 7f756f681af851a718012fda31cd6258d89b8d30 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Mon, 23 Nov 2009 15:16:16 -0800 Subject: [PATCH 02/10] Don't use methods not available in ruby 1.8.6 --- lib/compass/frameworks.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compass/frameworks.rb b/lib/compass/frameworks.rb index d856bcfe..b818b715 100644 --- a/lib/compass/frameworks.rb +++ b/lib/compass/frameworks.rb @@ -28,7 +28,7 @@ module Compass end def register(name, *arguments) - if idx = ALL.index{|f| f.name.to_s == name.to_s} + if idx = ALL.index(self[name]) ALL[idx] = Framework.new(name, *arguments) else ALL << Framework.new(name, *arguments) From f312a24012ceccf33e43216b5c663f57b24f886a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 08:06:20 -0800 Subject: [PATCH 03/10] fix broken test. --- test/fixtures/stylesheets/relative/css/screen.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/stylesheets/relative/css/screen.css b/test/fixtures/stylesheets/relative/css/screen.css index 126d8932..8c64d3b9 100644 --- a/test/fixtures/stylesheets/relative/css/screen.css +++ b/test/fixtures/stylesheets/relative/css/screen.css @@ -1 +1 @@ -test { background: url('../assets/images/testing.png?1258702388'); } +test { background: url('../assets/images/testing.png?1258839056'); } From 9b8830b8913686d7019e0347176e58a747c8a32a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 08:29:02 -0800 Subject: [PATCH 04/10] [Tests] Process expected result files thru erb to account for more transient behaviors across different systems. --- test/compass_test.rb | 2 +- test/fixtures/stylesheets/relative/css/screen.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/compass_test.rb b/test/compass_test.rb index 4d570fed..7dff4904 100644 --- a/test/compass_test.rb +++ b/test/compass_test.rb @@ -77,7 +77,7 @@ private actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css" expected_result_file = "#{result_path(@current_project)}/#{name}.css" actual_lines = File.read(actual_result_file).split("\n") - expected_lines = File.read(expected_result_file).split("\n") + expected_lines = ERB.new(File.read(expected_result_file)).result(binding).split("\n") expected_lines.zip(actual_lines).each_with_index do |pair, line| message = "template: #{name}\nline: #{line + 1}" assert_equal(pair.first, pair.last, message) diff --git a/test/fixtures/stylesheets/relative/css/screen.css b/test/fixtures/stylesheets/relative/css/screen.css index 8c64d3b9..a076f52a 100644 --- a/test/fixtures/stylesheets/relative/css/screen.css +++ b/test/fixtures/stylesheets/relative/css/screen.css @@ -1 +1 @@ -test { background: url('../assets/images/testing.png?1258839056'); } +test { background: url('../assets/images/testing.png?<%= File.mtime(File.join(Compass.configuration.project_path, 'assets', 'images', 'testing.png')).strftime("%s") %>'); } From b8b43c3ebc83ba32dc405fcaecd7a47d46882981 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 09:23:48 -0800 Subject: [PATCH 05/10] [Blueprint] Password inputs now the same style as regular text inputs Port of blueprint d77e914e85669ff9f05034e51d4d6d8a9dba2fa9 --- .../blueprint/stylesheets/blueprint/_form.sass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass index 1ff6c040..82d86d34 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass @@ -21,7 +21,7 @@ font-weight: bold font-size: 1.2em input - &.text, &.title, &[type=text] + &.text, &.title, &[type=text], &[type=password] margin: 0.5em 0 background-color: #fff padding: 5px @@ -38,8 +38,9 @@ margin: 0.5em 0 =blueprint-form-sizes(!input_width = 300px, !textarea_width = 390px, !textarea_height = 250px) - input.text, input.title - width= !input_width + input + &.text, &.title, &[type=text], &[type=password] + width= !input_width textarea width= !textarea_width height= !textarea_height @@ -47,7 +48,7 @@ =blueprint-form-borders(!unfocused_border_color = #bbb, !focus_border_color = #666, !fieldset_border_color = #ccc) fieldset border= 1px "solid" !fieldset_border_color - input.text, input.title, + input.text, input.title, input[type=text], input[type=password], textarea, select border= 1px "solid" !unfocused_border_color From 27e1bf4b0fb40534ef0c49a3e9d682672f73b285 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 09:30:22 -0800 Subject: [PATCH 06/10] Fix grid builder to properly generate png Port of blueprint commit eb58cdef26ea537cc65f842c7675c6575575f6c0 --- lib/compass/grid_builder.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compass/grid_builder.rb b/lib/compass/grid_builder.rb index 2b5c5d34..e81d1f6e 100644 --- a/lib/compass/grid_builder.rb +++ b/lib/compass/grid_builder.rb @@ -48,7 +48,7 @@ module Compass canvas.background_fill = 'white' canvas.g do |column| - column.rect(self.column_width, @height).styles(:fill => "#e8effb") + column.rect(self.column_width - 1, @height).styles(:fill => "#e8effb") end canvas.g do |baseline| From ebaf655bb6bce57f2304be662cf384904226033d Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 09:35:06 -0800 Subject: [PATCH 07/10] [Blueprint] Add visibility:hidden to hr.space and +colspacer so it's useful outside of white backgrounds Port of blueprint commit 414d9242c3b3ffdf5e2d90a84c87a4c4c711a135 --- .../frameworks/blueprint/stylesheets/blueprint/_grid.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass index 3edd3897..76759a99 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass @@ -176,3 +176,4 @@ +colruler background: #fff color: #fff + visibility: hidden From 19ceefe8998455f7614c65a8eebd093fbb375998 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 09:37:46 -0800 Subject: [PATCH 08/10] [Blueprint] When using the RTL plugin, columns are now text-align:right. Ported from blueprint commit 9be685760014b3258dcd83913b9b19f130551b2f --- lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass index 616b92f0..eab6ccc1 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass @@ -29,6 +29,7 @@ +last @else margin-left= !blueprint_grid_margin + text-align: right * html & overflow-x: hidden From 43c19f7315615e514bf05646f85c3ebe7b3b90da Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 09:46:24 -0800 Subject: [PATCH 09/10] [Blueprint] Fixed clipping of ordinals for IE in an ordered list. Port of blueprint commit 016c9114f1aa91f84c3d68f3be9a97a114334d84 --- .../blueprint/stylesheets/blueprint/_ie.sass | 2 -- .../blueprint/stylesheets/blueprint/_typography.sass | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass index f4f6b2ca..44d9f5e7 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass @@ -56,8 +56,6 @@ =blueprint-ie-defaults .container text-align: left - ol - margin-left: 2em sup vertical-align: text-top sub diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass index 6f230bfb..a244087a 100644 --- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass +++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass @@ -125,13 +125,15 @@ white-space: pre pre, code, tt +fixed-width-text - li ul, li ol - margin: 0 1.5em + li + ul, ol + margin: 0 + ul, ol + margin: 0 1.5em 1.5em 0 + padding-left: 3.333em ul - margin: 0 1.5em 1.5em 1.5em list-style-type: disc ol - margin: 0 1.5em 1.5em 1.5em list-style-type: decimal dl margin: 0 0 1.5em 0 From 86b78ff4010e2c5d7210d4a92adaa56e29036ddc Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Tue, 24 Nov 2009 10:36:51 -0800 Subject: [PATCH 10/10] Fix test failure. --- test/fixtures/stylesheets/blueprint/css/typography.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/fixtures/stylesheets/blueprint/css/typography.css b/test/fixtures/stylesheets/blueprint/css/typography.css index 53f7e26b..ab85ffc5 100644 --- a/test/fixtures/stylesheets/blueprint/css/typography.css +++ b/test/fixtures/stylesheets/blueprint/css/typography.css @@ -111,14 +111,16 @@ pre, code, tt { line-height: 1.5; } li ul, li ol { - margin: 0 1.5em; } + margin: 0; } + +ul, ol { + margin: 0 1.5em 1.5em 0; + padding-left: 3.333em; } ul { - margin: 0 1.5em 1.5em 1.5em; list-style-type: disc; } ol { - margin: 0 1.5em 1.5em 1.5em; list-style-type: decimal; } dl {