mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-05-12 17:04:57 +00:00
Merge branch 'dev-valbano-ng15-start' into ACS-7582-fix-dialog-upload
This commit is contained in:
commit
a986d4056f
@ -37,7 +37,7 @@
|
||||
}
|
||||
|
||||
.adf-new-version-uploader-dialog-content {
|
||||
padding: 0;
|
||||
padding: 1px 2px 0 2px;
|
||||
flex: 1 1 auto;
|
||||
position: relative;
|
||||
max-height: 100vh;
|
||||
|
@ -7,7 +7,7 @@
|
||||
[disabled]="isButtonDisabled()"
|
||||
mat-raised-button
|
||||
(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"
|
||||
*ngIf="!staticTitle">{{ 'FILE_UPLOAD.BUTTON.UPLOAD_FILE' | translate }}</span>
|
||||
<span id="upload-single-file-label-static"
|
||||
|
@ -1,5 +1,14 @@
|
||||
.adf {
|
||||
&-upload-button-file-container input {
|
||||
&-upload-button-file-container {
|
||||
.adf-upload-button-icon {
|
||||
margin: 0;
|
||||
font-size: 24px;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
input {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -7,10 +7,10 @@
|
||||
{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.MAJOR' | translate: { version: majorVersion } }}
|
||||
</mat-radio-button>
|
||||
</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"
|
||||
(change)="onCommentChange()"
|
||||
placeholder="{{ 'ADF_VERSION_LIST.ACTIONS.UPLOAD.COMMENT' | translate }}"></textarea>
|
||||
(change)="onCommentChange()"></textarea>
|
||||
</mat-form-field>
|
||||
|
||||
</div>
|
||||
|
@ -1,3 +1,5 @@
|
||||
@import 'styles/mat-selectors';
|
||||
|
||||
.adf-new-version-radio-group {
|
||||
display: inline-flex;
|
||||
flex-direction: column;
|
||||
@ -5,20 +7,36 @@
|
||||
|
||||
.adf-new-version-radio-button {
|
||||
margin: 5px;
|
||||
margin-top: 2px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.adf-version-upload-buttons {
|
||||
padding-top: 18px;
|
||||
padding-bottom: 5px;
|
||||
display: flex;
|
||||
float: right;
|
||||
justify-content: space-between;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.adf-new-version-max-width {
|
||||
.adf-version-upload {
|
||||
.adf-new-version-max-width {
|
||||
padding-top: 2px;
|
||||
width: 100%;
|
||||
float: right;
|
||||
|
||||
#{$mat-floating-label} {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
#{$mat-form-field-infix} {
|
||||
padding-top: 12px;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.adf-new-version-text-area {
|
||||
resize: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user