diff --git a/Manifest b/Manifest index 829536c5..748cc957 100644 --- a/Manifest +++ b/Manifest @@ -62,14 +62,15 @@ frameworks/blueprint/templates/project/grid.png frameworks/blueprint/templates/project/ie.sass frameworks/blueprint/templates/project/print.sass frameworks/blueprint/templates/project/screen.sass -frameworks/compass/stylesheets/compass/_reset.sass frameworks/compass/stylesheets/compass/_utilities.sass +frameworks/compass/stylesheets/compass/reset.sass frameworks/compass/stylesheets/compass/utilities/_general.sass frameworks/compass/stylesheets/compass/utilities/_links.sass frameworks/compass/stylesheets/compass/utilities/_lists.sass frameworks/compass/stylesheets/compass/utilities/_tables.sass frameworks/compass/stylesheets/compass/utilities/_text.sass frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass +frameworks/compass/stylesheets/compass/utilities/general/_reset.sass frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass diff --git a/examples/blueprint_default/stylesheets/screen.sass b/examples/blueprint_default/stylesheets/screen.sass index 93fb2a18..c48d54c9 100644 --- a/examples/blueprint_default/stylesheets/screen.sass +++ b/examples/blueprint_default/stylesheets/screen.sass @@ -2,9 +2,6 @@ @import blueprint/modules/scaffolding.sass @import compass/reset.sass -html - +reset-html - body +blueprint // Remove the scaffolding when you're ready to start doing visual design. diff --git a/examples/blueprint_plugins/stylesheets/screen.sass b/examples/blueprint_plugins/stylesheets/screen.sass index 57608c64..8cc3aca5 100644 --- a/examples/blueprint_plugins/stylesheets/screen.sass +++ b/examples/blueprint_plugins/stylesheets/screen.sass @@ -3,9 +3,6 @@ @import blueprint/modules/scaffolding.sass @import compass/reset.sass -html - +reset-html - body +blueprint +fancy-type diff --git a/examples/blueprint_scoped/stylesheets/screen.sass b/examples/blueprint_scoped/stylesheets/screen.sass index b7541f55..8450dfcc 100644 --- a/examples/blueprint_scoped/stylesheets/screen.sass +++ b/examples/blueprint_scoped/stylesheets/screen.sass @@ -1,8 +1,5 @@ @import blueprint/screen.sass @import compass/reset.sass -html - +reset-html - body.bp +blueprint \ No newline at end of file diff --git a/examples/blueprint_scoped_form/stylesheets/screen.sass b/examples/blueprint_scoped_form/stylesheets/screen.sass index 2fc19360..bda812ac 100644 --- a/examples/blueprint_scoped_form/stylesheets/screen.sass +++ b/examples/blueprint_scoped_form/stylesheets/screen.sass @@ -1,9 +1,6 @@ @import blueprint/screen.sass @import compass/reset.sass -html - +reset-html - body +blueprint-grid +blueprint-typography diff --git a/examples/blueprint_semantic/stylesheets/screen.sass b/examples/blueprint_semantic/stylesheets/screen.sass index 4ee999aa..d56fd61f 100644 --- a/examples/blueprint_semantic/stylesheets/screen.sass +++ b/examples/blueprint_semantic/stylesheets/screen.sass @@ -3,9 +3,6 @@ @import blueprint/modules/scaffolding.sass @import compass/reset.sass -html - +reset-html - .container +container diff --git a/examples/compass/stylesheets/utilities.sass b/examples/compass/stylesheets/utilities.sass index 021ab847..598ea407 100644 --- a/examples/compass/stylesheets/utilities.sass +++ b/examples/compass/stylesheets/utilities.sass @@ -5,12 +5,11 @@ @import blueprint/modules/scaffolding.sass html - +reset-html +yui-base - h2 - :margin-top 0 - :border-bottom 2px solid #777 +h2 + :margin-top 0 + :border-bottom 2px solid #777 #utilities +container diff --git a/examples/yui_default/stylesheets/screen.sass b/examples/yui_default/stylesheets/screen.sass index 1acf75ef..753b31b5 100644 --- a/examples/yui_default/stylesheets/screen.sass +++ b/examples/yui_default/stylesheets/screen.sass @@ -1,9 +1,6 @@ @import yui/screen.sass @import compass/reset.sass -html - +reset-html - body +yui diff --git a/frameworks/blueprint/templates/project/screen.sass b/frameworks/blueprint/templates/project/screen.sass index 93fb2a18..c48d54c9 100644 --- a/frameworks/blueprint/templates/project/screen.sass +++ b/frameworks/blueprint/templates/project/screen.sass @@ -2,9 +2,6 @@ @import blueprint/modules/scaffolding.sass @import compass/reset.sass -html - +reset-html - body +blueprint // Remove the scaffolding when you're ready to start doing visual design. diff --git a/frameworks/compass/stylesheets/compass/_reset.sass b/frameworks/compass/stylesheets/compass/_reset.sass deleted file mode 100644 index 8f7f5975..00000000 --- a/frameworks/compass/stylesheets/compass/_reset.sass +++ /dev/null @@ -1,73 +0,0 @@ -=reset - :margin 0 - :padding 0 - :border 0 - :font - :weight inherit - :style inherit - :size 100% - :family inherit - :vertical-align baseline - -=reset-quotation - +reset - :quotes "" "" - &:before, - &:after - :content "" - -=reset-table-cell - +reset - :text-align left - :font-weight normal - :vertical-align middle - -=reset-table - +reset - :border-collapse separate - :border-spacing 0 - :vertical-align middle - -=reset-body-tag - +reset - :line-height 1.5 - -// Mix this into the html element of your application -// if you want a global reset (recommended). -=reset-html - +reset - div, span, object, iframe, h1, h2, h3, h4, h5, h6, p - +reset - body - +reset-body-tag - blockquote, q - +reset-quotation - pre, a, abbr, acronym, address, code, del, dfn, em, img - +reset - dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr - +reset - th, td, caption - +reset-table-cell - table - +reset-table - a img - :border none - -// Mix this into the body element -// if you want a selective reset -=reset-body - +reset-body-tag - div, span, object, iframe, h1, h2, h3, h4, h5, h6, p - +reset - blockquote, q - +reset-quotation - pre, a, abbr, acronym, address, code, del, dfn, em, img - +reset - dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr - +reset - th, td, caption - +reset-table-cell - table - +reset-table - a img - :border none \ No newline at end of file diff --git a/frameworks/compass/stylesheets/compass/reset.sass b/frameworks/compass/stylesheets/compass/reset.sass new file mode 100644 index 00000000..711baa0b --- /dev/null +++ b/frameworks/compass/stylesheets/compass/reset.sass @@ -0,0 +1,24 @@ +@import utilities/general/reset.sass + +// Global reset rules. +// For more specific resets, use the reset mixins provided by +// compass/utilities/general/reset +html + +reset +div, span, object, iframe, h1, h2, h3, h4, h5, h6, p + +reset +body + +reset + :line-height 1.5 +blockquote, q + +reset-quotation +pre, a, abbr, acronym, address, code, del, dfn, em, img + +reset +dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr + +reset +th, td, caption + +reset-table-cell +table + +reset-table +a img + :border none diff --git a/frameworks/compass/stylesheets/compass/utilities/_general.sass b/frameworks/compass/stylesheets/compass/utilities/_general.sass index 373237a2..adc31feb 100644 --- a/frameworks/compass/stylesheets/compass/utilities/_general.sass +++ b/frameworks/compass/stylesheets/compass/utilities/_general.sass @@ -1,3 +1,3 @@ +@import general/reset.sass @import general/clearfix.sass @import general/tag_cloud.sass - diff --git a/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass b/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass new file mode 100644 index 00000000..4c19c92a --- /dev/null +++ b/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass @@ -0,0 +1,29 @@ +=reset + :margin 0 + :padding 0 + :border 0 + :font + :weight inherit + :style inherit + :size 100% + :family inherit + :vertical-align baseline + +=reset-quotation + +reset + :quotes "" "" + &:before, + &:after + :content "" + +=reset-table-cell + +reset + :text-align left + :font-weight normal + :vertical-align middle + +=reset-table + +reset + :border-collapse separate + :border-spacing 0 + :vertical-align middle diff --git a/frameworks/compass/templates/project/screen.sass b/frameworks/compass/templates/project/screen.sass index 0c95faa5..c27c19da 100644 --- a/frameworks/compass/templates/project/screen.sass +++ b/frameworks/compass/templates/project/screen.sass @@ -2,6 +2,3 @@ Welcome to Compass. We'll show you the way, but you'll have to get there on your own. In this file you should write (or centralize your imports) the main styles. @import compass/reset.sass - -html - +reset-html diff --git a/frameworks/yui/templates/project/screen.sass b/frameworks/yui/templates/project/screen.sass index 44ad304a..a0fdfc27 100644 --- a/frameworks/yui/templates/project/screen.sass +++ b/frameworks/yui/templates/project/screen.sass @@ -1,8 +1,5 @@ @import yui/screen.sass @import compass/reset.sass -html - +reset-html - body +yui diff --git a/test/fixtures/default/templates/screen.sass b/test/fixtures/default/templates/screen.sass index 7f2ef7c0..f8df6a05 100644 --- a/test/fixtures/default/templates/screen.sass +++ b/test/fixtures/default/templates/screen.sass @@ -1,9 +1,6 @@ @import blueprint/screen @import compass/reset -html - +reset-html - body +blueprint #main.container