Skip to content

Commit

Permalink
Update tests to use Sass 3.3 !global and Compass 1.0.0 support variab…
Browse files Browse the repository at this point in the history
…les.
  • Loading branch information
JohnAlbin committed Jan 21, 2014
1 parent 2fa343d commit 3876dd3
Show file tree
Hide file tree
Showing 13 changed files with 775 additions and 84 deletions.
75 changes: 62 additions & 13 deletions tests/controls/font.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ audio,
canvas,
video {
display: inline-block;
*display: inline;
*zoom: 1;
}

/**
Expand All @@ -51,24 +53,39 @@ template {
/* ==========================================================================
Base
========================================================================== */
/**
* Establish a vertical rhythm unit using $base-font-size, $base-line-height,
* and $rhythm-unit variables. Also, correct text resizing oddly in IE 6/7 when
* body `font-size` is set using `em` units.
*/
html {
font-size: 150%;
line-height: 1.5em;
}

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
* 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using
* `em` units.
*/
html {
font-family: Arial, sans-serif;
/* 1 */
font-size: 150%;
/* 3 */
-ms-text-size-adjust: 100%;
/* 2 */
-webkit-text-size-adjust: 100%;
/* 2 */
/* Establish a vertical rhythm unit using $base-line-height. */
line-height: 1.5em;
}

/**
* Address `font-family` inconsistency between `textarea` and other form
* elements.
*/
button,
input,
select,
textarea {
font-family: Arial, sans-serif;
}

/**
Expand Down Expand Up @@ -193,8 +210,8 @@ dfn {
* Address differences between Firefox and other browsers.
*/
hr {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
Expand Down Expand Up @@ -222,7 +239,9 @@ samp {
* Improve readability of pre-formatted text in all browsers.
*/
pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
}

/**
Expand Down Expand Up @@ -291,6 +310,15 @@ ul {
padding: 0 0 0 40px;
}

/**
* Correct list images handled incorrectly in IE 7.
*/
nav ul,
nav ol {
list-style: none;
list-style-image: none;
}

/* ==========================================================================
Embedded content
========================================================================== */
Expand All @@ -299,6 +327,8 @@ ul {
*/
img {
border: 0;
/* Improve image quality when scaled in IE 7. */
-ms-interpolation-mode: bicubic;
}

/**
Expand All @@ -321,24 +351,31 @@ figure {
/* ==========================================================================
Forms
========================================================================== */
/**
* Correct margin displayed oddly in IE 6/7.
*/
form {
margin: 0;
}

/**
* Define consistent border, margin, and padding.
*/
fieldset {
margin: 0 2px;
/* Apply borders and padding that keep the vertical rhythm. */
border-color: #c0c0c0;
border-top-style: solid;
border-top-width: 0.04167em;
border-top-style: solid;
padding-top: 0.48333em;
border-bottom-style: solid;
border-bottom-width: 0.04167em;
border-bottom-style: solid;
padding-bottom: 0.93333em;
border-left-style: solid;
border-left-width: 0.04167em;
border-left-style: solid;
padding-left: 0.89583em;
border-right-style: solid;
border-right-width: 0.04167em;
border-right-style: solid;
padding-right: 0.89583em;
}

Expand All @@ -352,6 +389,8 @@ legend {
/* 1 */
padding: 0;
/* 2 */
*margin-left: -7px;
/* 3 */
}

/**
Expand All @@ -370,6 +409,10 @@ textarea {
/* 2 */
margin: 0;
/* 3 */
vertical-align: baseline;
/* 4 */
*vertical-align: middle;
/* 4 */
}

/**
Expand Down Expand Up @@ -409,6 +452,8 @@ input[type="submit"] {
/* 2 */
cursor: pointer;
/* 3 */
*overflow: visible;
/* 4 */
}

/**
Expand All @@ -427,12 +472,16 @@ html input[disabled] {
*/
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
/* 1 */
padding: 0;
/* 2 */
*height: 13px;
/* 3 */
*width: 13px;
/* 3 */
}

