Skip to content

Commit eb83531

Browse files
committed
Merge branch 'compo-storybook' of https://github.com/Akshat55/carbon-components-angular into compo-storybook
2 parents f76c538 + 9b6dc92 commit eb83531

File tree

6 files changed

+4
-9
lines changed

6 files changed

+4
-9
lines changed

integration/ng12/src/app/app.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { BrowserModule } from '@angular/platform-browser';
44
import { AppRoutingModule } from './app-routing.module';
55
import { AppComponent } from './app.component';
66

7-
import { DropdownModule } from 'carbon-components-angular/dropdown';
8-
import { ButtonModule } from 'carbon-components-angular';
7+
import { ButtonModule, DropdownModule } from 'carbon-components-angular';
98

109
@NgModule({
1110
declarations: [

integration/ng12/src/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/* You can add global styles to this file, and also import other style files */
22
@use './../node_modules/@carbon/styles';
3-

integration/ng13/src/app/app.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { BrowserModule } from '@angular/platform-browser';
44
import { AppRoutingModule } from './app-routing.module';
55
import { AppComponent } from './app.component';
66

7-
import { DropdownModule } from 'carbon-components-angular/dropdown';
8-
import { ButtonModule } from 'carbon-components-angular';
7+
import { ButtonModule, DropdownModule } from 'carbon-components-angular';
98

109
@NgModule({
1110
declarations: [

integration/ng13/src/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/* You can add global styles to this file, and also import other style files */
22
@use './../node_modules/@carbon/styles';
3-

integration/ng14/src/app/app.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import { BrowserModule } from '@angular/platform-browser';
44
import { AppRoutingModule } from './app-routing.module';
55
import { AppComponent } from './app.component';
66

7-
import { DropdownModule } from 'carbon-components-angular/dropdown';
8-
import { ButtonModule } from 'carbon-components-angular';
7+
import { ButtonModule, DropdownModule } from 'carbon-components-angular';
98

109
@NgModule({
1110
declarations: [

integration/ng14/src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/* You can add global styles to this file, and also import other style files */
2-
@import './../node_modules/carbon-components/css/carbon-components.css';
2+
@use './../node_modules/@carbon/styles';

0 commit comments

Comments
 (0)