compass 0.10.6 → 0.11.alpha.0

data/frameworks/blueprint/stylesheets/blueprint/_ie.scss

@@ -26,19 +26,15 @@
 //| <pre class="source-code sass">
 //| +blueprint-ie("body#page-1, body#page-2, body.a-special-page-type")
 //| </pre>
-@mixin blueprint-ie($body_selector: body) {
-  @if $body_selector == true {
+@mixin blueprint-ie($nested: false) {
+  @if $nested {
     @include blueprint-ie-body;
-    @include blueprint-ie-defaults; }
-  @else {
-    #{$body_selector} {
-      @include blueprint-ie-body;
-      @if $body_selector != "body" {
-        @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +blueprint-ie, pass true as the first argument and mix it into #{$body_selector}.";
-        @include blueprint-ie-defaults; } }
-    @if $body_selector == "body" {
-      @include blueprint-ie-defaults; } } }
-
+    @include blueprint-ie-defaults;
+  } @else {
+    body { @include blueprint-ie-body; }
+    @include blueprint-ie-defaults;
+  }
+}
 @mixin blueprint-ie-body {
   text-align: center;
   @include blueprint-ie-hacks; }
@@ -56,9 +52,6 @@
 @mixin blueprint-inline-form-ie {
   div, p {
     vertical-align: middle; }
-  label {
-    position: relative;
-    top: -0.25em; }
   input {
     &.checkbox, &.radio, &.button, button {
       margin: 0.5em 0; } } }
@@ -76,8 +69,17 @@
     -ms-interpolation-mode: bicubic; }
   fieldset {
     padding-top: 0; }
+  legend {
+    margin-top: -0.2em;
+    margin-bottom: 1em;
+    margin-left: -0.5em; }
+  fieldset, #IE8#HACK {padding-top:1.4em;}
+  legend, #IE8#HACK {margin-top:0;margin-bottom:0;}
   textarea {
     overflow: auto; }
