javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into css-refactor

Browse Source
This commit is contained in:
Brandy Carney
2015-12-09 17:20:13 -05:00
parent 854d90f4c1 49694f2662
commit 12abc991f5
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/blur/main.html
View File

@ -7,7 +7,7 @@
<button (click)="showBlur=true" primary>Blur</button>
<div ion-blur (click)="showBlur=false" *ng-if="showBlur" style="display: flex; justify-content: center; align-items: center; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(255,255,255,0.8);">"
<div ion-blur (click)="showBlur=false" *ng-if="showBlur" style="display: flex; justify-content: center; align-items: center; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(255,255,255,0.8);">
<h2>Blurred!</h2>
</div>
</ion-content>

7
ionic/components/blur/blur.ts
View File

@ -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]'
})

1
ionic/components/popup/popup.ts
View File

@ -61,6 +61,7 @@ import {extend} from '../../util/util';
* }
* }
* ```
* @demo /docs/v2/demos/popup/
* @see {@link /docs/v2/components#popups Popup Component Docs}
*/
@Injectable()

4
scripts/docs/gulp-tasks.js
View File

@ -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));
}));
});