shoestrap 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55de56d065f7ee9e83d2fe37589e882ea9aed96
-  data.tar.gz: b071ba2c4aa2b53c3d0fbfbf552b568948d5e939
+  metadata.gz: 4499d6a51e6d8b3965197a1a3d26d5df8610bee4
+  data.tar.gz: 657310de883775dc187bb4b19df33ef5d15660b1
 SHA512:
-  metadata.gz: c564e07a2a4f2db6b34fe6776ba2d90591a17a04486b4b1bbb5908947e8f11ccae61253656e95f126536c12a7432a9bba34bf155fd9765d6ab91c2e6d95eddfd
-  data.tar.gz: 526244fef52e7144ac7e177d5be3a94e42a8343db8e277514e94c7496b9872ef61dad9a585ad37ff5b5adeea8380199c1af8ace510e486ee114489eb13d32399
+  metadata.gz: d9cba1a01ebf6c576989d4b75c3dac7ef3483cb6e7ca3964eab6c812ff4ae579ca1f8debc0463956c5fa3e46d67f32cd5bd9bb939b35e29f31926d1317892936
+  data.tar.gz: d59b93e642a1324a71a73a7e225b246beb0163e0bb67114dcbeb62eb6083fd605e13ae55381511ab539e651a9b00fedd943aa337bb9bd9dd862d544eb3368bfe

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.0.1 - 2013-09-26
+
+* foundation integration tweaks:
+  - change the emCalc mixin to the new from Foundation 4.3.2
+  - add sass imports to ie.css.sass
+
 ## 1.0.0 - 2013-09-26
 
 - Cleaned up cms generator

data/lib/shoestrap/version.rb

@@ -1,3 +1,3 @@
 module Shoestrap
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/templates/foundation_generator/_settings.css.sass

@@ -8,33 +8,50 @@ $green:       green
 //***********************************
 // FOUNDATION SETTINGS
 //
-$base-font-size: 16px !default
+$base-font-size: 100%
 $em-base: 16
 
 @function strip-unit($num)
   @return $num / ($num * 0 + 1)
 
-@function convert-to-em($value)
-  $value: +strip-unit($value) / strip-unit($em-base) * 1em
+// New Syntax, allows to optionally calculate on a different
+// base value to counter compounding effect of em's.
+//
+// Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported
+// em-calc(10 20 30px 40)
+// Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
+// em-calc((10, 20, 30, 40px))
+// Optionally call with a different base (eg: 8px) to calculate em.
+// em-calc(16px 32px 48px, 8px)
+// If you require to comma separate your list
+// em-calc((16px, 32px, 48), 8px)
+
+@function convert-to-em($value, $base-value: $em-base)
+  $value: +strip-unit($value) / strip-unit($base-value) * 1em
   @if $value == 0em
     $value: 0
   @return $value
 
+// Old emCalc mixin for fallbacks
 @function emCalc($pxWidth)
   @return $pxWidth / $em-base * 1em
 
-@function emCalc($values...)
+// New em-calc mixin
+@function em-calc($values, $base-value: $em-base)
   $max: length($values)
 
   @if $max == 1
-    @return +convert-to-em(nth($values, 1))
+    @return convert-to-em(nth($values, 1), $base-value)
 
   $emValues: ()
   @for $i from 1 through $max
-    $emValues: append($emValues, convert-to-em(nth($values, $i)))
+    $emValues: append($emValues, convert-to-em(nth($values, $i), $base-value))
 
   @return $emValues
 
+@function emCalc($values)
+  @return em-calc($values)
+
 // Colors
 $primary-color: $red
 $secondary-color: $blue
@@ -49,13 +66,13 @@ $body-font-family: Helvetica, Arial, sans-serif
 $body-font-weight: 400
 
 // Grid
-$row-width: +emCalc(1160px) !default
-$column-gutter: +emCalc(40px) !default
+$row-width: +em-calc(1200px)
+$column-gutter: +em-calc(40px)
 $total-columns: 12
 
 // Block Grid
 $block-grid-elements: 12
-$block-grid-default-spacing: +emCalc(20px)
+$block-grid-default-spacing: +em-calc(20px)
 
 // Border Radius Settings
 $global-radius: 0px
@@ -80,11 +97,11 @@ $header-bottom-margin: .5em
 $header-text-rendering: optimizeLegibility
 
 /* Heading font sizes */
-$h1-font-size: +emCalc(44px)
-$h2-font-size: +emCalc(37px)
-$h3-font-size: +emCalc(27px)
-$h4-font-size: +emCalc(23px)
-$h5-font-size: +emCalc(18px)
+$h1-font-size: +em-calc(44px)
+$h2-font-size: +em-calc(37px)
+$h3-font-size: +em-calc(27px)
+$h4-font-size: +em-calc(23px)
+$h5-font-size: +em-calc(18px)
 $h6-font-size: 1em
 
 /* Subheaders */
