Skip to content

Commit b525213

Browse files
committed
feat(bootstrap): update bootstrap to beta.2, nebular to rc.3
1 parent 3429ed0 commit b525213

File tree

11 files changed

+149
-124
lines changed

11 files changed

+149
-124
lines changed

package-lock.json

+43-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
"name": "ngx-admin",
33
"version": "2.0.0",
44
"license": "MIT",
5+
"repository": {
6+
"type": "git",
7+
"url": "git+https://github.com/akveo/ngx-admin.git"
8+
},
9+
"bugs": {
10+
"url": "https://github.com/akveo/ngx-admin/issues"
11+
},
512
"scripts": {
613
"ng": "ng",
714
"start": "ng serve",
@@ -35,13 +42,13 @@
3542
"@angular/platform-browser-dynamic": "^4.4.6",
3643
"@angular/router": "^4.4.6",
3744
"@asymmetrik/angular2-leaflet": "2.1.4",
38-
"@nebular/auth": "2.0.0-rc.2",
39-
"@nebular/theme": "2.0.0-rc.2",
40-
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.26",
45+
"@nebular/auth": "2.0.0-rc.3",
46+
"@nebular/theme": "2.0.0-rc.3",
47+
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
4148
"@swimlane/ngx-charts": "5.2.0",
4249
"angular2-chartjs": "^0.3.0",
4350
"angular2-toaster": "4.0.0",
44-
"bootstrap": "4.0.0-alpha.6",
51+
"bootstrap": "4.0.0-beta.2",
4552
"chart.js": "2.5.0",
4653
"ckeditor": "4.6.2",
4754
"classlist.js": "1.1.20150312",

protractor.conf.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ exports.config = {
99
'./e2e/**/*.e2e-spec.ts'
1010
],
1111
capabilities: {
12-
'browserName': 'chrome'
12+
'browserName': 'chrome',
13+
'chromeOptions': {
14+
'args': ['show-fps-counter=true', '--no-sandbox']
15+
}
1316
},
1417
directConnect: true,
1518
baseUrl: 'http://localhost:4200/',
@@ -23,6 +26,7 @@ exports.config = {
2326
require('ts-node').register({
2427
project: 'e2e/tsconfig.e2e.json'
2528
});
26-
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
29+
30+
jasmine.getEnv().addReporter(new SpecReporter({ acspec: { displayStacktrace: true } }));
2731
}
2832
};

src/app/pages/components/notifications/notifications.component.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<div class="col-md-6 col-sm-12">
1010
<div class="form-group">
1111
<label class="form-control-label">Place to show toast:</label>
12-
<div ngbDropdown>
12+
<div class="dropdown" ngbDropdown>
1313
<button class="btn btn-primary" type="button" ngbDropdownToggle>
1414
{{ position }}
1515
</button>
16-
<ul class="dropdown-menu">
16+
<ul ngbDropdown class="dropdown-menu">
1717
<li class="dropdown-item" *ngFor="let p of positions" (click)="position = p">
1818
{{ p }}
1919
</li>
@@ -22,11 +22,11 @@
2222
</div>
2323
<div class="form-group">
2424
<label class="form-control-label">Animation type:</label>
25-
<div ngbDropdown>
25+
<div class="dropdown" ngbDropdown>
2626
<button class="btn btn-primary" type="button" ngbDropdownToggle>
2727
{{ animationType }}
2828
</button>
29-
<ul class="dropdown-menu">
29+
<ul ngbDropdown class="dropdown-menu">
3030
<li class="dropdown-item" *ngFor="let at of animations" (click)="animationType = at">
3131
{{ at }}
3232
</li>
@@ -56,11 +56,11 @@
5656
</div>
5757
<div class="form-group">
5858
<label class="form-control-label">Toast type:</label>
59-
<div ngbDropdown>
59+
<div class="dropdown" ngbDropdown>
6060
<button class="btn btn-primary" type="button" ngbDropdownToggle>
6161
{{ type }}
6262
</button>
63-
<ul class="dropdown-menu">
63+
<ul ngbDropdown class="dropdown-menu">
6464
<li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
6565
</ul>
6666
</div>

src/app/pages/dashboard/electricity/electricity.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
</div>
4141
</div>
4242

43-
<div ngbDropdown>
43+
<div class="dropdown" ngbDropdown>
4444
<button type="button" ngbDropdownToggle class="btn"
4545
[ngClass]="{ 'btn-outline-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
4646
{{ type }}
4747
</button>
48-
<ul class="dropdown-menu">
48+
<ul class="dropdown-menu" ngbDropdownMenu>
4949
<li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
5050
</ul>
5151
</div>

src/app/pages/dashboard/traffic/traffic.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import { NbThemeService } from '@nebular/theme';
88
<nb-card size="xsmall">
99
<nb-card-header>
1010
<span>Traffic Consumption</span>
11-
<div class="ghost-dropdown" ngbDropdown>
11+
<div class="dropdown ghost-dropdown" ngbDropdown>
1212
<button type="button" class="btn btn-sm" ngbDropdownToggle
1313
[ngClass]="{ 'btn-success': currentTheme == 'default', 'btn-primary': currentTheme != 'default'}">
1414
{{ type }}
1515
</button>
16-
<ul class="dropdown-menu">
16+
<ul ngbDropdown class="dropdown-menu">
1717
<li class="dropdown-item" *ngFor="let t of types" (click)="type = t">{{ t }}</li>
1818
</ul>
1919
</div>

src/app/pages/forms/form-inputs/form-inputs.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
</span>
7373
</div>
7474
<div class="input-group">
75-
<div class="input-group-btn" ngbDropdown>
75+
<div class="dropdown input-group-btn" ngbDropdown>
7676
<button type="button" class="btn btn-success dropdown-toggle" ngbDropdownToggle>
7777
Action
7878
</button>
79-
<ul class="dropdown-menu">
79+
<ul class="dropdown-menu" ngbDropdownMenu>
8080
<li class="dropdown-item">Action</li>
8181
<li class="dropdown-item">Another action</li>
8282
<li class="dropdown-item">Something else here</li>

0 commit comments

Comments
 (0)