bourbon 4.1.1 → 4.2.0.beta

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.
Files changed (107) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +4 -3
  3. data/.hound.yml +4 -0
  4. data/.npmignore +5 -2
  5. data/.scss-lint.yml +175 -0
  6. data/README.md +7 -12
  7. data/Rakefile +6 -4
  8. data/app/assets/stylesheets/_bourbon-deprecated-upcoming.scss +16 -7
  9. data/app/assets/stylesheets/_bourbon.scss +27 -26
  10. data/app/assets/stylesheets/addons/_border-color.scss +26 -0
  11. data/app/assets/stylesheets/addons/_border-radius.scss +48 -0
  12. data/app/assets/stylesheets/addons/_border-style.scss +25 -0
  13. data/app/assets/stylesheets/addons/_border-width.scss +25 -0
  14. data/app/assets/stylesheets/addons/_buttons.scss +64 -0
  15. data/app/assets/stylesheets/addons/_clearfix.scss +17 -10
  16. data/app/assets/stylesheets/addons/_ellipsis.scss +22 -0
  17. data/app/assets/stylesheets/addons/{_font-family.scss → _font-stacks.scss} +26 -0
  18. data/app/assets/stylesheets/addons/_hide-text.scss +23 -8
  19. data/app/assets/stylesheets/addons/_margin.scss +26 -0
  20. data/app/assets/stylesheets/addons/_padding.scss +26 -0
  21. data/app/assets/stylesheets/addons/_position.scss +24 -2
  22. data/app/assets/stylesheets/addons/_prefixer.scss +36 -15
  23. data/app/assets/stylesheets/addons/_size.scss +30 -1
  24. data/app/assets/stylesheets/addons/_text-inputs.scss +112 -0
  25. data/app/assets/stylesheets/addons/_timing-functions.scss +7 -5
  26. data/app/assets/stylesheets/addons/_triangle.scss +11 -11
  27. data/app/assets/stylesheets/addons/_word-wrap.scss +19 -0
  28. data/app/assets/stylesheets/css3/_animation.scss +14 -23
  29. data/app/assets/stylesheets/css3/_appearance.scss +1 -1
  30. data/app/assets/stylesheets/css3/_backface-visibility.scss +0 -3
  31. data/app/assets/stylesheets/css3/_background-image.scss +1 -1
  32. data/app/assets/stylesheets/css3/_background.scss +3 -3
  33. data/app/assets/stylesheets/css3/_border-image.scss +3 -3
  34. data/app/assets/stylesheets/css3/_calc.scss +1 -1
  35. data/app/assets/stylesheets/css3/_columns.scss +8 -8
  36. data/app/assets/stylesheets/css3/_filter.scss +0 -1
  37. data/app/assets/stylesheets/css3/_flex-box.scss +16 -47
  38. data/app/assets/stylesheets/css3/_font-feature-settings.scss +1 -7
  39. data/app/assets/stylesheets/css3/_hyphens.scss +2 -2
  40. data/app/assets/stylesheets/css3/_image-rendering.scss +6 -6
  41. data/app/assets/stylesheets/css3/_keyframes.scss +1 -0
  42. data/app/assets/stylesheets/css3/_linear-gradient.scss +11 -11
  43. data/app/assets/stylesheets/css3/_radial-gradient.scss +14 -14
  44. data/app/assets/stylesheets/css3/_selection.scss +39 -11
  45. data/app/assets/stylesheets/css3/_transform.scss +5 -5
  46. data/app/assets/stylesheets/css3/_transition.scss +17 -23
  47. data/app/assets/stylesheets/css3/_user-select.scss +2 -2
  48. data/app/assets/stylesheets/functions/{_assign.scss → _assign-inputs.scss} +2 -2
  49. data/app/assets/stylesheets/functions/_contains-falsy.scss +20 -0
  50. data/app/assets/stylesheets/functions/_contains.scss +16 -2
  51. data/app/assets/stylesheets/functions/_is-length.scss +5 -1
  52. data/app/assets/stylesheets/functions/_is-light.scss +21 -0
  53. data/app/assets/stylesheets/functions/_is-number.scss +11 -0
  54. data/app/assets/stylesheets/functions/_is-size.scss +8 -1
  55. data/app/assets/stylesheets/functions/_px-to-em.scss +2 -2
  56. data/app/assets/stylesheets/functions/_px-to-rem.scss +2 -2
  57. data/app/assets/stylesheets/functions/_shade.scss +24 -0
  58. data/app/assets/stylesheets/functions/_strip-units.scss +15 -3
  59. data/app/assets/stylesheets/functions/_tint.scss +24 -0
  60. data/app/assets/stylesheets/functions/_transition-property-name.scss +14 -14
  61. data/app/assets/stylesheets/functions/_unpack.scss +18 -8
  62. data/app/assets/stylesheets/helpers/_convert-units.scss +2 -2
  63. data/app/assets/stylesheets/helpers/_directional-values.scss +96 -0
  64. data/app/assets/stylesheets/helpers/_font-source-declaration.scss +2 -1
  65. data/app/assets/stylesheets/helpers/_linear-gradient-parser.scss +1 -1
  66. data/app/assets/stylesheets/helpers/_linear-positions-parser.scss +1 -1
  67. data/app/assets/stylesheets/helpers/_radial-arg-parser.scss +10 -10
  68. data/app/assets/stylesheets/helpers/_radial-gradient-parser.scss +4 -4
  69. data/app/assets/stylesheets/helpers/_radial-positions-parser.scss +2 -2
  70. data/app/assets/stylesheets/helpers/_str-to-num.scss +3 -3
  71. data/app/assets/stylesheets/settings/_asset-pipeline.scss +6 -0
  72. data/app/assets/stylesheets/settings/_prefixer.scss +5 -2
  73. data/bourbon.gemspec +4 -2
  74. data/bower.json +8 -6
  75. data/lib/bourbon/version.rb +1 -1
  76. data/package.json +1 -1
  77. data/spec/bourbon/functions/assign_inputs_spec.rb +50 -0
  78. data/spec/bourbon/functions/contains_spec.rb +27 -0
  79. data/spec/bourbon/functions/is_length_spec.rb +49 -0
  80. data/spec/bourbon/functions/is_light_spec.rb +37 -0
  81. data/spec/bourbon/functions/is_number_spec.rb +43 -0
  82. data/spec/bourbon/functions/is_size_spec.rb +43 -0
  83. data/spec/bourbon/functions/modular_scale_spec.rb +43 -0
  84. data/spec/bourbon/functions/px_to_em_spec.rb +31 -0
  85. data/spec/fixtures/_setup.scss +1 -0
  86. data/spec/fixtures/functions/assign-inputs.scss +19 -0
  87. data/spec/fixtures/functions/contains.scss +28 -0
  88. data/spec/fixtures/functions/is-length.scss +35 -0
  89. data/spec/fixtures/functions/is-light.scss +29 -0
  90. data/spec/fixtures/functions/is-number.scss +31 -0
  91. data/spec/fixtures/functions/is-size.scss +31 -0
  92. data/spec/fixtures/functions/modular-scale.scss +29 -0
  93. data/spec/fixtures/functions/px-to-em.scss +17 -0
  94. data/spec/spec_helper.rb +22 -0
  95. data/spec/support/matchers/be_contained_in.rb +10 -0
  96. data/spec/support/matchers/have_rule.rb +35 -0
  97. data/spec/support/matchers/have_value.rb +15 -0
  98. data/spec/support/parser_support.rb +16 -0
  99. data/spec/support/sass_support.rb +10 -0
  100. metadata +102 -19
  101. data/app/assets/stylesheets/addons/_directional-values.scss +0 -111
  102. data/app/assets/stylesheets/addons/_html5-input-types.scss +0 -90
  103. data/app/assets/stylesheets/css3/_border-radius.scss +0 -22
  104. data/app/assets/stylesheets/css3/_box-sizing.scss +0 -4
  105. data/app/assets/stylesheets/functions/_color-lightness.scss +0 -13
  106. data/app/assets/stylesheets/functions/_tint-shade.scss +0 -9
  107. data/app/assets/stylesheets/helpers/_is-num.scss +0 -5
