inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-02 17:35:08 +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": [

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

@ -1,13 +1,13 @@
:host { @mixin adf-layout-container-theme($theme) {
$foreground: map-get($theme, foreground);
adf-layout-container {
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
} }
@mixin adf-layout-container-theme($theme) {
$foreground: map-get($theme, foreground);
ng-content { ng-content {
display: block; display: block;
width: 100%; width: 100%;
@ -34,7 +34,6 @@
border-right: 1px solid mat-color($foreground, text, 0.07); border-right: 1px solid mat-color($foreground, text, 0.07);
} }
mat-sidenav-content { mat-sidenav-content {
margin-left: 0px !important; margin-left: 0px !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 {