Backward Incompatible Change: Removed unnecessary html/body scoping for reset rules and made reset.sass a standalone stylesheet.
To perform a reset, simply @import compass/reset.sass To perform a selective reset, you should @import compass/utilities/general/reset.sass which will provide reset mixins without defining any css rules.
This commit is contained in:
parent
5aa24e6c5e
commit
278cda2ed6
3
Manifest
3
Manifest
@ -62,14 +62,15 @@ frameworks/blueprint/templates/project/grid.png
|
|||||||
frameworks/blueprint/templates/project/ie.sass
|
frameworks/blueprint/templates/project/ie.sass
|
||||||
frameworks/blueprint/templates/project/print.sass
|
frameworks/blueprint/templates/project/print.sass
|
||||||
frameworks/blueprint/templates/project/screen.sass
|
frameworks/blueprint/templates/project/screen.sass
|
||||||
frameworks/compass/stylesheets/compass/_reset.sass
|
|
||||||
frameworks/compass/stylesheets/compass/_utilities.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/_general.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/_links.sass
|
frameworks/compass/stylesheets/compass/utilities/_links.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/_lists.sass
|
frameworks/compass/stylesheets/compass/utilities/_lists.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/_tables.sass
|
frameworks/compass/stylesheets/compass/utilities/_tables.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/_text.sass
|
frameworks/compass/stylesheets/compass/utilities/_text.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/general/_clearfix.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/general/_tag_cloud.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass
|
frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass
|
||||||
frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass
|
frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass
|
||||||
|
@ -2,9 +2,6 @@
|
|||||||
@import blueprint/modules/scaffolding.sass
|
@import blueprint/modules/scaffolding.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+blueprint
|
+blueprint
|
||||||
// Remove the scaffolding when you're ready to start doing visual design.
|
// Remove the scaffolding when you're ready to start doing visual design.
|
||||||
|
@ -3,9 +3,6 @@
|
|||||||
@import blueprint/modules/scaffolding.sass
|
@import blueprint/modules/scaffolding.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+blueprint
|
+blueprint
|
||||||
+fancy-type
|
+fancy-type
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
@import blueprint/screen.sass
|
@import blueprint/screen.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body.bp
|
body.bp
|
||||||
+blueprint
|
+blueprint
|
@ -1,9 +1,6 @@
|
|||||||
@import blueprint/screen.sass
|
@import blueprint/screen.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+blueprint-grid
|
+blueprint-grid
|
||||||
+blueprint-typography
|
+blueprint-typography
|
||||||
|
@ -3,9 +3,6 @@
|
|||||||
@import blueprint/modules/scaffolding.sass
|
@import blueprint/modules/scaffolding.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
.container
|
.container
|
||||||
+container
|
+container
|
||||||
|
|
||||||
|
@ -5,12 +5,11 @@
|
|||||||
@import blueprint/modules/scaffolding.sass
|
@import blueprint/modules/scaffolding.sass
|
||||||
|
|
||||||
html
|
html
|
||||||
+reset-html
|
|
||||||
+yui-base
|
+yui-base
|
||||||
|
|
||||||
h2
|
h2
|
||||||
:margin-top 0
|
:margin-top 0
|
||||||
:border-bottom 2px solid #777
|
:border-bottom 2px solid #777
|
||||||
|
|
||||||
#utilities
|
#utilities
|
||||||
+container
|
+container
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
@import yui/screen.sass
|
@import yui/screen.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+yui
|
+yui
|
||||||
|
|
||||||
|
@ -2,9 +2,6 @@
|
|||||||
@import blueprint/modules/scaffolding.sass
|
@import blueprint/modules/scaffolding.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+blueprint
|
+blueprint
|
||||||
// Remove the scaffolding when you're ready to start doing visual design.
|
// Remove the scaffolding when you're ready to start doing visual design.
|
||||||
|
@ -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
|
|
24
frameworks/compass/stylesheets/compass/reset.sass
Normal file
24
frameworks/compass/stylesheets/compass/reset.sass
Normal file
@ -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
|
@ -1,3 +1,3 @@
|
|||||||
|
@import general/reset.sass
|
||||||
@import general/clearfix.sass
|
@import general/clearfix.sass
|
||||||
@import general/tag_cloud.sass
|
@import general/tag_cloud.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
|
@ -2,6 +2,3 @@
|
|||||||
Welcome to Compass. We'll show you the way, but you'll have to get there on your own.
|
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.
|
In this file you should write (or centralize your imports) the main styles.
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
@import yui/screen.sass
|
@import yui/screen.sass
|
||||||
@import compass/reset.sass
|
@import compass/reset.sass
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+yui
|
+yui
|
||||||
|
3
test/fixtures/default/templates/screen.sass
vendored
3
test/fixtures/default/templates/screen.sass
vendored
@ -1,9 +1,6 @@
|
|||||||
@import blueprint/screen
|
@import blueprint/screen
|
||||||
@import compass/reset
|
@import compass/reset
|
||||||
|
|
||||||
html
|
|
||||||
+reset-html
|
|
||||||
|
|
||||||
body
|
body
|
||||||
+blueprint
|
+blueprint
|
||||||
#main.container
|
#main.container
|
||||||
|
Loading…
Reference in New Issue
Block a user