stipe 0.0.2.1 → 0.0.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/stylesheets/stipe/_grid.scss +2 -1
  2. data/stylesheets/stipe/buttons/_extends.scss +2 -2
  3. data/stylesheets/stipe/forms/_extends.scss +1 -1
  4. data/stylesheets/stipe/forms/_mixins.scss +2 -2
  5. data/stylesheets/stipe/grid/_mixins.scss +3 -3
  6. data/stylesheets/stipe/grid/lib/_the_grid.scss +9 -7
  7. data/stylesheets/stipe/stipe/_extends.scss +14 -0
  8. metadata +1 -1
data/stylesheets/stipe/_grid.scss CHANGED
@@ -30,7 +30,8 @@
30
30
  $grid_type: 12 !default; // sets default column grid
31
31
  $grid_context: 12 !default; // sets default context of grid width for percentage calculations
32
32
  $grid_uom: percent !default; // use either ``em`` or ``percent``
33
- $grid_padding_lr: 0 !default; // sets default left/right padding inside grid block
33
+ $grid_padding_l: 0 !default; // sets default left/right padding inside grid block
34
+ $grid_padding_r: 0 !default; // sets default left/right padding inside grid block
34
35
  $grid_padding_tb: 0 !default; // sets default top/bottom padding inside grid block
35
36
  $grid_border: 0 !default; // sets default border width on all grid blocks
36
37
  $grid_child: none !default; // sets parent child relationship between grid blocks
data/stylesheets/stipe/buttons/_extends.scss CHANGED
@@ -2,12 +2,12 @@
2
2
  // ---------------------------------------------------------
3
3
 
4
4
  %stipe_buttons {
5
- @extend %minimal;
5
+ @extend %minimal !optional;
6
6
  margin-right: em(10);
7
7
  &:last-child {
8
8
  margin: 0;
9
9
  }
10
10
  &:nth-child(n+2) {
11
- @extend %cupid-green;
11
+ @extend %cupid-green !optional;
12
12
  }
13
13
  }
data/stylesheets/stipe/forms/_extends.scss CHANGED
@@ -5,7 +5,7 @@
5
5
  background: $form_field_background_color;
6
6
  @include medium();
7
7
  height: #{32 / $em}em;
8
- @include grid(12,12,$grid_uom:combo, $grid_padding_lr:6);
8
+ @include grid(12,12,$grid_uom:combo, $grid_padding_l:6, $grid_padding_r:6);
9
9
  @include placeholder ($delta_gray);
10
10
 
11
11
  @include field_focus;
data/stylesheets/stipe/forms/_mixins.scss CHANGED
@@ -23,9 +23,9 @@
23
23
 
24
24
  /////////// Alert mixins //////////////
25
25
  // -----------------------------------------
