Skip to content
This repository has been archived by the owner on Sep 28, 2023. It is now read-only.

Commit

Permalink
fix(close): hide ng-bootstrap's close icon & mention it in the docs, to
Browse files Browse the repository at this point in the history
fix #167
  • Loading branch information
ffoodd committed Feb 12, 2020
1 parent 0340abe commit c0c24e0
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/app/docs/alert.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ import { Analytics } from './shared/analytics';
<docs-wrapper component="Alert">
<h3>Demo</h3>
<demo-alert></demo-alert>
<h3 class="mt-3">Usage</h3>
<div [innerHtml]=docContent></div>
<code-box [snippets]="demoSnippets"></code-box>
</docs-wrapper>
`
})
export class DocAlert implements OnInit {
public docContent = require('html-loader!markdown-loader!./close.component.md');
public demoSnippets = {
markup: require('!!prismjs-loader?lang=html!../demos/alert.component.html'),
typescript: require('!!prismjs-loader?lang=typescript!../demos/alert.component.ts')
Expand All @@ -22,4 +25,4 @@ export class DocAlert implements OnInit {
public ngOnInit(): void {
this._analytics.trackPageViews();
}
}
}
3 changes: 3 additions & 0 deletions src/app/docs/close.component.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
To prevent ng-bootstrap's cross to appear twice, please add this (temporary) style:

`.close > [aria-hidden="true"] { display: none; }`
5 changes: 4 additions & 1 deletion src/app/docs/modal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ import { Analytics } from './shared/analytics';
<h3>Demo</h3>
<demo-modal></demo-modal>
<ng-template ngbModalContainer></ng-template>
<h3 class="mt-3">Usage</h3>
<div [innerHtml]=docContent></div>
<code-box [snippets]="demoSnippets"></code-box>
</docs-wrapper>
`
})
export class DocModal implements OnInit {
public docContent = require('html-loader!markdown-loader!./close.component.md');
public demoSnippets = {
markup: require('!!prismjs-loader?lang=html!../demos/modal.component.html'),
typescript: require('!!prismjs-loader?lang=typescript!../demos/modal.component.ts')
Expand All @@ -23,4 +26,4 @@ export class DocModal implements OnInit {
public ngOnInit(): void {
// this._analytics.trackPageViews();
}
}
}
13 changes: 12 additions & 1 deletion src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,19 @@ pre {
}
}

/* @todo Remove this when Boosted handles this */
/*
@todo Remove this when Boosted handles this
@link https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues/317
*/
.pagination {
flex-wrap: wrap;
}

/*
@todo Find a way to remove this from markup
@link https://github.com/Orange-OpenSource/Orange-Boosted-Angular/issues/167
*/
.close > [aria-hidden="true"] {
display: none;
}

0 comments on commit c0c24e0

Please sign in to comment.