Skip to content

Commit 8693437

Browse files
authored
Merge branch 'master' into master
2 parents ef47f76 + f9afd41 commit 8693437

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Assuming we're starting with a new @angular/cli project:
2020
```shell
2121
$ npx @angular/cli new my-project --style=scss
2222
$ cd my-project
23-
$ npm i --save-dev carbon-components-angular carbon-components
23+
$ npm i --save carbon-components-angular carbon-components
2424
```
2525

2626
Then we need to include carbon-components in `src/styles.scss`:

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const dirs = {
2929

3030
const licenseTemplate = `/*!
3131
*
32-
* Neutrino v@PACKAGE_VERSION@ | @FILE_NAME@
32+
* carbon-angular v@PACKAGE_VERSION@ | @FILE_NAME@
3333
*
3434
* Copyright 2014, @THIS_YEAR@ IBM
3535
*

src/dropdown/list-item.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* ```
1313
*
1414
* `content` and `selected` are the only **required** properties you **must** provide.
15-
* When using a custom item template (supported by all the Neutrino item views, not required by AbstractDropdownView)
15+
* When using a custom item template (supported by all the Carbon-Angular item views, not required by AbstractDropdownView)
1616
* the entire ListItem will be passed to the template as `item`.
1717
*
1818
* @export

src/modal/modal-placeholder.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class ModalPlaceholder implements OnInit {
5454
* Initializes the component using `ModalService`.
5555
*/
5656
ngOnInit() {
57-
console.warn("`ibm-dialog-placeholder` has been deprecated in favour of `ibm-placeholder`");
57+
console.warn("`ibm-modal-placeholder` has been deprecated in favour of `ibm-placeholder`");
5858
this.placeholderService.registerViewContainerRef(this.viewContainerRef);
5959
}
6060
}

src/sample/sample.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { SampleInterface } from "./sample.interface";
1818
@Component({
1919
selector: "ibm-sample",
2020
template: `
21-
<p>Hello, Neutrino!</p>
21+
<p>Hello, Carbon-Angular!</p>
2222
<span>{{ foo.required }}</span>
2323
`
2424
})

src/tabs/tab-headers.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Tab } from "./tab.component";
1616

1717

1818
/**
19-
* The `TabHeaders` neutrino component contains the `Tab` items and controls scroll functionality
19+
* The `TabHeaders` component contains the `Tab` items and controls scroll functionality
2020
* if content has overflow.
2121
* @export
2222
* @class TabHeaders

src/tabs/tab.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
let nextId = 0;
1414

1515
/**
16-
* The `Tab` component is a child of the neutrino `Tabs` component.
16+
* The `Tab` component is a child of the `Tabs` component.
1717
* It represents one `Tab` item and its content within a panel of other `Tab` items.
1818
*
1919
*

src/tabs/tabs.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { TabHeaders } from "./tab-headers.component";
1212

1313

1414
/**
15-
* Build out your application's tabs using this neutrino component.
15+
* Build out your application's tabs using this component.
1616
* This is the parent of the `Tab` and `TabHeader` components.
1717
*
1818
* `Tabs` expects a set of `n-tab` elements

src/utils/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Code shared across our repos. To be used as a subtree.
44
## Modules
55

66
### position.ts
7-
A robust positioning service pulled from neutrino.
7+
A robust positioning service pulled from Carbon-Angular.
88

99
#### `Position` type
1010

0 commit comments

Comments
 (0)