shoestrap 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b55de56d065f7ee9e83d2fe37589e882ea9aed96
4
- data.tar.gz: b071ba2c4aa2b53c3d0fbfbf552b568948d5e939
3
+ metadata.gz: 4499d6a51e6d8b3965197a1a3d26d5df8610bee4
4
+ data.tar.gz: 657310de883775dc187bb4b19df33ef5d15660b1
5
5
  SHA512:
6
- metadata.gz: c564e07a2a4f2db6b34fe6776ba2d90591a17a04486b4b1bbb5908947e8f11ccae61253656e95f126536c12a7432a9bba34bf155fd9765d6ab91c2e6d95eddfd
7
- data.tar.gz: 526244fef52e7144ac7e177d5be3a94e42a8343db8e277514e94c7496b9872ef61dad9a585ad37ff5b5adeea8380199c1af8ace510e486ee114489eb13d32399
6
+ metadata.gz: d9cba1a01ebf6c576989d4b75c3dac7ef3483cb6e7ca3964eab6c812ff4ae579ca1f8debc0463956c5fa3e46d67f32cd5bd9bb939b35e29f31926d1317892936
7
+ data.tar.gz: d59b93e642a1324a71a73a7e225b246beb0163e0bb67114dcbeb62eb6083fd605e13ae55381511ab539e651a9b00fedd943aa337bb9bd9dd862d544eb3368bfe
@@ -1,5 +1,11 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## 1.0.1 - 2013-09-26
4
+
5
+ * foundation integration tweaks:
6
+ - change the emCalc mixin to the new from Foundation 4.3.2
7
+ - add sass imports to ie.css.sass
8
+
3
9
  ## 1.0.0 - 2013-09-26
4
10
 
5
11
  - Cleaned up cms generator
@@ -1,3 +1,3 @@
1
1
  module Shoestrap
2
- VERSION = "1.0.0"
2
+ VERSION = "1.0.1"
3
3
  end
@@ -8,33 +8,50 @@ $green: green
8
8
  //***********************************
9
9
  // FOUNDATION SETTINGS
10
10
  //
11
- $base-font-size: 16px !default
11
+ $base-font-size: 100%
12
12
  $em-base: 16
13
13
 
14
14
  @function strip-unit($num)
15
15
  @return $num / ($num * 0 + 1)
16
16
 
17
- @function convert-to-em($value)
18
- $value: +strip-unit($value) / strip-unit($em-base) * 1em
17
+ // New Syntax, allows to optionally calculate on a different
18
+ // base value to counter compounding effect of em's.
19
+ //
20
+ // Call with 1, 2, 3 or 4 parameters, 'px' is not required but supported
21
+ // em-calc(10 20 30px 40)
22
+ // Space delimited, if you want to delimit using comma's, wrap it in another pair of brackets
23
+ // em-calc((10, 20, 30, 40px))
24
+ // Optionally call with a different base (eg: 8px) to calculate em.
25
+ // em-calc(16px 32px 48px, 8px)
26
+ // If you require to comma separate your list
27
+ // em-calc((16px, 32px, 48), 8px)
28
+
29
+ @function convert-to-em($value, $base-value: $em-base)
30
+ $value: +strip-unit($value) / strip-unit($base-value) * 1em
19
31
  @if $value == 0em
20
32
  $value: 0
21
33
  @return $value
22
34
 
35
+ // Old emCalc mixin for fallbacks
23
36
  @function emCalc($pxWidth)
24
37
  @return $pxWidth / $em-base * 1em
25
38
 
26
- @function emCalc($values...)
39
+ // New em-calc mixin
40
+ @function em-calc($values, $base-value: $em-base)
27
41
  $max: length($values)
28
42
 
29
43
  @if $max == 1
30
- @return +convert-to-em(nth($values, 1))
44
+ @return convert-to-em(nth($values, 1), $base-value)
31
45
 
32
46
  $emValues: ()
33
47
  @for $i from 1 through $max
34
- $emValues: append($emValues, convert-to-em(nth($values, $i)))
48
+ $emValues: append($emValues, convert-to-em(nth($values, $i), $base-value))
35
49
 
36
50
  @return $emValues
37
51
 
52
+ @function emCalc($values)
53
+ @return em-calc($values)
54
+
38
55
  // Colors
39
56
  $primary-color: $red
40
57
  $secondary-color: $blue
@@ -49,13 +66,13 @@ $body-font-family: Helvetica, Arial, sans-serif
49
66
  $body-font-weight: 400
50
67
 
51
68
  // Grid
52
- $row-width: +emCalc(1160px) !default
53
- $column-gutter: +emCalc(40px) !default
69
+ $row-width: +em-calc(1200px)
70
+ $column-gutter: +em-calc(40px)
54
71
  $total-columns: 12
55
72
 
56
73
  // Block Grid
57
74
  $block-grid-elements: 12
58
- $block-grid-default-spacing: +emCalc(20px)
75
+ $block-grid-default-spacing: +em-calc(20px)
59
76
 
60
77
  // Border Radius Settings
61
78
  $global-radius: 0px
@@ -80,11 +97,11 @@ $header-bottom-margin: .5em
80
97
  $header-text-rendering: optimizeLegibility
81
98
 
82
99
  /* Heading font sizes */
