Skip to content

Commit d915b2f

Browse files
mrholekmrholek
committed
- Fix height and position problems with .fixed-footer
- Fix mobile sidebar height - Fix mobile breadcrumb position with .fixed-breadcrumb - Add new navbar toggler icon - Update old bootstrap classes ex. `hidden-sm-down`
1 parent 5ab355d commit d915b2f

File tree

66 files changed

+871
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+871
-623
lines changed

Diff for: ‎Angular4_CLI_Full_Project/.angular-cli.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"version": "1.0.1",
4+
"version": "1.0.2",
55
"name": "@coreui/angular"
66
},
77
"apps": [

Diff for: ‎Angular4_CLI_Full_Project/package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"description": "",
55
"author": "",
66
"url": "http://coreui.io",
@@ -16,32 +16,33 @@
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/common": "4.4.2",
20-
"@angular/compiler": "4.4.2",
21-
"@angular/core": "4.4.2",
22-
"@angular/forms": "4.4.2",
23-
"@angular/http": "4.4.2",
24-
"@angular/platform-browser": "4.4.2",
25-
"@angular/platform-browser-dynamic": "4.4.2",
26-
"@angular/router": "4.4.2",
27-
"@angular/upgrade": "4.4.2",
19+
"@angular/common": "4.4.4",
20+
"@angular/compiler": "4.4.4",
21+
"@angular/core": "4.4.4",
22+
"@angular/forms": "4.4.4",
23+
"@angular/http": "4.4.4",
24+
"@angular/platform-browser": "4.4.4",
25+
"@angular/platform-browser-dynamic": "4.4.4",
26+
"@angular/router": "4.4.4",
27+
"@angular/upgrade": "4.4.4",
2828
"chart.js": "2.7.0",
2929
"core-js": "2.5.1",
3030
"font-awesome": "^4.7.0",
31-
"moment": "2.18.1",
32-
"ngx-bootstrap": "1.9.3",
31+
"is-url-external": "^1.0.3",
32+
"moment": "2.19.1",
3333
"ng2-charts": "1.6.0",
34+
"ngx-bootstrap": "1.9.3",
3435
"rxjs": "5.4.3",
3536
"simple-line-icons": "^2.4.1",
3637
"ts-helpers": "1.1.2",
37-
"zone.js": "0.8.17"
38+
"zone.js": "0.8.18"
3839
},
3940
"devDependencies": {
40-
"@angular/cli": "1.4.2",
41-
"@angular/compiler-cli": "4.4.2",
41+
"@angular/cli": "1.4.6",
42+
"@angular/compiler-cli": "4.4.4",
4243
"@types/jasmine": "2.6.0",
43-
"@types/node": "8.0.28",
44-
"codelyzer": "3.2.0",
44+
"@types/node": "8.0.34",
45+
"codelyzer": "3.2.1",
4546
"jasmine-core": "2.8.0",
4647
"jasmine-spec-reporter": "4.2.1",
4748
"karma": "1.7.1",
@@ -53,7 +54,7 @@
5354
"protractor": "5.1.2",
5455
"ts-node": "3.3.0",
5556
"tslint": "5.7.0",
56-
"typescript": "2.5.2"
57+
"typescript": "2.5.3"
5758
},
5859
"engines": {
5960
"node": ">= 6.9.0",

Diff for: ‎Angular4_CLI_Full_Project/src/app/_nav.ts

+144
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
export const navigation = [
2+
{
3+
name: 'Dashboard',
4+
url: '/dashboard',
5+
icon: 'icon-speedometer',
6+
badge: {
7+
variant: 'info',
8+
text: 'NEW'
9+
}
10+
},
11+
{
12+
title: true,
13+
name: 'UI elements'
14+
},
15+
{
16+
name: 'Components',
17+
url: '/components',
18+
icon: 'icon-puzzle',
19+
children: [
20+
{
21+
name: 'Buttons',
22+
url: '/components/buttons',
23+
icon: 'icon-puzzle'
24+
},
25+
{
26+
name: 'Social Buttons',
27+
url: '/components/social-buttons',
28+
icon: 'icon-puzzle'
29+
},
30+
{
31+
name: 'Cards',
32+
url: '/components/cards',
33+
icon: 'icon-puzzle'
34+
},
35+
{
36+
name: 'Forms',
37+
url: '/components/forms',
38+
icon: 'icon-puzzle'
39+
},
40+
{
41+
name: 'Modals',
42+
url: '/components/modals',
43+
icon: 'icon-puzzle'
44+
},
45+
{
46+
name: 'Switches',
47+
url: '/components/switches',
48+
icon: 'icon-puzzle'
49+
},
50+
{
51+
name: 'Tables',
52+
url: '/components/tables',
53+
icon: 'icon-puzzle'
54+
},
55+
{
56+
name: 'Tabs',
57+
url: '/components/tabs',
58+
icon: 'icon-puzzle'
59+
}
60+
]
61+
},
62+
{
63+
name: 'Icons',
64+
url: '/icons',
65+
icon: 'icon-star',
66+
children: [
67+
{
68+
name: 'Font Awesome',
69+
url: '/icons/font-awesome',
70+
icon: 'icon-star',
71+
badge: {
72+
variant: 'secondary',
73+
text: '4.7'
74+
}
75+
},
76+
{
77+
name: 'Simple Line Icons',
78+
url: '/icons/simple-line-icons',
79+
icon: 'icon-star'
80+
}
81+
]
82+
},
83+
{
84+
name: 'Widgets',
85+
url: '/widgets',
86+
icon: 'icon-calculator',
87+
badge: {
88+
variant: 'info',
89+
text: 'NEW'
90+
}
91+
},
92+
{
93+
name: 'Charts',
94+
url: '/charts',
95+
icon: 'icon-pie-chart'
96+
},
97+
{
98+
divider: true
99+
},
100+
{
101+
title: true,
102+
name: 'Extras',
103+
},
104+
{
105+
name: 'Pages',
106+
url: '/pages',
107+
icon: 'icon-star',
108+
children: [
109+
{
110+
name: 'Login',
111+
url: '/pages/login',
112+
icon: 'icon-star'
113+
},
114+
{
115+
name: 'Register',
116+
url: '/pages/register',
117+
icon: 'icon-star'
118+
},
119+
{
120+
name: 'Error 404',
121+
url: '/pages/404',
122+
icon: 'icon-star'
123+
},
124+
{
125+
name: 'Error 500',
126+
url: '/pages/500',
127+
icon: 'icon-star'
128+
}
129+
]
130+
},
131+
{
132+
name: 'Download CoreUI',
133+
url: 'http://coreui.io/angular/',
134+
icon: 'icon-cloud-download',
135+
class: 'mt-auto',
136+
variant: 'success'
137+
},
138+
{
139+
name: 'Try CoreUI PRO',
140+
url: 'http://coreui.io/pro/angular/',
141+
icon: 'icon-layers',
142+
variant: 'danger'
143+
}
144+
];

Diff for: ‎Angular4_CLI_Full_Project/src/app/app.module.ts

+26-22
Original file line numberDiff line numberDiff line change
@@ -6,50 +6,54 @@ import { AppComponent } from './app.component';
66

77
// Import containers
88
import {
9-
FullLayout,
10-
SimpleLayout
9+
FullLayoutComponent,
10+
SimpleLayoutComponent
1111
} from './containers';
1212

1313
const APP_CONTAINERS = [
14-
FullLayout,
15-
SimpleLayout
14+
FullLayoutComponent,
15+
SimpleLayoutComponent
1616
]
1717

1818
// Import components
1919
import {
20-
AppAside,
21-
AppBreadcrumbs,
22-
AppFooter,
23-
AppHeader,
24-
AppSidebar,
25-
AppSidebarFooter,
26-
AppSidebarForm,
27-
AppSidebarHeader,
28-
AppSidebarMinimizer
20+
AppAsideComponent,
21+
AppBreadcrumbsComponent,
22+
AppFooterComponent,
23+
AppHeaderComponent,
24+
AppSidebarComponent,
25+
AppSidebarFooterComponent,
26+
AppSidebarFormComponent,
27+
AppSidebarHeaderComponent,
28+
AppSidebarMinimizerComponent,
29+
APP_SIDEBAR_NAV
2930
} from './components';
3031

3132
const APP_COMPONENTS = [
32-
AppAside,
33-
AppBreadcrumbs,
34-
AppFooter,
35-
AppHeader,
36-
AppSidebar,
37-
AppSidebarFooter,
38-
AppSidebarForm,
39-
AppSidebarHeader,
40-
AppSidebarMinimizer
33+
AppAsideComponent,
34+
AppBreadcrumbsComponent,
35+
AppFooterComponent,
36+
AppHeaderComponent,
37+
AppSidebarComponent,
38+
AppSidebarFooterComponent,
39+
AppSidebarFormComponent,
40+
AppSidebarHeaderComponent,
41+
AppSidebarMinimizerComponent,
42+
APP_SIDEBAR_NAV
4143
]
4244

4345
// Import directives
4446
import {
4547
AsideToggleDirective,
4648
NAV_DROPDOWN_DIRECTIVES,
49+
ReplaceDirective,
4750
SIDEBAR_TOGGLE_DIRECTIVES
4851
} from './directives';
4952

5053
const APP_DIRECTIVES = [
5154
AsideToggleDirective,
5255
NAV_DROPDOWN_DIRECTIVES,
56+
ReplaceDirective,
5357
SIDEBAR_TOGGLE_DIRECTIVES
5458
]
5559

Diff for: ‎Angular4_CLI_Full_Project/src/app/app.routing.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { Routes, RouterModule } from '@angular/router';
33

44
// Import Containers
55
import {
6-
FullLayout,
7-
SimpleLayout
6+
FullLayoutComponent,
7+
SimpleLayoutComponent
88
} from './containers';
99

1010
export const routes: Routes = [
@@ -15,7 +15,7 @@ export const routes: Routes = [
1515
},
1616
{
1717
path: '',
18-
component: FullLayout,
18+
component: FullLayoutComponent,
1919
data: {
2020
title: 'Home'
2121
},
@@ -44,7 +44,7 @@ export const routes: Routes = [
4444
},
4545
{
4646
path: 'pages',
47-
component: SimpleLayout,
47+
component: SimpleLayoutComponent,
4848
data: {
4949
title: 'Pages'
5050
},

Diff for: ‎Angular4_CLI_Full_Project/src/app/components/app-aside/app-aside.component.ts

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
1-
import { Component, ElementRef } from '@angular/core';
1+
import { Component } from '@angular/core';
22

33
@Component({
44
selector: 'app-aside',
55
templateUrl: './app-aside.component.html'
66
})
7-
export class AppAside {
7+
export class AppAsideComponent {
88

9-
constructor(private el: ElementRef) { }
10-
11-
//wait for the component to render completely
12-
ngOnInit(): void {
13-
var nativeElement: HTMLElement = this.el.nativeElement,
14-
parentElement: HTMLElement = nativeElement.parentElement;
15-
// move all children out of the element
16-
while (nativeElement.firstChild) {
17-
parentElement.insertBefore(nativeElement.firstChild, nativeElement);
18-
}
19-
// remove the empty element(the host)
20-
parentElement.removeChild(nativeElement);
21-
}
9+
constructor() { }
2210
}

Diff for: ‎Angular4_CLI_Full_Project/src/app/components/app-breadcrumbs/app-breadcrumbs.component.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'rxjs/add/operator/filter';
1414
</li>
1515
</ng-template>`
1616
})
17-
export class AppBreadcrumbs {
17+
export class AppBreadcrumbsComponent {
1818
breadcrumbs: Array<Object>;
1919
constructor(
2020
private router: Router,
@@ -27,6 +27,7 @@ export class AppBreadcrumbs {
2727
do {
2828
const childrenRoutes = currentRoute.children;
2929
currentRoute = null;
30+
// tslint:disable-next-line:no-shadowed-variable
3031
childrenRoutes.forEach(route => {
3132
if (route.outlet === 'primary') {
3233
const routeSnapshot = route.snapshot;

Diff for: ‎Angular4_CLI_Full_Project/src/app/components/app-footer/app-footer.component.ts

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1-
import { Component, ElementRef } from '@angular/core';
1+
import { Component } from '@angular/core';
22

33
@Component({
44
selector: 'app-footer',
55
templateUrl: './app-footer.component.html'
66
})
7-
export class AppFooter {
8-
9-
constructor(private el: ElementRef) { }
10-
11-
//wait for the component to render completely
12-
ngOnInit(): void {
13-
var nativeElement: HTMLElement = this.el.nativeElement,
14-
parentElement: HTMLElement = nativeElement.parentElement;
15-
// move all children out of the element
16-
while (nativeElement.firstChild) {
17-
parentElement.insertBefore(nativeElement.firstChild, nativeElement);
18-
}
19-
// remove the empty element(the host)
20-
parentElement.removeChild(nativeElement);
21-
}
22-
}
7+
export class AppFooterComponent { }

0 commit comments

Comments
 (0)