+  label {
+    position: relative;
+    top: -0.25em; }
   input {
     &.text {
       margin: 0.5em 0;

data/frameworks/blueprint/stylesheets/blueprint/_interaction.scss

@@ -1,57 +1,66 @@
 @import "colors";
 
 @mixin blueprint-interaction {
-  .error {
-    @include error; }
-  .notice {
-    @include notice; }
-  .success {
-    @include success; }
-  .hide {
-    display: none; }
-  .highlight {
-    @include highlight; }
-  .added {
-    @include added; }
-  .removed {
-    @include removed; } }
+  .feedback  { @include feedback-base;     }
+  .error     { @include error(feedback);   }
+  .alert     { @extend .error;             }
+  .notice    { @include notice(feedback);  }
+  .success   { @include success(feedback); }
+  .info      { @include info(feedback);    }
+  .hide      { display: none;              }
+  .highlight { @include highlight;         }
+  .added     { @include added;             }
+  .removed   { @include removed;           }
+}
 
 @mixin feedback-base {
   padding: 0.8em;
   margin-bottom: 1em;
-  border: 2px solid $feedback_border_color; }
-
-@mixin error {
-  @include feedback-base;
-  background: $error_bg_color;
-  color: $error_color;
-  border-color: $error_border_color;
-  a {
-    color: $error_color; } }
-
-@mixin notice {
-  @include feedback-base;
-  background: $notice_bg_color;
-  color: $notice_color;
-  border-color: $notice_border_color;
-  a {
-    color: $notice_color; } }
-
-@mixin success {
-  @include feedback-base;
-  background: $success_bg_color;
-  color: $success_color;
-  border-color: $success_border_color;
-  a {
-    color: $success_color; } }
+  border: 2px solid $feedback-border-color; }
+
+@mixin error($feedback-base-class: false) {
+  @if $feedback-base-class { @extend .#{$feedback-base-class}; }
+  @else                    { @include feedback-base;           }
+  background: $error-bg-color;
+  color: $error-color;
+  border-color: $error-border-color;
+  a { color: $error-color; }
+}
+
+@mixin notice($feedback-base-class: false) {
+  @if $feedback-base-class { @extend .#{$feedback-base-class}; }
+  @else                    { @include feedback-base;           }
+  background: $notice-bg-color;
+  color: $notice-color;
+  border-color: $notice-border-color;
+  a { color: $notice-color; }
+}
+
+@mixin success($feedback-base-class: false) {
+  @if $feedback-base-class { @extend .#{$feedback-base-class}; }
+  @else                    { @include feedback-base;           }
+  background: $success-bg-color;
+  color: $success-color;
+  border-color: $success-border-color;
+  a { color: $success-color; }
+}
+
+@mixin info($feedback-base-class: false) {
+  @if $feedback-base-class { @extend .#{$feedback-base-class}; }
+  @else                    { @include feedback-base;           }
+  background: $info-bg-color;
+  color: $info-color;
+  border-color: $info-border-color;
+  a { color: $info-color; }
+}
 
 @mixin highlight {
-  background: $highlight_color; }
+  background: $highlight-color; }
 
 @mixin added {
-  background: $added_bg_color;
-  color: $added_color; }
+  background: $added-bg-color;
+  color: $added-color; }
 
 @mixin removed {
-  background: $removed_bg_color;
-  color: $removed_color; }
+  background: $removed-bg-color;
+  color: $removed-color; }

data/frameworks/blueprint/stylesheets/blueprint/_liquid.scss

@@ -18,7 +18,7 @@
 //  * Andrei Michael Herasimchuk
 //  Involution Studios, http://www.involutionstudios.com
 //  Read more about using a grid here:
-//  * subtraction.com/archives/2007/0318_oh_yeeaahh.php
+//  * subtraction.com/archives/2007/0318-oh-yeeaahh.php
 //  -----
 //  By default, the grid is 80% of window width, with 24 columns.
 //
@@ -36,58 +36,58 @@
 
 // Main layout grid, override these constants to build your grid and container sizes.
 // The width shown gives the right floored percentage values.
-$blueprint_liquid_grid_columns: 24 !default;
+$blueprint-liquid-grid-columns: 24 !default;
 
-$blueprint_liquid_grid_width: 3.167% !default;
+$blueprint-liquid-grid-width: 3.167% !default;
 
-$blueprint_liquid_grid_margin: 1.042% !default;
+$blueprint-liquid-grid-margin: 1.042% !default;
 
 // Do not edit below this line unless you really know what you're doing.
-$blueprint_liquid_container_width: 80% !default;
+$blueprint-liquid-container-width: 80% !default;
 
-$blueprint_liquid_container_min_width: 950px !default;
+$blueprint-liquid-container-min-width: 950px !default;
 
-$blueprint_liquid_grid_push_pull: -($blueprint_liquid_grid_margin + $blueprint_liquid_grid_width) !default;
+$blueprint-liquid-grid-push-pull: -($blueprint-liquid-grid-margin + $blueprint-liquid-grid-width) !default;
 
 @mixin blueprint-liquid-grid {
   // A container should group all your columns
   .container {
     @include container; }
   // Use these classes (or mixins) to set the width of a column.
-  @for $n from 1 to $blueprint_liquid_grid_columns + 1 {
+  @for $n from 1 to $blueprint-liquid-grid-columns + 1 {
     .span-#{$n} {
       @include span($n); }
     div {
       &.span-#{$n} {
-        @include column($n, $n == $blueprint_liquid_grid_columns); } } }
+        @include column($n, $n == $blueprint-liquid-grid-columns); } } }
   // The last column in a row needs this class (or mixin) or it will end up on the next row.
   div.last {
     @include last; }
   // Add these to a column to append empty cols.
-  @for $n from 1 to $blueprint_liquid_grid_columns {
+  @for $n from 1 to $blueprint-liquid-grid-columns {
     .append-#{$n} {
       @include append($n); } }
   // Add these to a column to prepend empty cols.
-  @for $n from 1 to $blueprint_liquid_grid_columns {
+  @for $n from 1 to $blueprint-liquid-grid-columns {
     .prepend-#{$n} {
       @include prepend($n); } }
   // Use these classes on an element to push it into the
   // next column, or to pull it into the previous column.
-  @for $n from 1 to $blueprint_liquid_grid_columns + 1 {
+  @for $n from 1 to $blueprint-liquid-grid-columns + 1 {
     .pull-#{$n} {
       @include pull($n); } }