@@ -0,0 +1,20 @@
1
+ @charset "UTF-8";
2
+
3
+ /// Checks if a list does not contains a value.
4
+ ///
5
+ /// @access private
6
+ ///
7
+ /// @param {List} $list
8
+ /// The list to check against.
9
+ ///
10
+ /// @return {Bool}
11
+
12
+ @function contains-falsy($list) {
13
+ @each $item in $list {
14
+ @if not $item {
15
+ @return true;
16
+ }
17
+ }
18
+
19
+ @return false;
20
+ }
@@ -1,5 +1,19 @@
1
- // Test a Sass list to see if it contains a defined value
2
- // Allows for checking if a list contains several values at once
1
+ @charset "UTF-8";
2
+
3
+ /// Checks if a list contains a value(s).
4
+ ///
5
+ /// @access private
6
+ ///
7
+ /// @param {List} $list
8
+ /// The list to check against.
9
+ ///
10
+ /// @param {List} $values
11
+ /// A single value or list of values to check for.
12
+ ///
13
+ /// @example scss - Usage
14
+ /// contains($list, $value)
15
+ ///
16
+ /// @return {Bool}
3
17
 
4
18
  @function contains($list, $values...) {
5
19
  @each $value in $values {
@@ -1,4 +1,8 @@
1
- // Check for a valid length
1
+ @charset "UTF-8";
2
+
3
+ /// Checks for a valid CSS length.
4
+ ///
5
+ /// @param {String} $value
2
6
 
3
7
  @function is-length($value) {
4
8
  @return type-of($value) != "null" and (str-slice($value + "", 1, 4) == 'calc'
@@ -0,0 +1,21 @@
1
+ @charset "UTF-8";
2
+
3
+ /// Programatically determines whether a color is light or dark.
4
+ ///
5
+ /// @link http://robots.thoughtbot.com/closer-look-color-lightness
6
+ ///
7
+ /// @param {Color (Hex)} $color
8
+ ///
9
+ /// @example scss - Usage
10
+ /// is-light($color)
11
+ ///
12
+ /// @return {Bool}
13
+
14
+ @function is-light($hex-color) {
15
+ $-local-red: red(rgba($hex-color, 1));
16
+ $-local-green: green(rgba($hex-color, 1));
17
+ $-local-blue: blue(rgba($hex-color, 1));
18
+ $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255;
19
+
20
+ @return $-local-lightness > 0.6;
21
+ }
@@ -0,0 +1,11 @@
1
+ @charset "UTF-8";
2
+
3
+ /// Checks for a valid number.
4
+ ///
5
+ /// @param {Number} $value
6
+ ///
7
+ /// @require {function} contains
8
+
9
+ @function is-number($value) {
10
+ @return contains("0" "1" "2" "3" "4" "5" "6" "7" "8" "9" 0 1 2 3 4 5 6 7 8 9, $value);
11
+ }
@@ -1,4 +1,11 @@
1
- // Check for a valid size
1
+ @charset "UTF-8";
2
+
3
+ /// Checks for a valid CSS size.
4
+ ///
5
+ /// @param {String} $value
6
+ ///
7
+ /// @require {function} contains
8
+ /// @require {function} is-length
2
9
 
3
10
  @function is-size($value) {
4
11
  @return is-length($value)
@@ -4,10 +4,10 @@
4
4
 
5
5
  @function em($pxval, $base: $em-base) {
6
6
  @if not unitless($pxval) {
7
- $pxval: strip-units($pxval);
7
+ $pxval: strip-units($pxval);
8
8
  }
9
9
  @if not unitless($base) {
10
- $base: strip-units($base);
10
+ $base: strip-units($base);
11
11
  }
12
12
  @return ($pxval / $base) * 1em;
13
13
  }
@@ -4,12 +4,12 @@
4
4
 
5
5
  @function rem($pxval) {
6
6
  @if not unitless($pxval) {
7
- $pxval: strip-units($pxval);
7
+ $pxval: strip-units($pxval);
8
8
  }
9
9
 
10
10
  $base: $em-base;
11
11
  @if not unitless($base) {
12
- $base: strip-units($base);
12
+ $base: strip-units($base);
13
13
  }
14
14
  @return ($pxval / $base) * 1rem;
15
15
  }
@@ -0,0 +1,24 @@
1
+ @charset "UTF-8";
2
+
3
+ /// Mixes a color with black.
4
+ ///
5
+ /// @param {Color} $color
6
+ ///
7
+ /// @param {Number (Percentage)} $percent
8
+ /// The amount of black to be mixed in.
9
+ ///
10
+ /// @example scss - Usage
11
+ /// .element {
12
+ /// background-color: shade(#ffbb52, 60%);
13
+ /// }
14
+ ///
15
+ /// @example css - CSS Output
16
+ /// .element {
17
+ /// background-color: #664a20;
18
+ /// }
19
+ ///
20
+ /// @return {Color}
21
+
22
+ @function shade($color, $percent) {
23
+ @return mix(#000, $color, $percent);
24
+ }
@@ -1,5 +1,17 @@
1
- // Srtips the units from a value. e.g. 12px -> 12
1
+ @charset "UTF-8";
2
2
 
3
- @function strip-units($val) {
4
- @return ($val / ($val * 0 + 1));
3
+ /// Strips the unit from a number.
4
+ ///
5
+ /// @param {Number (With Unit)} $value
6
+ ///
7
+ /// @example scss - Usage
8
+ /// $dimension: strip-units(10em);
9
+ ///
10
+ /// @example css - CSS Output
11
+ /// $dimension: 10;
12
+ ///
13
+ /// @return {Number (Unitless)}
14
+
15
+ @function strip-units($value) {
16
+ @return ($value / ($value * 0 + 1));
5
17
  }
@@ -0,0 +1,24 @@
1
+ @charset "UTF-8";
2
+
3
+ /// Mixes a color with white.
4
+ ///
5
+ /// @param {Color} $color
6
+ ///
7
+ /// @param {Number (Percentage)} $percent
8
+ /// The amount of white to be mixed in.
9
+ ///
10
+ /// @example scss - Usage
11
+ /// .element {
12
+ /// background-color: tint(#6ecaa6, 40%);
13
+ /// }
14
+ ///
15
+ /// @example css - CSS Output
16
+ /// .element {
17
+ /// background-color: #a8dfc9;
18
+ /// }
19
+ ///
20
+ /// @return {Color}
21
+
22
+ @function tint($color, $percent) {
23
+ @return mix(#fff, $color, $percent);
24
+ }
@@ -2,21 +2,21 @@
2
2
  // Example: transition-property-names((transform, color, background), moz) -> -moz-transform, color, background
3
3
  //************************************************************************//
4
4
  @function transition-property-names($props, $vendor: false) {
5
- $new-props: ();
6
-
7
- @each $prop in $props {
8
- $new-props: append($new-props, transition-property-name($prop, $vendor), comma);
9
- }
5
+ $new-props: ();
10
6
 
11
- @return $new-props;
7
+ @each $prop in $props {
8
+ $new-props: append($new-props, transition-property-name($prop, $vendor), comma);
9
+ }
10
+
11
+ @return $new-props;
12
12
  }
13
13
 
14
14
  @function transition-property-name($prop, $vendor: false) {
15
- // put other properties that need to be prefixed here aswell
16
- @if $vendor and $prop == transform {
17
- @return unquote('-'+$vendor+'-'+$prop);
18
- }
19
- @else {
20
- @return $prop;
21
- }
22
- }
15
+ // put other properties that need to be prefixed here aswell
16
+ @if $vendor and $prop == transform {
17
+ @return unquote('-'+$vendor+'-'+$prop);
18
+ }
19
+ @else {
20
+ @return $prop;
21
+ }
22
+ }
@@ -1,17 +1,27 @@
1
- // Convert shorthand to the 4-value syntax
1
+ @charset "UTF-8";
2
+
3
+ /// Converts shorthand to the 4-value syntax.
4
+ ///
5
+ /// @param {List} $shorthand
6
+ ///
7
+ /// @example scss - Usage
8
+ /// .element {
9
+ /// margin: unpack(1em 2em);
10
+ /// }
11
+ ///
12
+ /// @example css - CSS Output
13
+ /// .element {
14
+ /// margin: 1em 2em 1em 2em;
15
+ /// }
2
16
 
3
17
  @function unpack($shorthand) {
4
18
  @if length($shorthand) == 1 {
5
19
  @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1);
6
- }
7
- @else if length($shorthand) == 2 {
20
+ } @else if length($shorthand) == 2 {
8
21
  @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2);
9
- }
10
- @else if length($shorthand) == 3 {
22
+ } @else if length($shorthand) == 3 {
11
23
  @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2);
12
- }
13
- @else {
24
+ } @else {
14
25
  @return $shorthand;
15
26
  }
16
27
  }
17
-
@@ -3,8 +3,8 @@
3
3
  // Source: http://sassmeister.com/gist/9647408
4
4
  //************************************************************************//
5
5
  @function _convert-units($number, $unit) {
6
- $strings: 'px' 'cm' 'mm' '%' 'ch' 'pica' 'in' 'em' 'rem' 'pt' 'pc' 'ex' 'vw' 'vh' 'vmin' 'vmax', 'deg', 'rad', 'grad', 'turn';
7
- $units: 1px 1cm 1mm 1% 1ch 1pica 1in 1em 1rem 1pt 1pc 1ex 1vw 1vh 1vmin 1vmax, 1deg, 1rad, 1grad, 1turn;
6
+ $strings: "px" "cm" "mm" "%" "ch" "pica" "in" "em" "rem" "pt" "pc" "ex" "vw" "vh" "vmin" "vmax", "deg", "rad", "grad", "turn";
7
+ $units: 1px 1cm 1mm 1% 1ch 1pica 1in 1em 1rem 1pt 1pc 1ex 1vw 1vh 1vmin 1vmax, 1deg, 1rad, 1grad, 1turn;
8
8
  $index: index($strings, $unit);
9
9
 
10
10
  @if not $index {
@@ -0,0 +1,96 @@
1
+ @charset "UTF-8";
2
+
3
+ /// Directional-property mixins are shorthands for writing properties like the following
4
+ ///
5
+ /// @ignore You can also use `false` instead of `null`.
6
+ ///
7
+ /// @param {List} $vals
8
+ /// List of directional values
9
+ ///
10
+ /// @example scss - Usage
11
+ /// .element {
12
+ /// @include border-style(dotted null);
13
+ /// @include margin(null 0 10px);
14
+ /// }
15
+ ///
16
+ /// @example css - CSS Output
17
+ /// .element {
18
+ /// border-bottom-style: dotted;
19
+ /// border-top-style: dotted;
20
+ /// margin-bottom: 10px;
21
+ /// margin-left: 0;
22
+ /// margin-right: 0;
23
+ /// }
24
+ ///
25
+ /// @require {function} contains-falsy
26
+ ///
27
+ /// @return {List}
28
+
29
+ @function collapse-directionals($vals) {
30
+ $output: null;
31
+
32
+ $a: nth($vals, 1);
33
+ $b: if(length($vals) < 2, $a, nth($vals, 2));
34
+ $c: if(length($vals) < 3, $a, nth($vals, 3));
35
+ $d: if(length($vals) < 2, $a, nth($vals, if(length($vals) < 4, 2, 4)));
36
+
37
+ @if $a == 0 { $a: 0; }
38
+ @if $b == 0 { $b: 0; }
39
+ @if $c == 0 { $c: 0; }
40
+ @if $d == 0 { $d: 0; }
41
+
42
+ @if $a == $b and $a == $c and $a == $d { $output: $a; }
43
+ @else if $a == $c and $b == $d { $output: $a $b; }
44
+ @else if $b == $d { $output: $a $b $c; }
45
+ @else { $output: $a $b $c $d; }
46
+
47
+ @return $output;
48
+ }
49
+
50
+ /// Output directional properties, for instance `margin`.
51
+ ///
52
+ /// @access private
53
+ ///
54
+ /// @param {String} $pre
55
+ /// Prefix to use
56
+ /// @param {String} $suf
57
+ /// Suffix to use
58
+ /// @param {List} $vals
59
+ /// List of values
60
+ ///
61
+ /// @require {function} collapse-directionals
62
+ /// @require {function} contains-falsy
63
+
64
+ @mixin directional-property($pre, $suf, $vals) {
65
+ // Property Names
66
+ $top: $pre + "-top" + if($suf, "-#{$suf}", "");
67
+ $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", "");
68
+ $left: $pre + "-left" + if($suf, "-#{$suf}", "");
69
+ $right: $pre + "-right" + if($suf, "-#{$suf}", "");
70
+ $all: $pre + if($suf, "-#{$suf}", "");
71
+
72
+ $vals: collapse-directionals($vals);
73
+
74
+ @if contains-falsy($vals) {
75
+ @if nth($vals, 1) { #{$top}: nth($vals, 1); }
76
+
77
+ @if length($vals) == 1 {
78
+ @if nth($vals, 1) { #{$right}: nth($vals, 1); }
79
+ } @else {
80
+ @if nth($vals, 2) { #{$right}: nth($vals, 2); }
81
+ }
82
+
83
+ @if length($vals) == 2 {
84
+ @if nth($vals, 1) { #{$bottom}: nth($vals, 1); }
85
+ @if nth($vals, 2) { #{$left}: nth($vals, 2); }
86
+ } @else if length($vals) == 3 {
87
+ @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
88
+ @if nth($vals, 2) { #{$left}: nth($vals, 2); }
89
+ } @else if length($vals) == 4 {
90
+ @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
91
+ @if nth($vals, 4) { #{$left}: nth($vals, 4); }
92
+ }
93
+ } @else {
94
+ #{$all}: $vals;
95
+ }
96
+ }
@@ -4,7 +4,8 @@
4
4
  @function font-url-prefixer($asset-pipeline) {
5
5
  @if $asset-pipeline == true {
6
6
  @return font-url;
7
- } @else {
7
+ }
8
+ @else {
8
9
  @return url;
9
10
  }
10
11
  }
@@ -10,7 +10,7 @@
10
10
 
11
11
  $has-multiple-vals: str-index($first-val, " ");
12
12
  $has-single-position: unquote(_position-flipper($first-val) + "");
13
- $has-angle: _is-num(str-slice($first-val, 0, 0));
13
+ $has-angle: is-number(str-slice($first-val, 0, 0));
14
14
 
15
15
  @if $has-multiple-vals {
16
16
  $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals);
@@ -54,7 +54,7 @@
54
54
  }
55
55
 
56
56
  @function _position-flipper($pos) {
57
- @return if($pos == left, right, null)
57
+ @return if($pos == left, right, null)
58
58
  if($pos == right, left, null)
59
59
  if($pos == top, bottom, null)
60
60
  if($pos == bottom, top, null);
@@ -1,5 +1,5 @@
1
- @function _radial-arg-parser($G1, $G2, $pos, $shape-size) {
2
- @each $value in $G1, $G2 {
1
+ @function _radial-arg-parser($g1, $g2, $pos, $shape-size) {
2
+ @each $value in $g1, $g2 {
3
3
  $first-val: nth($value, 1);
4
4
  $pos-type: type-of($first-val);
5
5
  $spec-at-index: null;
@@ -22,7 +22,7 @@
22
22
  $pos: $pos nth($value, $i);
23
23
  }
24
24
  }
25
- $G1: null;
25
+ $g1: null;
26
26
  }
27
27
 
28
28
  // If not spec calculate correct values
@@ -37,8 +37,8 @@
37
37
 
38
38
  $pos: $value;
39
39
 
40
- @if $pos == $G1 {
41
- $G1: null;
40
+ @if $pos == $g1 {
41
+ $g1: null;
42
42
  }
43
43
  }
44
44
 
@@ -54,16 +54,16 @@
54
54
 
55
55
  $shape-size: $value;
56
56
 
57
- @if $value == $G1 {
58
- $G1: null;
57
+ @if $value == $g1 {
58
+ $g1: null;
59
59
  }
60
60
 
61
- @else if $value == $G2 {
62
- $G2: null;
61
+ @else if $value == $g2 {
62
+ $g2: null;
63
63
  }
64
64
  }
65
65
  }
66
66
  }
67
67
  }
68
- @return $G1, $G2, $pos, $shape-size;
68
+ @return $g1, $g2, $pos, $shape-size;
69
69
  }