inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF_NOISSUE] Fix styling and sidenav layout fixes (#3291)

Browse Source 
* Fix styling and sidenav layout fixes

* Revert packagr conflicting mods
This commit is contained in:
Popovics András 2018-05-09 16:11:25 +01:00 committed by Eugenio Romano
parent faeab853f7
commit 641f7d9695
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.angular-cli.json
View File

@ -117,8 +117,8 @@
}, },
{ {
"glob": "**/*", "glob": "**/*",
"input": "../../lib/core/prebuilt-themes", "input": "../../lib/dist/core/prebuilt-themes",
"output": "./" "output": "./assets/prebuilt-themes"
}, },
{ {
"glob": "**/*", "glob": "**/*",
@ -170,7 +170,7 @@
"prefix": "app-dev", "prefix": "app-dev",
"styles": [ "styles": [
"styles.scss", "styles.scss",
"custom-style.scss" "custom-style-dev.scss"
], ],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {
"includePaths": [ "includePaths": [

77
lib/core/sidenav-layout/components/layout-container/layout-container.component.scss
View File

@ -1,49 +1,48 @@
:host {
display: block;
width: 100%;
height: 100%;
overflow: hidden;
}
@mixin adf-layout-container-theme($theme) { @mixin adf-layout-container-theme($theme) {
$foreground: map-get($theme, foreground); $foreground: map-get($theme, foreground);
ng-content { adf-layout-container {
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
.sidenav--hidden { ng-content {
visibility: hidden !important; display: block;
width: 0 !important; width: 100%;
transform: unset !important; height: 100%;
opacity: 0 !important; overflow: hidden;
} }
.mat-sidenav-container { .sidenav--hidden {
display: block; visibility: hidden !important;
width: 100%; width: 0 !important;
height: 100%; transform: unset !important;
overflow: hidden; opacity: 0 !important;
} }
.mat-sidenav { .mat-sidenav-container {
overflow: hidden; display: block;
border-right: 1px solid mat-color($foreground, text, 0.07); width: 100%;
} height: 100%;
overflow: hidden;
}
.mat-sidenav {
overflow: hidden;
border-right: 1px solid mat-color($foreground, text, 0.07);
}
mat-sidenav-content { mat-sidenav-content {
margin-left:0px !important; margin-left: 0px !important;
} }
.mat-sidenav-content, .mat-sidenav-content,
.mat-drawer-transition .mat-drawer-content { .mat-drawer-transition .mat-drawer-content {
transform: unset !important; transform: unset !important;
transition-property: unset !important; transition-property: unset !important;
transition-duration: unset !important; transition-duration: unset !important;
transition-timing-function: unset !important; transition-timing-function: unset !important;
} }
} }

3
lib/core/sidenav-layout/components/layout-container/layout-container.component.ts
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { Component, Input, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Component, Input, ViewChild, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
import { MatSidenav } from '@angular/material'; import { MatSidenav } from '@angular/material';
import { sidenavAnimation, contentAnimation } from '../../helpers/animations'; import { sidenavAnimation, contentAnimation } from '../../helpers/animations';
@ -23,6 +23,7 @@ import { sidenavAnimation, contentAnimation } from '../../helpers/animations';
selector: 'adf-layout-container', selector: 'adf-layout-container',
templateUrl: './layout-container.component.html', templateUrl: './layout-container.component.html',
styleUrls: ['./layout-container.component.scss'], styleUrls: ['./layout-container.component.scss'],
encapsulation: ViewEncapsulation.None,
animations: [ sidenavAnimation, contentAnimation ] animations: [ sidenavAnimation, contentAnimation ]
}) })
export class LayoutContainerComponent implements OnInit, OnDestroy { export class LayoutContainerComponent implements OnInit, OnDestroy {