-  @for $n from 1 to $blueprint_liquid_grid_columns + 1 {
+  @for $n from 1 to $blueprint-liquid-grid-columns + 1 {
     .push-#{$n} {
       @include push($n); } } }
 
 @mixin container {
-  min-width: $blueprint_liquid_container_min_width;
-  width: $blueprint_liquid_container_width;
+  min-width: $blueprint-liquid-container-min-width;
+  width: $blueprint-liquid-container-width;
   margin: 0 auto;
   @include clearfix; }
 
 @mixin span($n, $override: false) {
-  $width: $blueprint_liquid_grid_width * $n + $blueprint_liquid_grid_margin * ($n - 1);
+  $width: $blueprint-liquid-grid-width * $n + $blueprint-liquid-grid-margin * ($n - 1);
   @if $override {
     width: $width !important; }
   @else {
@@ -103,31 +103,31 @@ $blueprint_liquid_grid_push_pull: -($blueprint_liquid_grid_margin + $blueprint_l
   @if $last {
     @include last; }
   @else {
-    margin-right: $blueprint_liquid_grid_margin; } }
+    margin-right: $blueprint-liquid-grid-margin; } }
 
 @mixin append($n) {
-  padding-right: ($blueprint_liquid_grid_width + $blueprint_liquid_grid_margin) * $n; }
+  padding-right: ($blueprint-liquid-grid-width + $blueprint-liquid-grid-margin) * $n; }
 
 @mixin prepend($n) {
-  padding-left: ($blueprint_liquid_grid_width + $blueprint_liquid_grid_margin) * $n; }
+  padding-left: ($blueprint-liquid-grid-width + $blueprint-liquid-grid-margin) * $n; }
 
 @mixin pull($n, $last: false) {
-  margin-left: $blueprint_liquid_grid_push_pull * $n; }
+  margin-left: $blueprint-liquid-grid-push-pull * $n; }
 
 @mixin push($n) {
   @include float-right;
   margin: {
     top: 0;
-    left: $blueprint_liquid_grid_margin;
-    right: $blueprint_liquid_grid_push_pull * $n;
+    left: $blueprint-liquid-grid-margin;
+    right: $blueprint-liquid-grid-push-pull * $n;
     bottom: 0; }; }
 
 @mixin border {
   border-right: 1px solid #eeeeee; }
 
 @mixin colborder {
-  padding-right: $blueprint_liquid_grid_margin * 2;
-  margin-right: $blueprint_liquid_grid_margin * 2;
+  padding-right: $blueprint-liquid-grid-margin * 2;
+  margin-right: $blueprint-liquid-grid-margin * 2;
   @include border; }
 
 @mixin colruler {
@@ -137,8 +137,8 @@ $blueprint_liquid_grid_push_pull: -($blueprint_liquid_grid_margin + $blueprint_l
   width: 100%;
   height: 0.083em;
   margin: 0;
-  margin-left: $blueprint_liquid_grid_margin * 2;
-  margin-right: $blueprint_liquid_grid_margin * 2;
+  margin-left: $blueprint-liquid-grid-margin * 2;
+  margin-right: $blueprint-liquid-grid-margin * 2;
   border: none; }
 
 @mixin colspacer {

data/frameworks/blueprint/stylesheets/blueprint/_print.scss

@@ -16,25 +16,18 @@
 // body#page-1, body#page-2, body.a-special-page-type
 //   +blueprint-print(true)
 // </pre>
-// Deprecated:
-// You can pass the body selector as the first argument when used as a top-level mixin
-// <pre class="source-code sass">
-// +blueprint-print("body#page-1, body#page-2, body.a-special-page-type")
-// </pre>
-@mixin blueprint-print($body_selector: body) {
-  @if $body_selector == true {
+@mixin blueprint-print($nested: false) {
+  @if $nested {
     @include blueprint-print-body;
-    @include blueprint-print-defaults; }
-  @else {
-    #{$body_selector} {
-      @include blueprint-print-body;
-      @if $body_selector != "body" {
-        @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +blueprint-print, pass true as the first argument and mix it into #{$body_selector}.";
-        @include blueprint-print-defaults; } }
-    @if $body_selector == "body" {
-      @include blueprint-print-defaults; } } }
+    @include blueprint-print-defaults;
+  } @else {
+    body { @include blueprint-print-body; }
+    @include blueprint-print-defaults;
+  }
+}
 
-// This style is in blueprint, but I think it's annoying and it doesn't work in all browsers.
+// This style is in blueprint, but it can be annoying and
+// it doesn't work in all browsers.
 // Feel free to mix it into anchors where you want it.
 @mixin blueprint-show-link-urls {
   &:after {
@@ -43,7 +36,7 @@
 
 @mixin blueprint-print-body {
   line-height: 1.5;
-  font-family: $blueprint_font_family;
+  font-family: $blueprint-font-family;
   color: black;
   background: none;
   font-size: 10pt; }
@@ -63,11 +56,11 @@
       background: white;
       color: white; } }
   h1, h2, h3, h4, h5, h6 {
-    font-family: $blueprint_font_family; }
+    font-family: $blueprint-font-family; }
   code {
     font: {
       size: 0.9em;
-      family: $blueprint_fixed_font_family; }; }
+      family: $blueprint-fixed-font-family; }; }
   a {
     img {
       border: none; }

data/frameworks/blueprint/stylesheets/blueprint/_rtl.scss

@@ -2,21 +2,21 @@
 @import "compass/utilities/general/float";
 
 // Main layout grid, override these constants to build your grid and container sizes.
-$blueprint_grid_columns: 24 !default;
+$blueprint-grid-columns: 24 !default;
 
-$blueprint_grid_width: 30px !default;
+$blueprint-grid-width: 30px !default;
 
-$blueprint_grid_margin: 10px !default;
+$blueprint-grid-margin: 10px !default;
 
-$blueprint_grid_outer_width: $blueprint_grid_width + $blueprint_grid_margin;
+$blueprint-grid-outer-width: $blueprint-grid-width + $blueprint-grid-margin;
 
-$blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns - $blueprint_grid_margin;
+$blueprint-container-size: $blueprint-grid-outer-width * $blueprint-grid-columns - $blueprint-grid-margin;
 
 // Columns
 // Note: If you use this mixin without the class and want to support ie6
 //       you must set text-align left on your container element in an IE stylesheet.
 @mixin container {
-  width: $blueprint_container_size;
+  width: $blueprint-container-size;
   margin: 0 auto;
   direction: rtl;
   @include clearfix; }
@@ -31,26 +31,26 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
   @if $last {
     @include last; }
   @else {
-    margin-left: $blueprint_grid_margin; }
+    margin-left: $blueprint-grid-margin; }
   text-align: right;
   * html & {
     overflow-x: hidden; } }
 
 // Mixin to a column to append n empty cols.
 @mixin append($n) {
-  padding-left: $blueprint_grid_outer_width * $n; }
+  padding-left: $blueprint-grid-outer-width * $n; }
 
 // Mixin to a column to prepend n empty cols.
 @mixin prepend($n) {
-  padding-right: $blueprint_grid_outer_width * $n; }
+  padding-right: $blueprint-grid-outer-width * $n; }
 
 // mixin to a column to move it n columns to the left
 @mixin pull($n, $last: false) {
   position: relative;
   @if $last {
-    margin-right: -$blueprint_grid_outer_width * $n + $blueprint_grid_margin; }
+    margin-right: -$blueprint-grid-outer-width * $n + $blueprint-grid-margin; }
   @else {
-    margin-right: -$blueprint_grid_outer_width * $n; } }
+    margin-right: -$blueprint-grid-outer-width * $n; } }
 
 // mixin to a column to push it n columns to the right
 @mixin push($n) {
@@ -58,20 +58,20 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
   position: relative;
   margin: {
     top: 0;
-    left: -$blueprint_grid_outer_width * $n;
+    left: -$blueprint-grid-outer-width * $n;
     bottom: 1.5em;
-    right: $blueprint_grid_outer_width * $n; }; }
+    right: $blueprint-grid-outer-width * $n; }; }
 
 // Border on left hand side of a column.
 @mixin border {
-  padding-left: $blueprint_grid_margin / 2 - 1;
-  margin-left: $blueprint_grid_margin / 2;
+  padding-left: $blueprint-grid-margin / 2 - 1;
+  margin-left: $blueprint-grid-margin / 2;
   border-left: 1px solid #eeeeee; }
 
 // Border with more whitespace, spans one column.
 @mixin colborder {
-  padding-left: ($blueprint_grid_width - 2 * $blueprint_grid_margin - 1) / 2;
-  margin-left: ($blueprint_grid_width - 2 * $blueprint_grid_margin) / 2;
+  padding-left: ($blueprint-grid-width - 2 * $blueprint-grid-margin - 1) / 2;
+  margin-left: ($blueprint-grid-width - 2 * $blueprint-grid-margin) / 2;
   border-left: 1px solid #eeeeee; }
 
 // Usage examples:
@@ -91,41 +91,29 @@ $blueprint_container_size: $blueprint_grid_outer_width * $blueprint_grid_columns
 // body#page-1, body#page-2, body.a-special-page-type
 //   +rtl-typography(true)
 // </pre>
-//
-// **Deprecated**:
-// You can pass the body selector as the first argument when used as a top-level mixin
-// <pre class="source-code sass">
-// +rtl-typography("body#page-1, body#page-2, body.a-special-page-type")
-// </pre>
-@mixin rtl-typography($body_selector: body) {
-  @if $body_selector == true {
-    html & {
-      font-family: Arial, sans-serif; }
+@mixin rtl-typography($nested: false) {
+  @if $nested {
+    html & { font-family: Arial, sans-serif; }
     @include rtl-typography-defaults; }
   @else {
-    html #{$body_selector} {
-      font-family: Arial, sans-serif;
-      @if $body_selector != "body" {
-        @warn "[DEPRECATED] To specify a the selector \"#{$body_selector}\" to +rtl-typography, pass true as the first argument and mix it into #{$body_selector}.";
-        @include rtl-typography-defaults; } }
-    @if $body_selector == "body" {
-      body {
-        @include rtl-typography-defaults; } } } }
+    html body { font-family: Arial, sans-serif; }
+    body { @include rtl-typography-defaults; }
+  }
+}
 
 @mixin rtl-typography-defaults {
   h1, h2, h3, h4, h5, h6 {
     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; }