survivalkit 1.0.beta.10 → 1.0.beta.11

data/stylesheets/survivalkit/fonts/_league-gothic.scss

@@ -1,46 +1,34 @@
 @import "compass/css3/font-face";
 
-/* Regular */
-@include font-face(
-    'League Gothic',
-    font-files(
-        "leaguegothic-regular-webfont.woff", woff,
-        "leaguegothic-regular-webfont.ttf", truetype,
-        "leaguegothic-regular-webfont.svg#league_gothicregular", svg),
-    'leaguegothic-regular-webfont.eot',
-    normal,
-    normal);
-
-/* Italic */
-@include font-face(
-    'League Gothic',
-    font-files(
-        "leaguegothic-italic-webfont.woff", woff,
-        "leaguegothic-italic-webfont.ttf", truetype,
-        "leaguegothic-italic-webfont.svg#league_gothic_italicregular", svg),
-    'leaguegothic-italic-webfont.eot',
-    normal,
-    italic);
-
-/* Condensed */
-@include font-face(
-    'League Gothic Condensed',
-    font-files(
-        "leaguegothic-condensed-regular-webfont.woff", woff,
-        "leaguegothic-condensed-regular-webfont.ttf", truetype,
-        "leaguegothic-condensed-regular-webfont.svg#league_gothic_condensed", svg),
-    'leaguegothic-condensed-regular-webfont.eot',
-    normal,
-    normal);
-
-
-/* Condensed Italic */
-@include font-face(
-    'League Gothic Condensed',
-    font-files(
-        "leaguegothic-condensed-italic-webfont.woff", woff,
-        "leaguegothic-condensed-italic-webfont.ttf", truetype,
-        "leaguegothic-condensed-italic-webfont.svg#league_gothic_condensed_itaRg", svg),
-    'leaguegothic-condensed-italic-webfont.eot',
-    normal,
-    italic);
+// available fonts:
+// all, regular, italic, condensed-regular, condensed-italic
+@mixin leaguegothic-font-face($fonts: all) {
+  $all-fonts: regular, italic, condensed-regular, condensed-italic;
+  @if $fonts == all {
+    $fonts: $all-fonts;
+  }
+  @each $font in $fonts {
+    @for $i from 1 through length($all-fonts) {
+      @if $font == nth($all-fonts, $i) {
+        $weight: normal;
+        $style: normal;
+        @if $font == italic {
+          $style: italic;
+        }
+        @if $font == condensed-italic {
+          $style: italic;
+        }
+        @include font-face(
+          'League Gothic',
+          font-files(
+            "leaguegothic-#{$font}-webfont.woff", woff,
+            "leaguegothic-#{$font}-webfont.ttf", truetype,
+            "leaguegothic-#{$font}-webfont.svg#league_gothic#{$font}", svg
+          ),
+          'leaguegothic-#{$font}-webfont.eot',
+          $weight,
+          $style);
+      }
+    }
+  }
+}

data/stylesheets/survivalkit/fonts/_ostrich-sans.scss

@@ -1,69 +1,62 @@
 @import "compass/css3/font-face";
 