/**
Expand All @@ -443,8 +492,8 @@ input[type="radio"] {
input[type="search"] {
-webkit-appearance: textfield;
/* 1 */
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
/* 2 */
}
Expand Down
45 changes: 34 additions & 11 deletions tests/controls/ie6.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,24 @@ template {
/* ==========================================================================
Base
========================================================================== */
/**
* Establish a vertical rhythm unit using $base-font-size, $base-line-height,
* and $rhythm-unit variables. Also, correct text resizing oddly in IE 6/7 when
* body `font-size` is set using `em` units.
*/
html {
font-size: 100%;
line-height: 1.5em;
}

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
* 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using
* `em` units.
*/
html {
font-family: sans-serif;
/* 1 */
font-size: 100%;
/* 3 */
-ms-text-size-adjust: 100%;
/* 2 */
-webkit-text-size-adjust: 100%;
Expand Down Expand Up @@ -204,8 +210,8 @@ dfn {
* Address differences between Firefox and other browsers.
*/
hr {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
Expand Down Expand Up @@ -298,6 +304,15 @@ ul {
padding: 0 0 0 40px;
}

/**
* Correct list images handled incorrectly in IE 7.
*/
nav ul,
nav ol {
list-style: none;
list-style-image: none;
}

/* ==========================================================================
Embedded content
========================================================================== */
Expand All @@ -306,6 +321,8 @@ ul {
*/
img {
border: 0;
/* Improve image quality when scaled in IE 7. */
-ms-interpolation-mode: bicubic;
}

/**
Expand Down Expand Up @@ -342,17 +359,17 @@ fieldset {
margin: 0 2px;
/* Apply borders and padding that keep the vertical rhythm. */
border-color: #c0c0c0;
border-top-style: solid;
border-top-width: 0.0625em;
border-top-style: solid;
padding-top: 0.4625em;
border-bottom-style: solid;
border-bottom-width: 0.0625em;
border-bottom-style: solid;
padding-bottom: 0.9125em;
border-left-style: solid;
border-left-width: 0.0625em;
border-left-style: solid;
padding-left: 0.875em;
border-right-style: solid;
border-right-width: 0.0625em;
border-right-style: solid;
padding-right: 0.875em;
}

Expand Down Expand Up @@ -429,6 +446,8 @@ input[type="submit"] {
/* 2 */
cursor: pointer;
/* 3 */
*overflow: visible;
/* 4 */
}

/**
Expand All @@ -447,12 +466,16 @@ html input[disabled] {
*/
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
/* 1 */
padding: 0;
/* 2 */
*height: 13px;
/* 3 */
*width: 13px;
/* 3 */
}

/**
Expand All @@ -463,8 +486,8 @@ input[type="radio"] {
input[type="search"] {
-webkit-appearance: textfield;
/* 1 */
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
/* 2 */
}
Expand Down
28 changes: 17 additions & 11 deletions tests/controls/ie7.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,24 @@ template {
/* ==========================================================================
Base
========================================================================== */
/**
* Establish a vertical rhythm unit using $base-font-size, $base-line-height,
* and $rhythm-unit variables. Also, correct text resizing oddly in IE 6/7 when
* body `font-size` is set using `em` units.
*/
html {
font-size: 100%;
line-height: 1.5em;
}

/**
* 1. Set default font family to sans-serif.
* 2. Prevent iOS text size adjust after orientation change, without disabling
* user zoom.
* 3. Correct text resizing oddly in IE 6/7 when body `font-size` is set using
* `em` units.
*/
html {
font-family: sans-serif;
/* 1 */
font-size: 100%;
/* 3 */
-ms-text-size-adjust: 100%;
/* 2 */
-webkit-text-size-adjust: 100%;
Expand Down Expand Up @@ -204,8 +210,8 @@ dfn {
* Address differences between Firefox and other browsers.
*/
hr {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
height: 0;
}
Expand Down Expand Up @@ -352,17 +358,17 @@ fieldset {
margin: 0 2px;
/* Apply borders and padding that keep the vertical rhythm. */
border-color: #c0c0c0;
border-top-style: solid;
border-top-width: 0.0625em;
border-top-style: solid;
padding-top: 0.4625em;
border-bottom-style: solid;
border-bottom-width: 0.0625em;
border-bottom-style: solid;
padding-bottom: 0.9125em;
border-left-style: solid;
border-left-width: 0.0625em;
border-left-style: solid;
padding-left: 0.875em;
border-right-style: solid;
border-right-width: 0.0625em;
border-right-style: solid;
padding-right: 0.875em;
}

Expand Down Expand Up @@ -459,8 +465,8 @@ html input[disabled] {
*/
input[type="checkbox"],
input[type="radio"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
/* 1 */
padding: 0;
Expand All @@ -479,8 +485,8 @@ input[type="radio"] {
input[type="search"] {
-webkit-appearance: textfield;
/* 1 */
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
/* 2 */
}
Expand Down
Loading

0 comments on commit 3876dd3

Please sign in to comment.