Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(docs): remove comma between shorthand properties in themes table … #133

Merged
merged 1 commit into from
Jan 12, 2018
Merged

fix(docs): remove comma between shorthand properties in themes table … #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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