-
-/* Regular */
-@include font-face(
-    'Ostrich',
-    font-files(
-        "ostrich-regular-webfont.woff", woff,
-        "ostrich-regular-webfont.ttf", truetype,
-        "ostrich-regular-webfont.svg#ostrich_regular_webfont", svg),
-    'ostrich-regular-webfont.eot',
-    normal,
-    normal);
-
-
-/* Light */
-@include font-face(
-    'Ostrich',
-    font-files(
-        "ostrich-light-webfont.woff", woff,
-        "ostrich-light-webfont.ttf", truetype,
-        "ostrich-light-webfont.svg#ostrich_light_webfont", svg),
-    'ostrich-light-webfont.eot',
-    300,
-    normal);
-
-/* bold */
-@include font-face(
-    'Ostrich',
-    font-files(
-        "ostrich-bold-webfont.woff", woff,
-        "ostrich-bold-webfont.ttf", truetype,
-        "ostrich-bold-webfont.svg#ostrich_bold_webfont", svg),
-    'ostrich-bold-webfont.eot',
-    bold,
-    normal);
-
-/* Black */
-@include font-face(
-    'Ostrich',
-    font-files(
-        "ostrich-black-webfont.woff", woff,
-        "ostrich-black-webfont.ttf", truetype,
-        "ostrich-black-webfont.svg#ostrich_black_webfont", svg),
-    'ostrich-black-webfont.eot',
-    black,
-    normal);
-
-/* Dashed */
-@include font-face(
+// available fonts:
+// all, regular, light, bold, black
+@mixin ostrich-font-face($fonts: all) {
+  $all-fonts: regular, light, bold, black;
+  @if $fonts == all {
+    $fonts: $all-fonts;
+  }
+  @each $font in $fonts {
+    @for $i from 1 through length($all-fonts) {
+      @if $font == nth($all-fonts, $i) {
+        $weight: normal;
+        $style: normal;
+        @if $font == italic {
+          $style: italic;
+        }
+        @if $font == condensed-italic {
+          $style: italic;
+        }
+        @include font-face(
+          'Ostrich',
+          font-files(
+            "ostrich-#{$font}-webfont.woff", woff,
+            "ostrich-#{$font}-webfont.ttf", truetype,
+            "ostrich-#{$font}-webfont.svg#ostrich#{$font}", svg
+          ),
+          'ostrich-#{$font}-webfont.eot',
+          $weight,
+          $style);
+      }
+    }
+  }
+}
+
+// dashed
+@mixin ostrich-dashed-font-face() {
+  @include font-face(
     'Ostrich Dashed',
     font-files(
-        "ostrich-dashed-webfont.woff", woff,
-        "ostrich-dashed-webfont.ttf", truetype,
-        "ostrich-dashed-webfont.svg#ostrich_dashed_webfont", svg),
+      "ostrich-dashed-webfont.woff", woff,
+      "ostrich-dashed-webfont.ttf", truetype,
+      "ostrich-dashed-webfont.svg#ostrich-dashed", svg
+    ),
     'ostrich-dashed-webfont.eot',
     normal,
     normal);
+}
 
-/* Rounded */
-@include font-face(
+// rounded
+@mixin ostrich-rounded-font-face() {
+  @include font-face(
     'Ostrich Rounded',
     font-files(
-        "ostrich-rounded-webfont.woff", woff,
-        "ostrich-rounded-webfont.ttf", truetype,
-        "ostrich-rounded-webfont.svg#ostrich_rounded_webfont", svg),
+      "ostrich-rounded-webfont.woff", woff,
+      "ostrich-rounded-webfont.ttf", truetype,
+      "ostrich-rounded-webfont.svg#ostrich-rounded#", svg
+    ),
     'ostrich-rounded-webfont.eot',
     normal,
     normal);
+}

data/stylesheets/survivalkit/reset/_formalize.scss

@@ -1,4 +1,4 @@
-@if $formalize == true {
+@mixin formalize {
   // Note: This file is dependent on Sass and Compass.
   // Sass = http://sass-lang.com
   // Compass = http://compass-style.org
@@ -289,5 +289,5 @@
   .ie6_input_disabled {
     background: #eeeeee;
   }
-
 }
+

data/stylesheets/survivalkit/reset/_meyer-reset.scss

@@ -1,7 +1,7 @@
 @mixin meyer-reset {
-  /* http://meyerweb.com/eric/tools/css/reset/
-   * v2.0 | 20110126
-   * License: none (public domain) */
+  // /* http://meyerweb.com/eric/tools/css/reset/
+  //  * v2.0 | 20110126
+  //  * License: none (public domain) */
   html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
     margin: 0;
     padding: 0;
@@ -10,7 +10,7 @@
     font: inherit;
     vertical-align: baseline;
   }
-  /* HTML5 display-role reset for older browsers */
+  // /* HTML5 display-role reset for older browsers */
   article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
     display: block;
   }