mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-1932] Settings button now is located inside the login menu (#3114)
* [ADF-1932] Settings button now is located inside the login menu
* [ADF-1932] Improved styles
* [ADF-1932] CSS replaced by SCSS, settings button now matches material accent color
* enable source map in the dist
* Revert "enable source map in the dist"
This reverts commit 0e53ace55b
.
This commit is contained in:
committed by
Eugenio Romano
parent
b84e716fe5
commit
2940b6ce99
@@ -1,40 +0,0 @@
|
|||||||
.setting-button {
|
|
||||||
position: absolute;
|
|
||||||
right: 10px;
|
|
||||||
top: 10px;
|
|
||||||
z-index: 1;
|
|
||||||
background-color: rgb(68,138,255);
|
|
||||||
color: rgb(255,255,255);
|
|
||||||
}
|
|
||||||
|
|
||||||
.settings {
|
|
||||||
border-radius: 8px;
|
|
||||||
position: absolute;
|
|
||||||
background-color: papayawhip;
|
|
||||||
color: cadetblue;
|
|
||||||
left: 10px;
|
|
||||||
top: 10px;
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.toggle {
|
|
||||||
width: 190px;
|
|
||||||
margin: 5px;
|
|
||||||
padding: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 721px) {
|
|
||||||
.mobile-settings {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 720px) {
|
|
||||||
.settings {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.settings ::ng-deep .mat-slide-toggle-thumb-container {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
@@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
<!--SETTING BUTTON-->
|
<!--SETTING BUTTON-->
|
||||||
|
|
||||||
<a mat-fab class="setting-button" data-automation-id="settings" href="" routerLink="/settings">
|
<a mat-fab class="setting-button" data-automation-id="settings" href="" routerLink="/settings" color="accent">
|
||||||
<mat-icon>settings</mat-icon>
|
<mat-icon>settings</mat-icon>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@@ -92,5 +92,7 @@
|
|||||||
{{ 'LOGIN.LOGIN_FOOTER'| translate }}
|
{{ 'LOGIN.LOGIN_FOOTER'| translate }}
|
||||||
</mat-slide-toggle>
|
</mat-slide-toggle>
|
||||||
</p>
|
</p>
|
||||||
|
<button type="button" mat-raised-button color="accent" class="mobile-setting-button" routerLink="/settings" data-automation-id="settings">{{ 'APP_LAYOUT.SETTINGS'| translate }}</button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</adf-login>
|
</adf-login>
|
||||||
|
52
demo-shell/src/app/components/login/login.component.scss
Normal file
52
demo-shell/src/app/components/login/login.component.scss
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
@mixin adf-login-component-theme($theme) {
|
||||||
|
.setting-button.mat-fab.mat-accent {
|
||||||
|
position: absolute;
|
||||||
|
right: 10px;
|
||||||
|
top: 10px;
|
||||||
|
z-index: 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings {
|
||||||
|
border-radius: 8px;
|
||||||
|
position: absolute;
|
||||||
|
background-color: papayawhip;
|
||||||
|
color: cadetblue;
|
||||||
|
left: 10px;
|
||||||
|
top: 10px;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.toggle {
|
||||||
|
width: 190px;
|
||||||
|
margin: 5px;
|
||||||
|
padding: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mobile-settings, .mobile-setting-button {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and ($mat-small) {
|
||||||
|
.settings, .setting-button.mat-fab.mat-accent {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mobile-settings, .mobile-setting-button {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mobile-setting-button {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mobile-settings {
|
||||||
|
padding-bottom: 20px;
|
||||||
|
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings ::ng-deep .mat-slide-toggle-thumb-container {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
@@ -23,7 +23,7 @@ import { LogService, StorageService } from '@alfresco/adf-core';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'app-login',
|
selector: 'app-login',
|
||||||
templateUrl: './login.component.html',
|
templateUrl: './login.component.html',
|
||||||
styleUrls: ['./login.component.css']
|
styleUrls: ['./login.component.scss']
|
||||||
})
|
})
|
||||||
export class LoginComponent implements OnInit {
|
export class LoginComponent implements OnInit {
|
||||||
|
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
@import './app/components/app-layout/app-layout.component.scss';
|
@import './app/components/app-layout/app-layout.component.scss';
|
||||||
@import './app/components/files/files.component.scss';
|
@import './app/components/files/files.component.scss';
|
||||||
|
@import './app/components/login/login.component.scss';
|
||||||
|
|
||||||
@import 'content-services/styles/index';
|
@import 'content-services/styles/index';
|
||||||
@import 'process-services/styles/index';
|
@import 'process-services/styles/index';
|
||||||
@@ -19,6 +19,7 @@ $theme: mat-light-theme($primary, $accent, $warn);
|
|||||||
@include angular-material-theme($theme);
|
@include angular-material-theme($theme);
|
||||||
@include adf-app-layout-theme($theme);
|
@include adf-app-layout-theme($theme);
|
||||||
@include adf-file-component-theme($theme);
|
@include adf-file-component-theme($theme);
|
||||||
|
@include adf-login-component-theme($theme);
|
||||||
|
|
||||||
@include adf-content-services-theme($theme);
|
@include adf-content-services-theme($theme);
|
||||||
@include adf-process-services-theme($theme);
|
@include adf-process-services-theme($theme);
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
@import './app/components/app-layout/app-layout.component.scss';
|
@import './app/components/app-layout/app-layout.component.scss';
|
||||||
@import './app/components/files/files.component.scss';
|
@import './app/components/files/files.component.scss';
|
||||||
|
@import './app/components/login/login.component.scss';
|
||||||
|
|
||||||
@import '~@alfresco/adf-content-services/theming';
|
@import '~@alfresco/adf-content-services/theming';
|
||||||
@import '~@alfresco/adf-process-services/theming';
|
@import '~@alfresco/adf-process-services/theming';
|
||||||
@@ -18,6 +19,7 @@ $theme: mat-light-theme($primary, $accent, $warn);
|
|||||||
@include angular-material-theme($theme);
|
@include angular-material-theme($theme);
|
||||||
@include adf-app-layout-theme($theme);
|
@include adf-app-layout-theme($theme);
|
||||||
@include adf-file-component-theme($theme);
|
@include adf-file-component-theme($theme);
|
||||||
|
@include adf-login-component-theme($theme);
|
||||||
|
|
||||||
@include adf-content-services-theme($theme);
|
@include adf-content-services-theme($theme);
|
||||||
@include adf-process-services-theme($theme);
|
@include adf-process-services-theme($theme);
|
||||||
|
Reference in New Issue
Block a user