mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-17 16:00:14 +01:00
fix(ng2-bootstrap): update components accordingly
This commit is contained in:
parent
8a6baf283c
commit
aa5badbc96
6 changed files with 19 additions and 18 deletions
|
|
@ -41,7 +41,7 @@
|
||||||
"leaflet": "^0.7.7",
|
"leaflet": "^0.7.7",
|
||||||
"leaflet-map": "^0.2.1",
|
"leaflet-map": "^0.2.1",
|
||||||
"lodash": "^4.12.0",
|
"lodash": "^4.12.0",
|
||||||
"ng2-bootstrap": "^1.0.20",
|
"ng2-bootstrap": "1.1.0",
|
||||||
"ng2-tree": "^0.0.2-7",
|
"ng2-tree": "^0.0.2-7",
|
||||||
"ng2-ckeditor": "1.0.6",
|
"ng2-ckeditor": "1.0.6",
|
||||||
"ng2-smart-table": "^0.1.6",
|
"ng2-smart-table": "^0.1.6",
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
import { RatingComponent } from 'ng2-bootstrap/ng2-bootstrap';
|
|
||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'rating-inputs',
|
selector: 'rating-inputs',
|
||||||
directives: [RatingComponent],
|
|
||||||
template: require('./ratinginputs.html')
|
template: require('./ratinginputs.html')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,8 @@ import { FormsModule as AngularFormsModule } from '@angular/forms';
|
||||||
import { NgaModule } from '../../theme/nga.module';
|
import { NgaModule } from '../../theme/nga.module';
|
||||||
|
|
||||||
import { routing } from './forms.routing';
|
import { routing } from './forms.routing';
|
||||||
|
|
||||||
|
import { RatingModule } from 'ng2-bootstrap/ng2-bootstrap';
|
||||||
import { Forms } from './forms.component';
|
import { Forms } from './forms.component';
|
||||||
import { Inputs } from './components/inputs';
|
import { Inputs } from './components/inputs';
|
||||||
import { Layouts } from './components/layouts';
|
import { Layouts } from './components/layouts';
|
||||||
|
|
@ -14,6 +16,7 @@ import { Layouts } from './components/layouts';
|
||||||
CommonModule,
|
CommonModule,
|
||||||
AngularFormsModule,
|
AngularFormsModule,
|
||||||
NgaModule,
|
NgaModule,
|
||||||
|
RatingModule,
|
||||||
routing
|
routing
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,8 @@
|
||||||
import {Component, HostListener} from '@angular/core';
|
import {Component, HostListener} from '@angular/core';
|
||||||
import { DROPDOWN_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'dropdown-buttons',
|
selector: 'dropdown-buttons',
|
||||||
template: require('./dropdownButtons.html'),
|
template: require('./dropdownButtons.html')
|
||||||
directives: [DROPDOWN_DIRECTIVES]
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// TODO: appendToBody does not implemented yet, waiting for it
|
// TODO: appendToBody does not implemented yet, waiting for it
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<div class="row btns-row">
|
<div class="row btns-row">
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-primary" dropdownToggle>
|
<button type="button" class="btn btn-primary" dropdownToggle addToggleClass="true">
|
||||||
Primary
|
Primary
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-success" dropdownToggle>
|
<button type="button" class="btn btn-success" dropdownToggle addToggleClass="true">
|
||||||
Success
|
Success
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-info" dropdownToggle>
|
<button type="button" class="btn btn-info" dropdownToggle addToggleClass="true">
|
||||||
Info
|
Info
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -43,7 +43,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-default" dropdownToggle>
|
<button type="button" class="btn btn-default" dropdownToggle addToggleClass="true">
|
||||||
Default
|
Default
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -57,7 +57,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-warning" dropdownToggle>
|
<button type="button" class="btn btn-warning" dropdownToggle addToggleClass="true">
|
||||||
Warning
|
Warning
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-danger" dropdownToggle>
|
<button type="button" class="btn btn-danger" dropdownToggle addToggleClass="true">
|
||||||
Danger
|
Danger
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-primary">Primary</button>
|
<button type="button" class="btn btn-primary">Primary</button>
|
||||||
<button type="button" class="btn btn-primary" dropdownToggle>
|
<button type="button" class="btn btn-primary" dropdownToggle addToggleClass="true">
|
||||||
<span class="sr-only">Toggle Dropdown</span>
|
<span class="sr-only">Toggle Dropdown</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -106,7 +106,7 @@
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-success">Success</button>
|
<button type="button" class="btn btn-success">Success</button>
|
||||||
<button type="button" class="btn btn-success" dropdownToggle>
|
<button type="button" class="btn btn-success" dropdownToggle addToggleClass="true">
|
||||||
<span class="sr-only">Toggle Dropdown</span>
|
<span class="sr-only">Toggle Dropdown</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -121,7 +121,7 @@
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-info">Info</button>
|
<button type="button" class="btn btn-info">Info</button>
|
||||||
<button type="button" class="btn btn-info" dropdownToggle>
|
<button type="button" class="btn btn-info" dropdownToggle addToggleClass="true">
|
||||||
<span class="sr-only">Toggle Dropdown</span>
|
<span class="sr-only">Toggle Dropdown</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -136,7 +136,7 @@
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-default">Default</button>
|
<button type="button" class="btn btn-default">Default</button>
|
||||||
<button type="button" class="btn btn-default" dropdownToggle>
|
<button type="button" class="btn btn-default" dropdownToggle addToggleClass="true">
|
||||||
<span class="sr-only">Toggle Dropdown</span>
|
<span class="sr-only">Toggle Dropdown</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -151,7 +151,7 @@
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-warning">Warning</button>
|
<button type="button" class="btn btn-warning">Warning</button>
|
||||||
<button type="button" class="btn btn-warning" dropdownToggle>
|
<button type="button" class="btn btn-warning" dropdownToggle addToggleClass="true">
|
||||||
<span class="sr-only">Toggle Dropdown</span>
|
<span class="sr-only">Toggle Dropdown</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
@ -166,7 +166,7 @@
|
||||||
<div class="col-sm-4 col-xs-6">
|
<div class="col-sm-4 col-xs-6">
|
||||||
<div class="btn-group" dropdown>
|
<div class="btn-group" dropdown>
|
||||||
<button type="button" class="btn btn-danger">Danger</button>
|
<button type="button" class="btn btn-danger">Danger</button>
|
||||||
<button type="button" class="btn btn-danger" dropdownToggle>
|
<button type="button" class="btn btn-danger" dropdownToggle addToggleClass="true">
|
||||||
<span class="sr-only">Toggle Dropdown</span>
|
<span class="sr-only">Toggle Dropdown</span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" dropdownMenu>
|
<ul class="dropdown-menu" dropdownMenu>
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms';
|
||||||
import { NgaModule } from '../../theme/nga.module';
|
import { NgaModule } from '../../theme/nga.module';
|
||||||
|
|
||||||
import { routing } from './ui.routing';
|
import { routing } from './ui.routing';
|
||||||
|
import { DropdownModule } from 'ng2-bootstrap/ng2-bootstrap';
|
||||||
import { Ui } from './ui.component';
|
import { Ui } from './ui.component';
|
||||||
import { Buttons } from './components/buttons/buttons.component';
|
import { Buttons } from './components/buttons/buttons.component';
|
||||||
import { Grid } from './components/grid/grid.component';
|
import { Grid } from './components/grid/grid.component';
|
||||||
|
|
@ -16,6 +17,7 @@ import { Typography } from './components/typography/typography.component';
|
||||||
CommonModule,
|
CommonModule,
|
||||||
FormsModule,
|
FormsModule,
|
||||||
NgaModule,
|
NgaModule,
|
||||||
|
DropdownModule,
|
||||||
routing
|
routing
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue