Merge pull request #265 from Polatouche/master

Fix dropdown menu in bs-element component
start-angular · Feb 28, 2019 · 04a62e6 · 04a62e6
2 parents 02b2dce + 453a730
commit 04a62e6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.angulardoc.json b/.angulardoc.json
@@ -0,0 +1,4 @@
+{
+  "repoId": "a13b5f05-f1dd-4d04-8f3d-e764621ce5c2",
+  "lastSync": 0
+}
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 # compiled output
 /tmp
 /out-tsc
+/dist
 
 # dependencies
 /node_modules

diff --git a/src/app/layout/bs-element/bs-element.component.html b/src/app/layout/bs-element/bs-element.component.html
@@ -58,11 +58,11 @@ <h1>Thumbnails</h1>
         <h1>Dropdown menus</h1>
         <hr>
     </div>
-    <div class="dropdown theme-dropdown clearfix">
-        <button class="btn btn-secondary">
+    <div class="dropdown theme-dropdown clearfix" ngbDropdown>
+        <button class="btn btn-secondary" ngbDropdownToggle>
             Dropdown
         </button>
-        <div class="dropdown-menu" aria-labelledby="dropdownMenu1">
+        <div class="dropdown-menu" aria-labelledby="dropdownMenu1" ngbDropdownMenu>
             <a class="dropdown-item" href="javascript:void(0)">Action</a>
             <a class="dropdown-item" href="javascript:void(0)">Another action</a>
             <a class="dropdown-item" href="javascript:void(0)">Something else here</a>

diff --git a/src/app/layout/bs-element/bs-element.module.ts b/src/app/layout/bs-element/bs-element.module.ts
@@ -4,9 +4,10 @@ import { CommonModule } from '@angular/common';
 import { BsElementRoutingModule } from './bs-element-routing.module';
 import { BsElementComponent } from './bs-element.component';
 import { PageHeaderModule } from './../../shared';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 @NgModule({
-    imports: [CommonModule, BsElementRoutingModule, PageHeaderModule],
+    imports: [CommonModule, BsElementRoutingModule, PageHeaderModule, NgbModule],
     declarations: [BsElementComponent]
 })
 export class BsElementModule {}
diff --git a/src/app/layout/components/sidebar/sidebar.component.html b/src/app/layout/components/sidebar/sidebar.component.html
@@ -145,7 +145,7 @@
         </div>
     </div>
     <div class="toggle-button" [ngClass]="{collapsed: collapsed}" (click)="toggleCollapsed()">
-        <i class="fa fa-fw fa-angle-double-left"></i>&nbsp;
+        <i class="fa fa-fw fa-angle-double-{{collapsed?'right':'left'}}"></i>&nbsp;
         <span>{{ 'Collapse Sidebar' | translate }}</span>
     </div>
 </nav>