github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

With a few minor deviations this is a port of blueprint commits:

Browse Source 
commit 7522a25ab641264da4aebdc3e78cb2c5b253c939
Author: Christian Montoya <sirokai@gmail.com>
Date:   Fri Sep 17 11:52:34 2010 -0400

    Fixed lighthouse bugs, updated tests/index.html

commit 5459eddd7b2953a6b0b6d10e97d056019762874a
Author: Christian Montoya <sirokai@gmail.com>
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.
This commit is contained in:
Chris Eppstein 2010-11-12 10:42:08 -08:00
parent 74bcd9ca5c
commit 3bee9df60a
4 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frameworks/blueprint/stylesheets/blueprint/_rtl.scss
View File

@ -106,15 +106,14 @@ $blueprint-container-size: $blueprint-grid-outer-width * $blueprint-grid-columns
font-family: Arial, sans-serif; } font-family: Arial, sans-serif; }
pre, code, tt { pre, code, tt {
font-family: monospace; } font-family: monospace; }
p { .right {
img.right { @include float-left;
@include float-left; margin: 1.5em 1.5em 1.5em 0;
margin: 1.5em 1.5em 1.5em 0; padding: 0; }
padding: 0; } .left {
img.left { @include float-right;
@include float-right; margin: 1.5em 0 1.5em 1.5em;
margin: 1.5em 0 1.5em 1.5em; padding: 0; }
padding: 0; } }
dd, ul, ol { dd, ul, ol {
margin-left: 0; margin-left: 0;
margin-right: 1.5em; } margin-right: 1.5em; }

16
frameworks/blueprint/stylesheets/blueprint/_typography.scss
View File

@ -56,15 +56,13 @@ $blueprint-font-size: 12px !default;
h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; } h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; }
h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.50em; } h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.50em; }
h6 { font-size: 1em; font-weight: bold; } h6 { font-size: 1em; font-weight: bold; }
p { margin: 0 0 1.5em; p { margin: 0 0 1.5em;
img.left { @include float-left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } .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; } .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); } 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; } blockquote { margin: 1.5em; color: $alt-text-color; font-style: italic; }
strong { font-weight: bold; } strong, dfn { font-weight: bold; }
em { font-style: italic; } em, dfn { font-style: italic; }
dfn { font-style: italic; font-weight: bold; }
sup, sub { line-height: 0; } sup, sub { line-height: 0; }
abbr, acronym { border-bottom: 1px dotted #666666; } abbr, acronym { border-bottom: 1px dotted #666666; }
address { margin: 0 0 1.5em; font-style: italic; } address { margin: 0 0 1.5em; font-style: italic; }
@ -82,7 +80,9 @@ $blueprint-font-size: 12px !default;
th { font-weight: bold; } th { font-weight: bold; }
thead th { background: $blueprint-table-header-color; } thead th { background: $blueprint-table-header-color; }
th, td, caption { padding: 4px 10px 4px 5px; } 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; } tfoot { font-style: italic; }
caption { background: $blueprint-background-color; } caption { background: $blueprint-background-color; }
.quiet { @include quiet; } .quiet { @include quiet; }

15
test/fixtures/stylesheets/blueprint/css/screen.css vendored
View File

@ -84,12 +84,12 @@ h6 {
p { p {
margin: 0 0 1.5em; } margin: 0 0 1.5em; }
p img.left { p .left {
display: inline; display: inline;
float: left; float: left;
margin: 1.5em 1.5em 1.5em 0; margin: 1.5em 1.5em 1.5em 0;
padding: 0; } padding: 0; }
p img.right { p .right {
display: inline; display: inline;
float: right; float: right;
margin: 1.5em 0 1.5em 1.5em; margin: 1.5em 0 1.5em 1.5em;
@ -112,16 +112,12 @@ blockquote {
color: #666666; color: #666666;
font-style: italic; } font-style: italic; }
strong { strong, dfn {
font-weight: bold; } font-weight: bold; }
em { em, dfn {
font-style: italic; } font-style: italic; }
dfn {
font-style: italic;
font-weight: bold; }
sup, sub { sup, sub {
line-height: 0; } line-height: 0; }
@ -177,7 +173,8 @@ thead th {
th, td, caption { th, td, caption {
padding: 4px 10px 4px 5px; } padding: 4px 10px 4px 5px; }
tr.even td { table.striped tr:nth-child(even) td,
table tr.even td {
background: #e5ecf9; } background: #e5ecf9; }
tfoot { tfoot {

15
test/fixtures/stylesheets/blueprint/css/single-imports/typography.css vendored
View File

@ -40,12 +40,12 @@ h6 {
p { p {
margin: 0 0 1.5em; } margin: 0 0 1.5em; }
p img.left { p .left {
display: inline; display: inline;
float: left; float: left;
margin: 1.5em 1.5em 1.5em 0; margin: 1.5em 1.5em 1.5em 0;
padding: 0; } padding: 0; }
p img.right { p .right {
display: inline; display: inline;
float: right; float: right;
margin: 1.5em 0 1.5em 1.5em; margin: 1.5em 0 1.5em 1.5em;
@ -68,16 +68,12 @@ blockquote {
color: #666666; color: #666666;
font-style: italic; } font-style: italic; }
strong { strong, dfn {
font-weight: bold; } font-weight: bold; }
em { em, dfn {
font-style: italic; } font-style: italic; }
dfn {
font-style: italic;
font-weight: bold; }
sup, sub { sup, sub {
line-height: 0; } line-height: 0; }
@ -133,7 +129,8 @@ thead th {
th, td, caption { th, td, caption {
padding: 4px 10px 4px 5px; } padding: 4px 10px 4px 5px; }
tr.even td { table.striped tr:nth-child(even) td,
table tr.even td {
background: #e5ecf9; } background: #e5ecf9; }
tfoot { tfoot {