Skip to content

Commit 6dc03f1

Browse files
committed
Merge pull request #96 from SassDoc/fix-annotation-in-annotation
Fix annotation in annotation
2 parents c98c331 + 3ec3b6d commit 6dc03f1

2 files changed

Lines changed: 23 additions & 20 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"rimraf": "~2.2.8",
3434
"swig-extras": "0.0.1",
3535
"ncp": "^0.5.1",
36-
"scss-comment-parser": "0.1.0",
36+
"scss-comment-parser": "^0.1.2",
3737
"mkdirp": "^0.5.0"
3838
},
3939
"devDependencies": {

view/scss/utils/_mixins.scss

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
/**
1414
* Shorthand for positioning.
1515
* @link http://hugogiraudel.com/2013/08/05/offsets-sass-mixin/ Documentation
16-
*
16+
*
1717
* @access private
18-
*
18+
*
1919
* @requires is-valid-length
20-
*
20+
*
2121
* @param {String} $position - Position type (either `absolute`, `fixed` or `relative`)
2222
* @param {List} $args (()) - List of offsets and values
2323
*
@@ -59,9 +59,9 @@
5959
* Shorthand for absolute positioning.
6060
*
6161
* @link http://hugogiraudel.com/2014/05/19/new-offsets-sass-mixin/ Documentation
62-
*
62+
*
6363
* @requires {mixin} position
64-
*
64+
*
6565
* @param {List} $args - List of offsets and values
6666
*/
6767
@mixin absolute($args) {
@@ -73,9 +73,9 @@
7373
* Shorthand for relative positioning.
7474
*
7575
* @link http://hugogiraudel.com/2014/05/19/new-offsets-sass-mixin/ Documentation
76-
*
76+
*
7777
* @requires {mixin} position
78-
*
78+
*
7979
* @param {List} $args - List of offsets and values
8080
*/
8181
@mixin relative($args) {
@@ -87,9 +87,9 @@
8787
* Shorthand for fixed positioning.
8888
*
8989
* @link http://hugogiraudel.com/2014/05/19/new-offsets-sass-mixin/ Documentation
90-
*
90+
*
9191
* @requires {mixin} position
92-
*
92+
*
9393
* @param {List} $args - List of offsets and values
9494
*/
9595
@mixin fixed($args) {
@@ -101,7 +101,7 @@
101101
* Responsive manager.
102102
*
103103
* @requires {variable} breakpoints
104-
*
104+
*
105105
* @param {String} $breakpoint - Breakpoint
106106
*
107107
* @throws No value found for `$breakpoint`. Please make sure it is defined in `$breakpoints` map.
@@ -114,7 +114,7 @@
114114
@content;
115115
}
116116
}
117-
117+
118118
// If the key doesn't exist in the map
119119
@else {
120120
@warn "No value found for `#{$breakpoint}`. "
@@ -125,12 +125,12 @@
125125

126126
/**
127127
* Mixin to fake CSS triangles with border hacks.
128-
*
128+
*
129129
* @requires {mixin} absolute
130130
* @requires {mixin} size
131131
* @requires {function} opposite-direction
132132
* @requires {function} z
133-
*
133+
*
134134
* @param {String} $direction - Triangle direction
135135
* @param {List} $position - Triangle position
136136
* @param {Color} $color (currentcolor) - Triangle color
@@ -167,7 +167,7 @@
167167

168168
/**
169169
* Mixin to handle cross browser keyframes for CSS animations.
170-
*
170+
*
171171
* @param {String} $name - Animation name
172172
*/
173173
@mixin keyframes($name) {
@@ -183,7 +183,10 @@
183183

184184
/**
185185
* Mixin to prefix properties that are not prefixed by Compass
186-
*
186+
*
187+
* @example
188+
* @include prefixer('transform', 'translate(10px)');
189+
*
187190
* @param {String} $property - Property to prefix
188191
* @param {*} $value - Value for property
189192
* @param {List} $vendors (webkit moz ms o) - Vendor prefixes to output
@@ -202,9 +205,9 @@
202205
/**
203206
* Mixin for cross-browser opacity (IE 8).
204207
* Clamps the value between 0 and 1.
205-
*
208+
*
206209
* @requires {function} clamp
207-
*
210+
*
208211
* @param {Number} $opacity - Opacity level, between 0 and 1
209212
*/
210213
@mixin opacity($opacity) {
@@ -215,9 +218,9 @@
215218

216219

217220
/*
218-
* Mixin handling inline-block and vertical-align at once.
221+
* Mixin handling inline-block and vertical-align at once.
219222
* If no align is specified, then the `vertical-align` property won't be output.
220-
*
223+
*
221224
* @param {String} $align (null) - Vertical align
222225
*/
223226
@mixin inline-block($align: null) {

0 commit comments

Comments
 (0)