@@ -103,8 +120,8 @@ $paragraph-font-family: inherit
 $paragraph-font-weight: normal
 $paragraph-font-size: 1em
 $paragraph-line-height: 1.6
-$paragraph-margin-bottom: +emCalc(20px)
-$paragraph-aside-font-size: +emCalc(14px)
+$paragraph-margin-bottom: +em-calc(20px)
+$paragraph-aside-font-size: +em-calc(14px)
 $paragraph-aside-line-height: 1.35
 $paragraph-aside-font-style: italic
 
@@ -118,28 +135,28 @@ $anchor-font-color-hover: darken($primary-color, 5%)
 $hr-border-width: 1px
 $hr-border-style: solid
 $hr-border-color: #ddd
-$hr-margin: +emCalc(20px)
+$hr-margin: +em-calc(20px)
 
 
 // Lists
 $list-style-position: outside
-$list-side-margin: +emCalc(20px)
-$list-nested-margin: +emCalc(20px)
+$list-side-margin: +em-calc(20px)
+$list-nested-margin: +em-calc(20px)
 $definition-list-header-weight: bold
 $definition-list-header-margin-bottom: .3em
-$definition-list-margin-bottom: +emCalc(12px)
+$definition-list-margin-bottom: +em-calc(12px)
 
 // Forms
-$form-spacing: +emCalc(16px)
+$form-spacing: +em-calc(16px)
 
 /* Labels */
-$form-label-font-size: +emCalc(14px)
+$form-label-font-size: +em-calc(14px)
 $form-label-font-weight: 500
 $form-label-font-color: lighten(#000, 30%)
-$form-label-bottom-margin: +emCalc(3px)
+$form-label-bottom-margin: +em-calc(3px)
 $input-font-family: inherit
 $input-font-color: rgba(0,0,0,0.75)
-$input-font-size: +emCalc(14px)
+$input-font-size: +em-calc(14px)
 $input-bg-color: #fff
 $input-focus-bg-color: darken(#fff, 2%)
 $input-border-color: darken(#fff, 20%)
@@ -153,8 +170,8 @@ $input-include-glowing-effect: true
 $fieldset-border-style: solid
 $fieldset-border-width: 1px
 $fieldset-border-color: #ddd
-$fieldset-padding: +emCalc(20px)
-$fieldset-margin: +emCalc(18px) 0
+$fieldset-padding: +em-calc(20px)
+$fieldset-margin: +em-calc(18px) 0
 
 /* Prefix and postfix input elements */
 $input-prefix-bg: darken(#fff, 5%)
@@ -168,23 +185,23 @@ $input-prefix-font-color-alt: #fff
 // Button Variables
 
 /* Padding for buttons. */
-$button-tny: +emCalc(7px)
-$button-sml: +emCalc(9px)
-$button-med: +emCalc(12px)
-$button-lrg: +emCalc(16px)
+$button-tny: +em-calc(7px)
+$button-sml: +em-calc(9px)
+$button-med: +em-calc(12px)
+$button-lrg: +em-calc(16px)
 
 /* Display property. */
 $button-display: inline-block
-$button-margin-bottom: +emCalc(20px)
+$button-margin-bottom: +em-calc(20px)
 
 /* Button text styles. */
 $button-font-family: inherit
 $button-font-color: #fff
 $button-font-color-alt: #333
-$button-font-med: +emCalc(16px)
-$button-font-tny: +emCalc(11px)
-$button-font-sml: +emCalc(13px)
-$button-font-lrg: +emCalc(20px)
+$button-font-med: +em-calc(16px)
+$button-font-tny: +em-calc(11px)
+$button-font-sml: +em-calc(13px)
+$button-font-lrg: +em-calc(20px)
 $button-font-weight: bold
 $button-font-align: center
 
@@ -195,3 +212,6 @@ $button-function-factor: 10%
 $button-border-width: 1px
 $button-border-style: solid
 $button-border-color: darken($primary-color, $button-function-factor)
+
+// TOPBAR VARIABLES
+$topbar-breakpoint: +em-calc($small-screen)

data/templates/foundation_generator/ie.css.sass

@@ -1,3 +1,10 @@
+@import settings
+@import foundation
+@import bourbon
+@import mixins
+
+// add all "small" files to
+
 @import large/ie8_grid
 @import large/ie8_top_bar
 @import large/layout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoestrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Felipe Kaufmann