Merge remote-tracking branch 'origin/develop' into stats-profile
This commit is contained in:
commit
690226b031
|
@ -23,7 +23,7 @@ export class Layout {
|
||||||
variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color);
|
variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color);
|
||||||
variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none');
|
variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none');
|
||||||
variables['@hero-background-position'] = options.backgrounds.form.position;
|
variables['@hero-background-position'] = options.backgrounds.form.position;
|
||||||
variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode?'dark':'light';
|
variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode == true ?'dark':'light';
|
||||||
}
|
}
|
||||||
if (options.buttons) {
|
if (options.buttons) {
|
||||||
//general
|
//general
|
||||||
|
@ -197,7 +197,7 @@ export class CustomizationOptions {
|
||||||
if (!current.backgrounds.form.position) {
|
if (!current.backgrounds.form.position) {
|
||||||
current.backgrounds.form.position = "center bottom"
|
current.backgrounds.form.position = "center bottom"
|
||||||
}
|
}
|
||||||
if (!current.backgrounds.form.fontsDarkMode) {
|
if (current.backgrounds.form.fontsDarkMode == undefined) {
|
||||||
current.backgrounds.form.fontsDarkMode = true;
|
current.backgrounds.form.fontsDarkMode = true;
|
||||||
}
|
}
|
||||||
if (!current.buttons) {
|
if (!current.buttons) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<a (click)="open()"
|
<a (click)="open()"
|
||||||
[title]="'Send data to cloud storage [demo]'"
|
[title]="'Send data to cloud storage'"
|
||||||
[attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"
|
[attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"
|
||||||
> <span icon="cloud-upload"></span>
|
> <span icon="cloud-upload"></span>
|
||||||
<span class="uk-icon-button uk-icon landing-action-button landing-action-button-portal">
|
<span class="uk-icon-button uk-icon landing-action-button landing-action-button-portal">
|
||||||
|
|
|
@ -150,7 +150,7 @@ export class EGIDataTransferComponent {
|
||||||
this.egiTransferModal.cancelButton = false;
|
this.egiTransferModal.cancelButton = false;
|
||||||
this.egiTransferModal.okButton = false;
|
this.egiTransferModal.okButton = false;
|
||||||
this.egiTransferModal.okButtonText = ">> Transfer";
|
this.egiTransferModal.okButtonText = ">> Transfer";
|
||||||
this.egiTransferModal.title = "EOSC Data Transfer [demo]";
|
this.egiTransferModal.title = "EOSC Data Transfer";
|
||||||
this.init();
|
this.init();
|
||||||
if(typeof document !== 'undefined') {
|
if(typeof document !== 'undefined') {
|
||||||
this.egiTransferModal.open();
|
this.egiTransferModal.open();
|
||||||
|
|
|
@ -23,7 +23,7 @@ declare var ResizeObserver;
|
||||||
<div class="uk-modal-dialog">
|
<div class="uk-modal-dialog">
|
||||||
<div #header class="uk-modal-header uk-flex uk-flex-middle" [ngClass]="classTitle">
|
<div #header class="uk-modal-header uk-flex uk-flex-middle" [ngClass]="classTitle">
|
||||||
<div [class.uk-invisible]="!back" class="uk-width-medium@l uk-width-auto uk-flex uk-flex-center">
|
<div [class.uk-invisible]="!back" class="uk-width-medium@l uk-width-auto uk-flex uk-flex-center">
|
||||||
<button class="uk-button uk-button-link" [disabled]="!back" (click)="cancel()">
|
<button class="uk-button uk-button-link" [class.uk-disabled]="!back" [disabled]="!back" (click)="cancel()">
|
||||||
<icon name="west" [flex]="true" ratio="3"></icon>
|
<icon name="west" [flex]="true" ratio="3"></icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -32,8 +32,7 @@ declare var ResizeObserver;
|
||||||
<h2 class="uk-margin-remove">{{title}}</h2>
|
<h2 class="uk-margin-remove">{{title}}</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-width-medium@l uk-width-auto uk-flex"
|
<div class="uk-width-medium@l uk-width-auto uk-flex"
|
||||||
[class.uk-flex-center]="okButton" [class.uk-flex-right]="!okButton"
|
[class.uk-flex-center]="okButton" [class.uk-flex-right]="!okButton">
|
||||||
[class.uk-invisible]="okButton || cancelButton">
|
|
||||||
<button *ngIf="okButton" class="uk-button uk-button-default" [disabled]="okButtonDisabled"
|
<button *ngIf="okButton" class="uk-button uk-button-default" [disabled]="okButtonDisabled"
|
||||||
[class.uk-disabled]="okButtonDisabled" (click)="ok()">
|
[class.uk-disabled]="okButtonDisabled" (click)="ok()">
|
||||||
{{okButtonText}}
|
{{okButtonText}}
|
||||||
|
|
|
@ -558,6 +558,9 @@
|
||||||
<progress class="uk-progress" value="45" max="100">45%</progress>
|
<progress class="uk-progress" value="45" max="100">45%</progress>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="uk-width-expand@m">
|
||||||
|
<div class="uk-progress-circle" percentage="45" style="--percentage: 45"></div>
|
||||||
|
</div>
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
<button type="button" class="uk-icon uk-close">
|
<button type="button" class="uk-icon uk-close">
|
||||||
|
|
Loading…
Reference in New Issue