26
- @mixin alert_boxes ($background_color, $padding_tb, $padding_lr, $margin_bottom) {
26
+ @mixin alert_boxes ($background_color, $padding_tb, $padding_l, $padding_r, $margin_bottom: 0) {
27
27
  background-color: $background_color;
28
- @include grid(12,12.25, $grid_uom:combo, $grid_child: alphaomega, $grid_padding_lr: $padding_lr);
28
+ @include grid(12,12.25, $grid_uom:combo, $grid_child: alphaomega, $grid_padding_l: $padding_l, $grid_padding_r: $padding_r);
29
29
  padding-top: #{$padding_tb / $em}em;
30
30
  padding-bottom: #{$padding_tb / $em}em;
31
31
  margin-bottom: #{$margin_bottom / $em}em;
data/stylesheets/stipe/grid/_mixins.scss CHANGED
@@ -6,15 +6,15 @@
6
6
  // All values are entered as integers and conversion math is done in the mixin.
7
7
  // Do not enter combination values such as '36em'
8
8
 
9
- @mixin grid($col_count, $grid_child, $grid_padding_lr, $grid_padding_tb, $grid_border, $grid_uom, $col_gutter, $grid_type, $grid_align, $grid_context) {
9
+ @mixin grid($col_count, $grid_child, $grid_padding_l, $grid_padding_r, $grid_padding_tb, $grid_border, $grid_uom, $col_gutter, $grid_type, $grid_align, $grid_context) {
10
10
 
11
11
  @if $grid_type == 12 {
12
12
  $col_width: 80 - $col_gutter;
13
- @include the_grid($col_count, $col_width, $grid_uom, $grid_padding_lr, $grid_padding_tb, $grid_border, $grid_child, $col_gutter, $grid_align, $grid_context);
13
+ @include the_grid($col_count, $col_width, $grid_uom, $grid_padding_l, $grid_padding_r, $grid_padding_tb, $grid_border, $grid_child, $col_gutter, $grid_align, $grid_context);
14
14
  }
15
15
  @else if $grid_type == 16 {
16
16
  $col_width: 60 - $col_gutter;
17
- @include the_grid($col_count, $col_width, $grid_uom, $grid_padding_lr, $grid_padding_tb, $grid_border, $grid_child, $col_gutter, $grid_align);
17
+ @include the_grid($col_count, $col_width, $grid_uom, $grid_padding_l, $grid_padding_r, $grid_padding_tb, $grid_border, $grid_child, $col_gutter, $grid_align, $grid_context);
18
18
  }
19
19
  }
20
20
 
data/stylesheets/stipe/grid/lib/_the_grid.scss CHANGED
@@ -1,12 +1,14 @@
1
1
  // 'the_grid' determines width by taking column count, calculates gutter count
2
2
  // default setting for grid is ``em`` this is specified in ``_config.scss``
3
3
 
4
- @mixin the_grid($col_count, $col_width, $grid_uom, $grid_padding_lr, $grid_padding_tb, $grid_border, $grid_child, $col_gutter, $grid_align, $grid_context) {
4
+ @mixin the_grid($col_count, $col_width, $grid_uom, $grid_padding_l, $grid_padding_r, $grid_padding_tb, $grid_border, $grid_child, $col_gutter, $grid_align, $grid_context) {
5
5
 
6
6
  $col_gutter_width: ($col_count - 1) * $col_gutter + ($col_count * $col_width); //determines full col width with gutters
7
7
 
8
8
  $grid_context_width: $grid_context * 80; // determines width of contextual grid block for calculating percentages
9
9
 
10
+ $grid_padding_lr: $grid_padding_l + $grid_padding_r;
11
+
10
12
  @include grid_placement($grid_align, $grid_uom, $grid_child, $grid_context_width, $margin: $col_gutter / 2);
11
13
 
12
14
  @if $grid_uom == em {
@@ -16,8 +18,8 @@
16
18
 
17
19
  @if $grid_padding_lr > 0 {
18
20
  padding: {
19
- left: em($grid_padding_lr);
20
- right: em($grid_padding_lr);
21
+ left: em($grid_padding_l);
22
+ right: em($grid_padding_r);
21
23
  }
22
24
  }
23
25
  @if $grid_padding_tb > 0 {
@@ -49,8 +51,8 @@
49
51
  @if $grid_padding_lr > 0 {
50
52
  padding: {
51
53
  //left: $grid_padding_lr / $grid_960;
52
- left: $grid_padding_lr / $grid_context_width * 100%;
53
- right: $grid_padding_lr / $grid_context_width * 100%;
54
+ left: $grid_padding_l / $grid_context_width * 100%;
55
+ right: $grid_padding_r / $grid_context_width * 100%;
54
56
  }
55
57
  }
56
58
  @if $grid_padding_tb > 0 {
@@ -74,8 +76,8 @@
74
76
  $grid_width: $col_gutter_width / $grid_context_width * 100%;
75
77
  @if $grid_padding_lr > 0 {
76
78
  padding: {
77
- left: em($grid_padding_lr);
78
- right: em($grid_padding_lr);
79
+ left: em($grid_padding_l);
80
+ right: em($grid_padding_r);
79
81
  }
80
82
  }
81
83
  @if $grid_padding_tb > 0 {
data/stylesheets/stipe/stipe/_extends.scss CHANGED
@@ -1,3 +1,6 @@
1
+ // Use "!optional" flag of silent extend is allowed to fail
2
+ // example: "@extend %minimal !optional"
3
+
1
4
 
2
5
 
3
6
  //* Generic global UI objects */
@@ -6,6 +9,17 @@
6
9
  @include clearfix;
7
10
  }
8
11
 
12
+ %hide_text {
13
+ @include hide_text;
14
+ }
15
+
16
+ %mobile_hide {
17
+ @media #{$mobile} {
18
+ display: none;
19
+ visibility: hidden;
20
+ }
21
+ }
22
+
9
23
  %standard_block_spacing {
10
24
  @include standard_block_spacing;
11
25
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: stipe
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2.1
4
+ version: 0.0.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: