Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

fix(upload): failed to upload item icon color #291

Merged
merged 5 commits into from Mar 14, 2017
Merged

fix(upload): failed to upload item icon color #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
245c251
fix(upload): failed to upload item icon color
inikolova Mar 10, 2017
dcf2fa2
Merge branch 'master' into fix-upload-error-files-color
joneff Mar 10, 2017
55986a0
fix(upload): extract metrics variables
inikolova Mar 13, 2017
98e49f7
chore(upload): rename variables
inikolova Mar 14, 2017
e911a66
Merge branch 'master' into fix-upload-error-files-color
gyoshev Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions scss/upload/_layout.scss
View file
Open in desktop
Expand Up @@ -4,6 +4,11 @@
$uploaded-image-height: 34px !default;
$uploaded-image-border: 2px !default;

$upload-dropzone-status-icon-spacing: $padding-x-lg / 2 !default;
$upload-status-spacing: $padding-y !default;
$upload-file-name-spacing: $padding-y !default;
$upload-invalid-icon-spacing: $padding-x-sm !default;

html .k-upload {
position: relative;
}
Expand Down Expand Up @@ -63,6 +68,7 @@

>.k-icon {
box-sizing: content-box;
margin-right: $upload-dropzone-status-icon-spacing;
}
}

Expand Down Expand Up @@ -123,6 +129,7 @@
position: absolute;
right: $padding-x;
top: $padding-y * 2;
margin-top: $upload-status-spacing;

.k-button {
padding: 0;
Expand Down Expand Up @@ -163,6 +170,7 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-top: $upload-file-name-spacing;
}

.k-file-size,
Expand Down Expand Up @@ -255,6 +263,10 @@
line-height: normal;
}

.k-file-invalid-icon {
margin-left: $upload-invalid-icon-spacing;
}

.k-file-extension {
margin-left: .4em;
margin-bottom: .3em;
Expand Down
29 changes: 4 additions & 25 deletions scss/upload/_theme.scss
View file
Open in desktop
Expand Up @@ -84,7 +84,8 @@
}

.k-file-invalid-extension-wrapper,
.k-multiple-files-invalid-extension-wrapper {
.k-multiple-files-invalid-extension-wrapper,
.k-file-error .k-file-extension-wrapper {
color: $upload-error-text;
border-color: $upload-error-border;
}
Expand All @@ -96,7 +97,8 @@
}

.k-file-invalid-extension-wrapper::before,
.k-multiple-files-invalid-extension-wrapper::before {
.k-multiple-files-invalid-extension-wrapper::before,
.k-file-error .k-file-extension-wrapper::before {
background-color: $upload-files-bg;
border-color: transparent transparent $upload-error-border $upload-error-border;
}
Expand Down Expand Up @@ -132,27 +134,4 @@
.k-dropzone-hovered {
background-color: $hovered-bg;
}

// Metrics
.k-dropzone {
.k-upload-status {
>.k-icon {
margin-right: $padding-x-lg / 2;
}
}
}

.k-upload-files {
.k-upload-status {
margin-top: $padding-y;
}

.k-file-invalid-icon {
margin-left: $padding-x-sm;
}
}

.k-file-name {
margin-top: $padding-y;
}
}