From f911ae5af2f3999cf3741438f1ffcb5d55a7727b Mon Sep 17 00:00:00 2001 From: Drew Rygh Date: Wed, 9 Dec 2015 15:27:56 -0600 Subject: [PATCH 1/3] docs(popup): link to api demo --- ionic/components/popup/popup.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts index 351254b1df..f2cd107d60 100644 --- a/ionic/components/popup/popup.ts +++ b/ionic/components/popup/popup.ts @@ -61,6 +61,7 @@ import {extend} from '../../util/util'; * } * } * ``` + * @demo /docs/v2/demos/popup/ * @see {@link /docs/v2/components#popups Popup Component Docs} */ @Injectable() From 4995d80bc9cb60827ed137ac9adda93d865681f0 Mon Sep 17 00:00:00 2001 From: Drew Rygh Date: Wed, 9 Dec 2015 15:59:40 -0600 Subject: [PATCH 2/3] docs(blur): description --- demos/blur/main.html | 2 +- ionic/components/blur/blur.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/demos/blur/main.html b/demos/blur/main.html index 420478fa8c..3b5da2338e 100644 --- a/demos/blur/main.html +++ b/demos/blur/main.html @@ -7,7 +7,7 @@ -
" +

Blurred!

diff --git a/ionic/components/blur/blur.ts b/ionic/components/blur/blur.ts index 798731b47d..928a62142f 100644 --- a/ionic/components/blur/blur.ts +++ b/ionic/components/blur/blur.ts @@ -1,5 +1,12 @@ import {Directive, Renderer, ElementRef} from 'angular2/angular2'; + +/** + * The blur attribute applies the CSS blur attribute to an element. If the CSS attribute is not supported, + * it will fall back to applying a semi-transparent background color to the element. + * + * @demo /docs/v2/demos/blur/ + */ @Directive({ selector: '[ion-blur]' }) From 49694f26621665836cdf231f284e76a3d5400765 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 9 Dec 2015 16:59:57 -0500 Subject: [PATCH 3/3] chore(sass-variables): updated gulp task that generates Sass variables to place it in a tmp directory references #281 --- scripts/docs/gulp-tasks.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/docs/gulp-tasks.js b/scripts/docs/gulp-tasks.js index 1487f25a5b..93daf84da7 100644 --- a/scripts/docs/gulp-tasks.js +++ b/scripts/docs/gulp-tasks.js @@ -174,12 +174,13 @@ module.exports = function(gulp, flags) { var fs = require('fs'); var gutil = require('gulp-util'); var es = require('event-stream'); + var mkdirp = require('mkdirp'); var path = require('path'); var Entities = require('html-entities').AllHtmlEntities; entities = new Entities(); var variables = []; - var outputFile = config.docsDest + '/data/sass.json'; + var outputFile = 'tmp/sass.json'; // Add the variable to the array, encode the html and remove !default from the value function addVariable(variableName, defaultValue, file) { @@ -226,6 +227,7 @@ module.exports = function(gulp, flags) { }).on('end', function() { gutil.log("Writing to file at", gutil.colors.cyan("/driftyco/ionic2/" + outputFile)); gutil.log("Place this file in", gutil.colors.cyan("/driftyco/ionic-site/" + config.v2DocsDir + "/theming/overriding-ionic-variables/"), "in order to update the docs"); + mkdirp.sync('tmp'); fs.writeFileSync(outputFile, JSON.stringify(variables)); })); });