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

Merge branch 'dev-valbano-ng15-start' into ACS-7582-fix-dialog-upload

Browse Source
This commit is contained in:
tomson 2024-04-18 13:05:53 +02:00 committed by GitHub
commit a986d4056f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
View File

@ -37,7 +37,7 @@
} }
.adf-new-version-uploader-dialog-content { .adf-new-version-uploader-dialog-content {
padding: 0; padding: 1px 2px 0 2px;
flex: 1 1 auto; flex: 1 1 auto;
position: relative; position: relative;
max-height: 100vh; max-height: 100vh;

2
lib/content-services/src/lib/upload/components/upload-button.component.html
View File

@ -7,7 +7,7 @@
[disabled]="isButtonDisabled()" [disabled]="isButtonDisabled()"
mat-raised-button mat-raised-button
(click)="uploadSingleFile.click()"> (click)="uploadSingleFile.click()">
<mat-icon>file_upload</mat-icon> <mat-icon class="adf-upload-button-icon">file_upload</mat-icon>
<span id="upload-single-file-label" <span id="upload-single-file-label"
*ngIf="!staticTitle">{{ 'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate }}</span> *ngIf="!staticTitle">{{ 'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate }}</span>
<span id="upload-single-file-label-static" <span id="upload-single-file-label-static"

13
lib/content-services/src/lib/upload/components/upload-button.component.scss
View File

@ -1,5 +1,14 @@
.adf { .adf {
&-upload-button-file-container input { &-upload-button-file-container {
display: none; .adf-upload-button-icon {
margin: 0;
font-size: 24px;
width: 24px;
height: 24px;
}
input {
display: none;
}
} }
} }

6
lib/content-services/src/lib/version-manager/version-upload.component.html
View File

@ -7,10 +7,10 @@
{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.MAJOR' | translate: { version: majorVersion } }} {{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.MAJOR' | translate: { version: majorVersion } }}
</mat-radio-button> </mat-radio-button>
</mat-radio-group> </mat-radio-group>
<mat-form-field class="adf-new-version-max-width"> <mat-form-field class="adf-new-version-max-width" subscriptSizing="dynamic">
<mat-label>{{'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate}}</mat-label>
<textarea matInput [(ngModel)]="comment" class="adf-new-version-text-area" id="adf-new-version-text-area" <textarea matInput [(ngModel)]="comment" class="adf-new-version-text-area" id="adf-new-version-text-area"
(change)="onCommentChange()" (change)="onCommentChange()"></textarea>
placeholder="{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate }}"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>

28
lib/content-services/src/lib/version-manager/version-upload.component.scss
View File

@ -1,3 +1,5 @@
@import 'styles/mat-selectors';
.adf-new-version-radio-group { .adf-new-version-radio-group {
display: inline-flex; display: inline-flex;
flex-direction: column; flex-direction: column;
@ -5,20 +7,36 @@
.adf-new-version-radio-button { .adf-new-version-radio-button {
margin: 5px; margin: 5px;
margin-top: 2px;
margin-left: 5px;
} }
.adf-version-upload-buttons { .adf-version-upload-buttons {
padding-top: 18px;
padding-bottom: 5px;
display: flex; display: flex;
float: right; float: right;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
} }
.adf-new-version-max-width { .adf-version-upload {
width: 100%; .adf-new-version-max-width {
float: right; padding-top: 2px;
width: 100%;
float: right;
.adf-new-version-text-area { #{$mat-floating-label} {
resize: none; padding-bottom: 10px;
}
#{$mat-form-field-infix} {
padding-top: 12px;
padding-bottom: 0;
}
.adf-new-version-text-area {
resize: none;
}
} }
} }