Merge branch 'master' into skeleton

This commit is contained in:
Sercan Yemen 2018-07-12 17:46:33 +03:00
commit d25ce3601a
4 changed files with 9 additions and 2 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "fuse", "name": "fuse",
"version": "6.2.2", "version": "6.2.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "fuse", "name": "fuse",
"version": "6.2.2", "version": "6.2.3",
"license": "https://themeforest.net/licenses/terms/regular", "license": "https://themeforest.net/licenses/terms/regular",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",

View File

@ -3,4 +3,5 @@ navbar {
flex-direction: column; flex-direction: column;
flex: 1 1 auto; flex: 1 1 auto;
width: 100%; width: 100%;
height: 100%;
} }

View File

@ -41,6 +41,8 @@ fuse-sidebar {
position: relative; position: relative;
top: auto; top: auto;
padding: 0; padding: 0;
transform: translateX(0);
left: auto;
.avatar { .avatar {
width: 40px; width: 40px;
@ -79,11 +81,13 @@ navbar {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
min-height: 64px; min-height: 64px;
max-height: 64px;
height: 64px; height: 64px;
padding: 12px 12px 12px 20px; padding: 12px 12px 12px 20px;
@include media-breakpoint('xs') { @include media-breakpoint('xs') {
min-height: 56px; min-height: 56px;
max-height: 56px;
height: 56px; height: 56px;
} }
@ -134,6 +138,8 @@ navbar {
top: 92px; top: 92px;
border-radius: 50%; border-radius: 50%;
padding: 8px; padding: 8px;
transform: translateX(-50%);
left: 50%;
.avatar { .avatar {
width: 72px; width: 72px;