feat(bootstrap): update bootstrap to beta.2, nebular to rc.3

akveo · Oct 26, 2017 · b525213 · b525213
1 parent 3429ed0
commit b525213
Show file tree

Hide file tree

Showing 11 changed files with 149 additions and 124 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,6 +2,13 @@
   "name": "ngx-admin",
   "version": "2.0.0",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/akveo/ngx-admin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/akveo/ngx-admin/issues"
+  },
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -35,13 +42,13 @@
     "@angular/platform-browser-dynamic": "^4.4.6",
     "@angular/router": "^4.4.6",
     "@asymmetrik/angular2-leaflet": "2.1.4",
-    "@nebular/auth": "2.0.0-rc.2",
-    "@nebular/theme": "2.0.0-rc.2",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.26",
+    "@nebular/auth": "2.0.0-rc.3",
+    "@nebular/theme": "2.0.0-rc.3",
+    "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
     "@swimlane/ngx-charts": "5.2.0",
     "angular2-chartjs": "^0.3.0",
     "angular2-toaster": "4.0.0",
-    "bootstrap": "4.0.0-alpha.6",
+    "bootstrap": "4.0.0-beta.2",
     "chart.js": "2.5.0",
     "ckeditor": "4.6.2",
     "classlist.js": "1.1.20150312",

diff --git a/protractor.conf.js b/protractor.conf.js
@@ -9,7 +9,10 @@ exports.config = {
     './e2e/**/*.e2e-spec.ts'
   ],
   capabilities: {
-    'browserName': 'chrome'
+    'browserName': 'chrome',
+    'chromeOptions': {
+      'args': ['show-fps-counter=true', '--no-sandbox']
+    }
   },
   directConnect: true,
   baseUrl: 'http://localhost:4200/',
@@ -23,6 +26,7 @@ exports.config = {
     require('ts-node').register({
       project: 'e2e/tsconfig.e2e.json'
     });
-    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+
+    jasmine.getEnv().addReporter(new SpecReporter({ acspec: { displayStacktrace: true } }));
   }
 };
diff --git a/src/app/pages/components/notifications/notifications.component.html b/src/app/pages/components/notifications/notifications.component.html
@@ -9,11 +9,11 @@
       <div class="col-md-6 col-sm-12">
         <div class="form-group">
           <label class="form-control-label">Place to show toast:</label>
-          <div ngbDropdown>
+          <div class="dropdown" ngbDropdown>
             <button class="btn btn-primary" type="button" ngbDropdownToggle>
               {{ position }}
             </button>
-            <ul class="dropdown-menu">
+            <ul ngbDropdown class="dropdown-menu">
               <li class="dropdown-item" *ngFor="let p of positions" (click)="position = p">
                 {{ p }}
               </li>
@@ -22,11 +22,11 @@
         </div>
         <div class="form-group">
           <label class="form-control-label">Animation type:</label>
-          <div ngbDropdown>
+          <div class="dropdown" ngbDropdown>
             <button class="btn btn-primary" type="button" ngbDropdownToggle>
               {{ animationType }}
             </button>
-            <ul class="dropdown-menu">
+            <ul ngbDropdown class="dropdown-menu">
               <li class="dropdown-item" *ngFor="let at of animations" (click)="animationType = at">
                 {{ at }}
               </li>
@@ -56,11 +56,11 @@
         </div>
         <div class="form-group">
           <label class="form-control-label">Toast type:</label>
-          <div ngbDropdown>
+          <div class="dropdown" ngbDropdown>
             <button class="btn btn-primary" type="button" ngbDropdownToggle>
               {{ type }}
             </button>
-            <ul class="dropdown-menu">
+            <ul ngbDropdown class="dropdown-menu">
               <li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
             </ul>
           </div>

diff --git a/src/app/pages/dashboard/electricity/electricity.component.html b/src/app/pages/dashboard/electricity/electricity.component.html
@@ -40,12 +40,12 @@
         </div>
       </div>
 
-      <div ngbDropdown>
+      <div class="dropdown" ngbDropdown>
         <button type="button" ngbDropdownToggle class="btn"
                 [ngClass]="{ 'btn-outline-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
           {{ type }}
         </button>
-        <ul class="dropdown-menu">
+        <ul class="dropdown-menu" ngbDropdownMenu>
           <li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
         </ul>
       </div>

diff --git a/src/app/pages/dashboard/traffic/traffic.component.ts b/src/app/pages/dashboard/traffic/traffic.component.ts
@@ -8,12 +8,12 @@ import { NbThemeService } from '@nebular/theme';
     <nb-card size="xsmall">
       <nb-card-header>
         <span>Traffic Consumption</span>
-        <div class="ghost-dropdown" ngbDropdown>
+        <div class="dropdown ghost-dropdown" ngbDropdown>
           <button type="button" class="btn btn-sm" ngbDropdownToggle
                   [ngClass]="{ 'btn-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
             {{ type }}
           </button>
-          <ul class="dropdown-menu">
+          <ul ngbDropdown class="dropdown-menu">
             <li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
           </ul>
         </div>

diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html
@@ -72,11 +72,11 @@
           </span>
         </div>
         <div class="input-group">
-          <div class="input-group-btn" ngbDropdown>
+          <div class="dropdown input-group-btn" ngbDropdown>
             <button type="button" class="btn btn-success dropdown-toggle" ngbDropdownToggle>
               Action
             </button>
-            <ul class="dropdown-menu">
+            <ul class="dropdown-menu" ngbDropdownMenu>
               <li class="dropdown-item">Action</li>
               <li class="dropdown-item">Another action</li>
               <li class="dropdown-item">Something else here</li>