83
- $h1-font-size: +emCalc(44px)
84
- $h2-font-size: +emCalc(37px)
85
- $h3-font-size: +emCalc(27px)
86
- $h4-font-size: +emCalc(23px)
87
- $h5-font-size: +emCalc(18px)
100
+ $h1-font-size: +em-calc(44px)
101
+ $h2-font-size: +em-calc(37px)
102
+ $h3-font-size: +em-calc(27px)
103
+ $h4-font-size: +em-calc(23px)
104
+ $h5-font-size: +em-calc(18px)
88
105
  $h6-font-size: 1em
89
106
 
90
107
  /* Subheaders */
@@ -103,8 +120,8 @@ $paragraph-font-family: inherit
103
120
  $paragraph-font-weight: normal
104
121
  $paragraph-font-size: 1em
105
122
  $paragraph-line-height: 1.6
106
- $paragraph-margin-bottom: +emCalc(20px)
107
- $paragraph-aside-font-size: +emCalc(14px)
123
+ $paragraph-margin-bottom: +em-calc(20px)
124
+ $paragraph-aside-font-size: +em-calc(14px)
108
125
  $paragraph-aside-line-height: 1.35
109
126
  $paragraph-aside-font-style: italic
110
127
 
@@ -118,28 +135,28 @@ $anchor-font-color-hover: darken($primary-color, 5%)
118
135
  $hr-border-width: 1px
119
136
  $hr-border-style: solid
120
137
  $hr-border-color: #ddd
121
- $hr-margin: +emCalc(20px)
138
+ $hr-margin: +em-calc(20px)
122
139
 
123
140
 
124
141
  // Lists
125
142
  $list-style-position: outside
126
- $list-side-margin: +emCalc(20px)
127
- $list-nested-margin: +emCalc(20px)
143
+ $list-side-margin: +em-calc(20px)
144
+ $list-nested-margin: +em-calc(20px)
128
145
  $definition-list-header-weight: bold
129
146
  $definition-list-header-margin-bottom: .3em
130
- $definition-list-margin-bottom: +emCalc(12px)
147
+ $definition-list-margin-bottom: +em-calc(12px)
131
148
 
132
149
  // Forms
133
- $form-spacing: +emCalc(16px)
150
+ $form-spacing: +em-calc(16px)
134
151
 
135
152
  /* Labels */
136
- $form-label-font-size: +emCalc(14px)
153
+ $form-label-font-size: +em-calc(14px)
137
154
  $form-label-font-weight: 500
138
155
  $form-label-font-color: lighten(#000, 30%)
139
- $form-label-bottom-margin: +emCalc(3px)
156
+ $form-label-bottom-margin: +em-calc(3px)
140
157
  $input-font-family: inherit
141
158
  $input-font-color: rgba(0,0,0,0.75)
142
- $input-font-size: +emCalc(14px)
159
+ $input-font-size: +em-calc(14px)
143
160
  $input-bg-color: #fff
144
161
  $input-focus-bg-color: darken(#fff, 2%)
145
162
  $input-border-color: darken(#fff, 20%)
@@ -153,8 +170,8 @@ $input-include-glowing-effect: true
153
170
  $fieldset-border-style: solid
154
171
  $fieldset-border-width: 1px
155
172
  $fieldset-border-color: #ddd
156
- $fieldset-padding: +emCalc(20px)
157
- $fieldset-margin: +emCalc(18px) 0
173
+ $fieldset-padding: +em-calc(20px)
174
+ $fieldset-margin: +em-calc(18px) 0
158
175
 
159
176
  /* Prefix and postfix input elements */
160
177
  $input-prefix-bg: darken(#fff, 5%)
@@ -168,23 +185,23 @@ $input-prefix-font-color-alt: #fff
168
185
  // Button Variables
169
186
 
170
187
  /* Padding for buttons. */
171
- $button-tny: +emCalc(7px)
172
- $button-sml: +emCalc(9px)
173
- $button-med: +emCalc(12px)
174
- $button-lrg: +emCalc(16px)
188
+ $button-tny: +em-calc(7px)
189
+ $button-sml: +em-calc(9px)
190
+ $button-med: +em-calc(12px)
191
+ $button-lrg: +em-calc(16px)
175
192
 
176
193
  /* Display property. */
177
194
  $button-display: inline-block
178
- $button-margin-bottom: +emCalc(20px)
195
+ $button-margin-bottom: +em-calc(20px)
179
196
 
180
197
  /* Button text styles. */
181
198
  $button-font-family: inherit
182
199
  $button-font-color: #fff
183
200
  $button-font-color-alt: #333
184
- $button-font-med: +emCalc(16px)
185
- $button-font-tny: +emCalc(11px)
186
- $button-font-sml: +emCalc(13px)
187
- $button-font-lrg: +emCalc(20px)
201
+ $button-font-med: +em-calc(16px)
202
+ $button-font-tny: +em-calc(11px)
203
+ $button-font-sml: +em-calc(13px)
204
+ $button-font-lrg: +em-calc(20px)
188
205
  $button-font-weight: bold
189
206
  $button-font-align: center
190
207
 
@@ -195,3 +212,6 @@ $button-function-factor: 10%
195
212
  $button-border-width: 1px
196
213
  $button-border-style: solid
197
214
  $button-border-color: darken($primary-color, $button-function-factor)
215
+
216
+ // TOPBAR VARIABLES
217
+ $topbar-breakpoint: +em-calc($small-screen)
@@ -1,3 +1,10 @@
1
+ @import settings
2
+ @import foundation
3
+ @import bourbon
4
+ @import mixins
5
+
6
+ // add all "small" files to
7
+
1
8
  @import large/ie8_grid
2
9
  @import large/ie8_top_bar
3
10
  @import large/layout
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shoestrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Felipe Kaufmann