Skip to content

Commit

Permalink
fix(docs): remove comma between shorthand properties in themes table (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
mishkolesnikov authored and nnixaa committed Jan 12, 2018
1 parent f4c970e commit b36a409
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ node_modules
npm-debug.log
testem.log
/typings
/docs/framework

# e2e
/e2e/*.js
Expand Down
11 changes: 8 additions & 3 deletions docs/app/docs/page/blocks/ngd-theme-block.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@ export class NgdThemeComponent implements OnDestroy {
@Input('block')
set setProps(block: any) {
this.themeTitle = block.name;
this.themeContent = Object.keys(block.blockData.data).map(key => block.blockData.data[key]);
this.themeContent = Object.keys(block.blockData.data).map(key => {
const property = block.blockData.data[key];
property.value = Array.isArray(property.value)
? property.value.join(' ')
: property.value;
return property;
});
this.filteredContent = this.themeContent;
this.themeName = block.blockData.name;
this.parentTheme = block.blockData.parent;
Expand All @@ -102,7 +108,6 @@ export class NgdThemeComponent implements OnDestroy {
});
}


filterThemeContent(term) {
if (term !== this.searchTermModel) {
this.searchTermModel = term;
Expand All @@ -112,7 +117,7 @@ export class NgdThemeComponent implements OnDestroy {
this.filteredContent = filterResult;
this.isWarning = !(filterResult.length > 0);
this.renderer.setProperty(document.body, 'scrollTop', 0);
this.router.navigate([], {relativeTo: this.route});
this.router.navigate([], { relativeTo: this.route });
}
}

Expand Down
1 change: 1 addition & 0 deletions docs/app/docs/page/page.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
width: 15px;
height: 15px;
margin-left: 7px;
margin-bottom: -1px;
border-radius: 2px;
}

Expand Down
2 changes: 1 addition & 1 deletion docs/app/homepage/homepage.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

@import '../styles/themes';

$img: '~assets/images/';
$img: '../../assets/images/';
$transition: all 0.2s ease-in-out;
$tablet: 1024px;
$mobile: 767px;
Expand Down

0 comments on commit b36a409

Please sign in to comment.