From 3bee9df60a421743ece4610b8ca0dbc075adaadf Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Fri, 12 Nov 2010 10:42:08 -0800 Subject: [PATCH] With a few minor deviations this is a port of blueprint commits: commit 7522a25ab641264da4aebdc3e78cb2c5b253c939 Author: Christian Montoya Date: Fri Sep 17 11:52:34 2010 -0400 Fixed lighthouse bugs, updated tests/index.html commit 5459eddd7b2953a6b0b6d10e97d056019762874a Author: Christian Montoya Date: Wed Sep 29 15:53:24 2010 -0400 Fix for conflict between .right and .column/.span-X Deviations: I think it's incorrect to apply zebra striping to all tables. So instead, you must opt in by applying the striped class to a table. --- .../blueprint/stylesheets/blueprint/_rtl.scss | 17 ++++++++--------- .../stylesheets/blueprint/_typography.scss | 16 ++++++++-------- .../stylesheets/blueprint/css/screen.css | 15 ++++++--------- .../blueprint/css/single-imports/typography.css | 15 ++++++--------- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/frameworks/blueprint/stylesheets/blueprint/_rtl.scss b/frameworks/blueprint/stylesheets/blueprint/_rtl.scss index 39ef1211..b0f70693 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_rtl.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_rtl.scss @@ -106,15 +106,14 @@ $blueprint-container-size: $blueprint-grid-outer-width * $blueprint-grid-columns font-family: Arial, sans-serif; } pre, code, tt { font-family: monospace; } - p { - img.right { - @include float-left; - margin: 1.5em 1.5em 1.5em 0; - padding: 0; } - img.left { - @include float-right; - margin: 1.5em 0 1.5em 1.5em; - padding: 0; } } + .right { + @include float-left; + margin: 1.5em 1.5em 1.5em 0; + padding: 0; } + .left { + @include float-right; + margin: 1.5em 0 1.5em 1.5em; + padding: 0; } dd, ul, ol { margin-left: 0; margin-right: 1.5em; } diff --git a/frameworks/blueprint/stylesheets/blueprint/_typography.scss b/frameworks/blueprint/stylesheets/blueprint/_typography.scss index c1b20463..173da561 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_typography.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_typography.scss @@ -56,15 +56,13 @@ $blueprint-font-size: 12px !default; h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; } h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.50em; } h6 { font-size: 1em; font-weight: bold; } - p { margin: 0 0 1.5em; - img.left { @include float-left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } - img.right { @include float-right; margin: 1.5em 0 1.5em 1.5em; padding: 0; } - } + p { margin: 0 0 1.5em; + .left { @include float-left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } + .right { @include float-right; margin: 1.5em 0 1.5em 1.5em; padding: 0; } } a { text-decoration: underline; @include link-colors($link-color, $link-hover-color, $link-active-color, $link-visited-color, $link-focus-color); } blockquote { margin: 1.5em; color: $alt-text-color; font-style: italic; } - strong { font-weight: bold; } - em { font-style: italic; } - dfn { font-style: italic; font-weight: bold; } + strong, dfn { font-weight: bold; } + em, dfn { font-style: italic; } sup, sub { line-height: 0; } abbr, acronym { border-bottom: 1px dotted #666666; } address { margin: 0 0 1.5em; font-style: italic; } @@ -82,7 +80,9 @@ $blueprint-font-size: 12px !default; th { font-weight: bold; } thead th { background: $blueprint-table-header-color; } th, td, caption { padding: 4px 10px 4px 5px; } - tr.even td { background: $blueprint-table-stripe-color; } + table.striped tr:nth-child(even) td, + table tr.even td + { background: $blueprint-table-stripe-color; } tfoot { font-style: italic; } caption { background: $blueprint-background-color; } .quiet { @include quiet; } diff --git a/test/fixtures/stylesheets/blueprint/css/screen.css b/test/fixtures/stylesheets/blueprint/css/screen.css index bbe8a37c..febcddb3 100644 --- a/test/fixtures/stylesheets/blueprint/css/screen.css +++ b/test/fixtures/stylesheets/blueprint/css/screen.css @@ -84,12 +84,12 @@ h6 { p { margin: 0 0 1.5em; } - p img.left { + p .left { display: inline; float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } - p img.right { + p .right { display: inline; float: right; margin: 1.5em 0 1.5em 1.5em; @@ -112,16 +112,12 @@ blockquote { color: #666666; font-style: italic; } -strong { +strong, dfn { font-weight: bold; } -em { +em, dfn { font-style: italic; } -dfn { - font-style: italic; - font-weight: bold; } - sup, sub { line-height: 0; } @@ -177,7 +173,8 @@ thead th { th, td, caption { padding: 4px 10px 4px 5px; } -tr.even td { +table.striped tr:nth-child(even) td, +table tr.even td { background: #e5ecf9; } tfoot { diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css b/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css index c7ea601c..f79a1fb3 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/typography.css @@ -40,12 +40,12 @@ h6 { p { margin: 0 0 1.5em; } - p img.left { + p .left { display: inline; float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } - p img.right { + p .right { display: inline; float: right; margin: 1.5em 0 1.5em 1.5em; @@ -68,16 +68,12 @@ blockquote { color: #666666; font-style: italic; } -strong { +strong, dfn { font-weight: bold; } -em { +em, dfn { font-style: italic; } -dfn { - font-style: italic; - font-weight: bold; } - sup, sub { line-height: 0; } @@ -133,7 +129,8 @@ thead th { th, td, caption { padding: 4px 10px 4px 5px; } -tr.even td { +table.striped tr:nth-child(even) td, +table tr.even td { background: #e5ecf9; } tfoot {