Skip to content

Commit f257182

Browse files
committed
fix yousefs review comments
1 parent b56008f commit f257182

File tree

14 files changed

+92
-47
lines changed

14 files changed

+92
-47
lines changed

package-lock.json

Lines changed: 41 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"rxjs": "^6.0.0",
6666
"zone.js": "^0.8.26",
6767
"carbon-components": "^10.0.0",
68-
"@carbon/icons-angular": "^10.0.0"
68+
"@carbon/icons-angular": "^10.1.0"
6969
},
7070
"devDependencies": {
7171
"@angular-devkit/build-angular": "0.7.1",
@@ -82,7 +82,7 @@
8282
"@angular/platform-server": "6.1.0",
8383
"@angular/router": "6.1.0",
8484
"@babel/core": "7.4.3",
85-
"@carbon/icons-angular": "10.0.0",
85+
"@carbon/icons-angular": "10.1.0",
8686
"@commitlint/cli": "7.5.2",
8787
"@commitlint/config-conventional": "7.5.0",
8888
"@compodoc/compodoc": "1.1.9",

src/datepicker/datepicker.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { DatePicker } from "./datepicker.component";
99
DatePicker
1010
],
1111
exports: [
12-
DatePicker
12+
DatePicker,
13+
DatePickerInputModule
1314
],
1415
imports: [
1516
CommonModule,

src/datepicker/datepicker.stories.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import { storiesOf, moduleMetadata } from "@storybook/angular";
22
import { action } from "@storybook/addon-actions";
3-
import { withKnobs, array } from "@storybook/addon-knobs/angular";
3+
import {
4+
withKnobs,
5+
array,
6+
select,
7+
text,
8+
boolean
9+
} from "@storybook/addon-knobs/angular";
410
import { DatePickerModule } from "../";
511

612
storiesOf("Date Picker", module)
@@ -14,7 +20,6 @@ storiesOf("Date Picker", module)
1420
.addDecorator(withKnobs)
1521
.add("Simple", () => ({
1622
template: `
17-
<app-experimental-component></app-experimental-component>
1823
<ibm-date-picker-input
1924
[theme]="theme"
2025
[label]="label"
@@ -86,7 +91,6 @@ storiesOf("Date Picker", module)
8691
}))
8792
.add("Skeleton", () => ({
8893
template: `
89-
<app-experimental-component></app-experimental-component>
9094
<ibm-date-picker
9195
range="true"
9296
skeleton="true">

src/dialog/overflow-menu/overflow-menu-option.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ import {
5151
</a>
5252
5353
<ng-template #tempOutlet>
54-
<ng-content></ng-content>
54+
<div class="bx--overflow-menu-options__option-content">
55+
<ng-content></ng-content>
56+
</div>
5557
</ng-template>
5658
`
5759
})

src/dialog/tooltip/tooltip.stories.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ import { storiesOf, moduleMetadata } from "@storybook/angular";
22
import { action } from "@storybook/addon-actions";
33
import { withKnobs, text, select } from "@storybook/addon-knobs/angular";
44

5+
import { InformationFilled16Module } from "@carbon/icons-angular/lib/information--filled/16";
56
import { DialogModule, PlaceholderModule } from "../../";
67

78
storiesOf("Tooltip", module)
89
.addDecorator(
910
moduleMetadata({
1011
imports: [
11-
DialogModule, PlaceholderModule
12+
DialogModule,
13+
PlaceholderModule,
14+
InformationFilled16Module
1215
]
1316
})
1417
)
@@ -32,10 +35,7 @@ storiesOf("Tooltip", module)
3235
trigger="click"
3336
[placement]="placement">
3437
<div role="button">
35-
<svg style="vertical-align: middle;" fill-rule="evenodd" height="16" role="img" viewBox="0 0 16 16" width="16" aria-label="tooltip">
36-
<path d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 4c.6 0 1 .4 1 1s-.4 1-1 1-1-.4-1-1
37-
.4-1 1-1zm2 8H6v-1h1V8H6V7h3v4h1v1z"></path>
38-
</svg>
38+
<ibm-icon-information-filled16></ibm-icon-information-filled16>
3939
</div>
4040
</span>
4141
</div>

src/file-uploader/file-uploader.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const noop = () => {};
1717
selector: "ibm-file-uploader",
1818
template: `
1919
<ng-container *ngIf="!skeleton; else skeletonTemplate">
20-
<strong class="bx--label">{{title}}</strong>
20+
<strong class="bx--file--label">{{title}}</strong>
2121
<p class="bx--label-description">{{description}}</p>
2222
<div class="bx--file">
2323
<button

src/link/link.directive.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,15 @@ export class Link {
2424

2525
/**
2626
* Automatically set to `-1` when link is disabled.
27-
* @memberof Link
2827
*/
2928
@HostBinding("attr.tabindex") tabindex;
3029

3130
/**
3231
* Set to true to disable link.
33-
* @memberof Link
3432
*/
3533
@Input()
3634
@HostBinding("attr.aria-disabled")
35+
@HostBinding("class.bx--link--disabled")
3736
set disabled(disabled: boolean) {
3837
this._disabled = disabled;
3938
this.tabindex = this.disabled ? -1 : null;

src/number-input/number.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export class NumberChange {
3232
template: `
3333
<label *ngIf="skeleton && label" class="bx--label bx--skeleton"></label>
3434
<label *ngIf="!skeleton && label" [for]="id" class="bx--label">{{label}}</label>
35+
<div *ngIf="helperText" class="bx--form__helper-text">{{helperText}}</div>
3536
<div
3637
data-numberinput
3738
[attr.data-invalid]="(invalid ? '' : null)"
@@ -70,7 +71,6 @@ export class NumberChange {
7071
<div *ngIf="invalid" class="bx--form-requirement">
7172
{{invalidText}}
7273
</div>
73-
<div *ngIf="helperText" class="bx--form__helper-text">{{helperText}}</div>
7474
</div>
7575
`,
7676
providers: [

src/pagination/pagination.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ import { ExperimentalService } from "./../experimental.module";
7575
<option class="bx--select-option" value="50">50</option>
7676
</select>
7777
<ibm-icon-chevron-down16
78-
class="bx--select__arrow"
78+
style="display: inherit;"
79+
innerClass="bx--select__arrow"
7980
[ariaLabel]="optionsListText | async">
8081
</ibm-icon-chevron-down16>
8182
</div>
@@ -107,7 +108,8 @@ import { ExperimentalService } from "./../experimental.module";
107108
<option *ngFor="let i of range(lastPage + 1, 1)" class="bx--select-option" [value]="i">{{i}}</option>
108109
</select>
109110
<ibm-icon-chevron-down16
110-
class="bx--select__arrow"
111+
style="display: inherit;"
112+
innerClass="bx--select__arrow"
111113
[ariaLabel]="optionsListText | async">
112114
</ibm-icon-chevron-down16>
113115
</div>

0 commit comments

Comments
 (0)