From 91aa83cbfdf4fa750b49a7c016a3905ab9cfb8fd Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Wed, 17 Dec 2008 09:02:48 -0800 Subject: [PATCH] Silence implicit string deprecation warnings. --- .../stylesheets/liquid.sass | 6 ++--- .../stylesheets/screen.sass | 6 ++--- examples/compass/stylesheets/utilities.sass | 4 +-- .../blueprint/modules/_interaction.sass | 2 +- .../blueprint/modules/_typography.sass | 4 +-- .../compass/utilities/lists/_bullets.sass | 4 +-- .../yui/stylesheets/yui/modules/_fonts.sass | 2 +- .../yui/stylesheets/yui/modules/_grids.sass | 26 +++++++++---------- .../stylesheets/blueprint/sass/screen.sass | 8 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/examples/blueprint_semantic/stylesheets/liquid.sass b/examples/blueprint_semantic/stylesheets/liquid.sass index 776c2abe..63bd34d2 100644 --- a/examples/blueprint_semantic/stylesheets/liquid.sass +++ b/examples/blueprint_semantic/stylesheets/liquid.sass @@ -43,7 +43,7 @@ body#sample +column(8) +colborder #aligned-box - +column(7, last) + +column(7, true) #main +column(15) +prepend(1) @@ -59,9 +59,9 @@ body#sample +column(7) +colborder #nested-2 - +column(7, last) + +column(7, true) #sidebar - +column(7, last) + +column(7, true) h3 em +reset diff --git a/examples/blueprint_semantic/stylesheets/screen.sass b/examples/blueprint_semantic/stylesheets/screen.sass index a841d012..05ebe090 100644 --- a/examples/blueprint_semantic/stylesheets/screen.sass +++ b/examples/blueprint_semantic/stylesheets/screen.sass @@ -42,7 +42,7 @@ body#sample +column(8) +colborder #aligned-box - +column(7, last) + +column(7, true) #main +column(15) +prepend(1) @@ -58,9 +58,9 @@ body#sample +column(7) +colborder #nested-2 - +column(7, last) + +column(7, true) #sidebar - +column(7, last) + +column(7, true) h3 em +reset diff --git a/examples/compass/stylesheets/utilities.sass b/examples/compass/stylesheets/utilities.sass index 598ea407..fd55d597 100644 --- a/examples/compass/stylesheets/utilities.sass +++ b/examples/compass/stylesheets/utilities.sass @@ -50,13 +50,13 @@ h2 +no-bullets #lists - +column(8, last) + +column(8, true) ul.inline +inline-list ul.comma-delimited +comma-delimited-list ol.pretty - +pretty-bullets(images/blue_arrow.gif, 5px, 7px, 24px) + +pretty-bullets("images/blue_arrow.gif", 5px, 7px, 24px) #tables +column(16) diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass index a94fb2d8..c4b19f5f 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass @@ -20,7 +20,7 @@ =feedback-base :padding .8em :margin-bottom 1em - :border= 2px solid !feedback_border_color + :border= 2px "solid" !feedback_border_color =error +feedback-base diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass index 4627c6d2..f4fd8dc4 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass @@ -1,8 +1,8 @@ @import colors.sass @import compass/utilities/links/link_colors.sass -!blueprint_font_family ||= "Helvetica Neue", Helvetica, Arial, sans-serif -!blueprint_fixed_font_family ||= 'andale mono', 'lucida console', monospace +!blueprint_font_family ||= "Helvetica Neue, Helvetica, Arial, sans-serif" +!blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace" // The +blueprint-typography mixin must be mixed into the top level of your stylesheet. // However, you can customize the body selector if you wish to control the scope diff --git a/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass b/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass index 92da4588..333cd105 100644 --- a/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass +++ b/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass @@ -11,11 +11,11 @@ // Make a list(ul/ol) have an image bullet // mixin should be used like this for an icon that is 5x7: // ul.pretty -// +pretty-bullets(/images/my-icon.png, 5px, 7px) +// +pretty-bullets("/images/my-icon.png", 5px, 7px) =pretty-bullets(!bullet_icon, !width, !height, !line_height = 18px, !padding = 14px) :margin-left 0 li :padding-left= !padding - :background= url(!bullet_icon) no-repeat ((!padding - !width) / 2) ((!line_height - !height) / 2) + :background= url(!bullet_icon) "no-repeat" ((!padding - !width) / 2) ((!line_height - !height) / 2) :list-style-type none diff --git a/frameworks/yui/stylesheets/yui/modules/_fonts.sass b/frameworks/yui/stylesheets/yui/modules/_fonts.sass index d4d5a576..d84284ab 100644 --- a/frameworks/yui/stylesheets/yui/modules/_fonts.sass +++ b/frameworks/yui/stylesheets/yui/modules/_fonts.sass @@ -1,6 +1,6 @@ !yui_default_base_font_size ||= 13px !yui_default_base_line_height ||= 1.231 -!yui_default_font_family ||= arial,helvetica,clean,sans-serif +!yui_default_font_family ||= "arial,helvetica,clean,sans-serif" // Sets the font size specified in pixels using percents so that the base // font size changes and 1em has the correct value. When nesting font size diff --git a/frameworks/yui/stylesheets/yui/modules/_grids.sass b/frameworks/yui/stylesheets/yui/modules/_grids.sass index d1bcfa10..894766cc 100644 --- a/frameworks/yui/stylesheets/yui/modules/_grids.sass +++ b/frameworks/yui/stylesheets/yui/modules/_grids.sass @@ -157,7 +157,7 @@ #{nest(!g_33_33_33, !unit)} float: right - #{nest(!g_33_33_33, div.first)} + #{nest(!g_33_33_33, "div.first")} margin-left: 0 float: left @@ -179,7 +179,7 @@ *width: 66% _width: 61.2% - #{nest(!g_33_33_33, !g_33_67, div.first)} + #{nest(!g_33_33_33, !g_33_67, "div.first")} *width: 31% _width: 29.5% @@ -192,7 +192,7 @@ margin-right: 0 _margin-left: 0 - #{nest(!g_33_33_33, !g_67_33, div.first)} + #{nest(!g_33_33_33, !g_67_33, "div.first")} width: 66% *float: left *margin-left: 0 @@ -223,7 +223,7 @@ #{nest(!g_50_50, !g_75_25)}, #{!g_50_50}, #{!g_67_33}, - #{nest(!g_67_33, div.first)}, + #{nest(!g_67_33, "div.first")}, #{!g_33_67}, #{!g_75_25}, #{!g_25_75} @@ -242,10 +242,10 @@ *width: 48.1% *margin-left: 0 - #{nest(!g_50_50, !g_50_50, div.first)} + #{nest(!g_50_50, !g_50_50, "div.first")} *margin: 0 - #{nest(!g_33_33_33, !g_50_50, div.first)} + #{nest(!g_33_33_33, !g_50_50, "div.first")} *margin-right: 4% _margin-right: 1.3% @@ -281,8 +281,8 @@ div.first margin-left: 0 - #{nest(!g_50_50, !g_67_33, div.first)}, - #{nest(!g_67_33, div.first)}, + #{nest(!g_50_50, !g_67_33, "div.first")}, + #{nest(!g_67_33, "div.first")}, #{nest(!g_33_67, !g_50_50)}, #{nest(!g_33_67, !unit)} width: 66% @@ -292,12 +292,12 @@ div.first width: 32% - #{nest(!g_50_50, !g_33_67, div.first)} + #{nest(!g_50_50, !g_33_67, "div.first")} _width: 29.9% #{nest(!g_75_25, !unit)}, #{nest(!g_75_25, !g_50_50)}, - #{nest(!g_25_75, div.first)} + #{nest(!g_25_75, "div.first")} width: 24% #{!g_33_33_33} @@ -312,19 +312,19 @@ div.first float: left - #{nest(!g_75_25, div.first)}, + #{nest(!g_75_25, "div.first")}, #{nest(!g_25_75, !g_50_50)}, #{nest(!g_25_75, !unit)} width: 74.2% #{!g_33_33_33} #{nest(!g_75_25, !unit)}, - #{nest(!g_25_75, div.first)} + #{nest(!g_25_75, "div.first")} *width: 24% _width: 20% #{!g_33_33_33} - #{nest(!g_75_25, div.first)}, + #{nest(!g_75_25, "div.first")}, #{nest(!g_25_75, !unit)} *width: 73.5% _width: 65.5% diff --git a/test/fixtures/stylesheets/blueprint/sass/screen.sass b/test/fixtures/stylesheets/blueprint/sass/screen.sass index 61b77544..93ec4087 100644 --- a/test/fixtures/stylesheets/blueprint/sass/screen.sass +++ b/test/fixtures/stylesheets/blueprint/sass/screen.sass @@ -4,14 +4,14 @@ +blueprint #main.container #top - +column(24, last) + +column(24, true) #middle - +column(24, last) + +column(24, true) #left +column(6) #content +column(12) #right - +column(6, last) + +column(6, true) #bottom - +column(24, last) + +column(24, true)