Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-19 00:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into development

Browse source 
Conflicts:
	docs/contents/articles/002-installation-guidelines/index.md
This commit is contained in:
nixa 2016-08-22 19:26:09 +03:00
commit 59c1c547c3
12 changed files with 8 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/theme/components/baSidebar/baSidebar.scss
View file

@ -8,7 +8,7 @@ $angle-right: "\f101";
width: $sidebar-width;
top: $top-height;
left: 0;
z-index: 904;
z-index: 1001;
display: block;
min-height: 100%;
background-color: $sidebar;

4
src/app/theme/sass/_ionicons.scss
View file

@ -1,3 +1,3 @@
$ionicons-font-path: "~Ionicons/fonts";
$ionicons-font-path: "~ionicons/fonts";
@import "~Ionicons/scss/ionicons";
@import "~ionicons/scss/ionicons";

2
src/app/theme/sass/_preloader.scss
View file

@ -31,7 +31,7 @@
left: 0;
width: 100%;
height: 100%;
z-index: 1000;
z-index: 1003;
background: #000000;
& > div {
display: block;