Skip to content

Commit 3abf3b4

Browse files
authored
Merge branch 'master' into table-skeleton
2 parents b1cf061 + 58bde3b commit 3abf3b4

File tree

5 files changed

+73
-2
lines changed

5 files changed

+73
-2
lines changed

src/number-input/number.component.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ export class NumberChange {
6060
'bx--number--helpertext': helperText,
6161
'bx--skeleton' : skeleton
6262
}">
63-
<label *ngIf="!skeleton && label" [for]="id" class="bx--label">{{label}}</label>
64-
<div *ngIf="helperText" class="bx--form__helper-text">{{helperText}}</div>
6563
<div class="bx--number__input-wrapper">
6664
<input
6765
type="number"

src/table/toolbar/table-toolbar.component.ts

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,41 @@ import { TableModel } from "../table-model.class";
22
import { Component, Input } from "@angular/core";
33
import { I18n } from "../../i18n/i18n.module";
44

5+
/**
6+
* The table toolbar is reserved for global table actions such as table settings, complex filter, export, or editing table data.
7+
*
8+
* ## Basic usage
9+
*
10+
* ```html
11+
* <ibm-table-toolbar [model]="model">
12+
* <ibm-table-toolbar-actions>
13+
* <button ibmButton="primary">
14+
* Delete
15+
* <ibm-icon-delete16 class="bx--btn__icon"></ibm-icon-delete16>
16+
* </button>
17+
* <button ibmButton="primary">
18+
* Save
19+
* <ibm-icon-save16 class="bx--btn__icon"></ibm-icon-save16>
20+
* </button>
21+
* <button ibmButton="primary">
22+
* Download
23+
* <ibm-icon-download16 class="bx--btn__icon"></ibm-icon-download16>
24+
* </button>
25+
* </ibm-table-toolbar-actions>
26+
* <ibm-table-toolbar-content>
27+
* <ibm-table-toolbar-search [expandable]="true"></ibm-table-toolbar-search>
28+
* <button ibmButton="toolbar-action">
29+
* <ibm-icon-settings16 class="bx--toolbar-action__icon"></ibm-icon-settings16>
30+
* </button>
31+
* <button ibmButton="primary" size="sm">
32+
* Primary Button
33+
* <ibm-icon-add20 class="bx--btn__icon"></ibm-icon-add20>
34+
* </button>
35+
* </ibm-table-toolbar-content>
36+
* </ibm-table-toolbar>
37+
* ```
38+
*
39+
*/
540
@Component({
641
selector: "ibm-table-toolbar",
742
template: `

src/ui-shell/header/header.component.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@ import { Component, Input, HostBinding } from "@angular/core";
22
import { I18n } from "../../i18n/i18n.module";
33

44
/**
5+
* Carbon uses feature-flags to toggle the new ui-shell feature.
6+
*
7+
* To turn on this feature flag, include the feature-flag variable into your SCSS file before importing carbon-components,
8+
* then set ui-shell to true.
9+
*
10+
* ```scss
11+
* $feature-flags: (
12+
* ui-shell: true
13+
* );
14+
* @import 'carbon-components/src/globals/scss/styles';
15+
* ```
16+
*
517
* [See demo](../../?path=/story/ui-shell--header)
618
*
719
* <example-url>../../iframe.html?id=ui-shell--header</example-url>

src/ui-shell/panel/panel.component.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
import { Component, Input } from "@angular/core";
22

3+
/**
4+
* Carbon uses feature-flags to toggle the new ui-shell feature.
5+
*
6+
* To turn on this feature flag, include the feature-flag variable into your SCSS file before importing carbon-components,
7+
* then set ui-shell to true.
8+
*
9+
* ```scss
10+
* $feature-flags: (
11+
* ui-shell: true
12+
* );
13+
* @import 'carbon-components/src/globals/scss/styles';
14+
* ```
15+
*
16+
*/
317
@Component({
418
selector: "ibm-panel",
519
template: `

src/ui-shell/sidenav/sidenav.component.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ import {
77
import { I18n } from "../../i18n/i18n.module";
88

99
/**
10+
* Carbon uses feature-flags to toggle the new ui-shell feature.
11+
*
12+
* To turn on this feature flag, include the feature-flag variable into your SCSS file before importing carbon-components,
13+
* then set ui-shell to true.
14+
*
15+
* ```scss
16+
* $feature-flags: (
17+
* ui-shell: true
18+
* );
19+
* @import 'carbon-components/src/globals/scss/styles';
20+
* ```
21+
*
1022
* [See demo](../../?path=/story/ui-shell--side-navigation)
1123
*
1224
* <example-url>../../iframe.html?id=ui-shell--side-navigation</example-url>

0 commit comments

Comments
 (0)