Skip to content

Commit

Permalink
feat(upload): update styling to match the design
Browse files Browse the repository at this point in the history
  • Loading branch information
inikolova authored and joneff committed May 7, 2020
1 parent 889719e commit 553a69e
Show file tree
Hide file tree
Showing 12 changed files with 2,146 additions and 384 deletions.
8 changes: 6 additions & 2 deletions packages/bootstrap/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1740,16 +1740,20 @@ $upload-bg: $component-bg !default;
$upload-text: $component-text !default;
$upload-border: $component-border !default;

$upload-dropzone-padding-x: $toolbar-padding-x !default;
$upload-dropzone-padding-y: $toolbar-padding-y !default;
$upload-dropzone-padding-x: map-get( $spacing, 2 ) !default;
$upload-dropzone-padding-y: map-get( $spacing, 2 ) !default;
$upload-dropzone-spacing: ($upload-dropzone-padding-x * 2) !default;
$upload-dropzone-bg: $toolbar-bg !default;
$upload-dropzone-text: $toolbar-text !default;
$upload-dropzone-border: $toolbar-border !default;
$upload-dropzone-hover-bg: try-shade( $upload-dropzone-bg, .2) !default;

$upload-item-padding-x: $spacer !default;
$upload-item-padding-y: $spacer !default;

$upload-multiple-items-spacing: 12px !default;

$upload-validation-font-size: 11px !default;
$upload-icon-spacing: $upload-dropzone-padding-x !default;

$upload-item-image-width: 24px !default;
Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/dropzone/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@include exports( "dropzone/layout/bootstrap" ) {
.k-dropzone-inner {
>.k-icon {
margin-bottom: $upload-dropzone-padding-y * 4;
margin-bottom: $upload-dropzone-padding-y * 3;
}

.k-dropzone-hint {
Expand Down
10 changes: 7 additions & 3 deletions packages/default/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1753,15 +1753,19 @@ $upload-dropzone-spacing: ($upload-dropzone-padding-x * 2) !default;
$upload-dropzone-bg: $toolbar-bg !default;
$upload-dropzone-text: $toolbar-text !default;
$upload-dropzone-border: $toolbar-border !default;
$upload-dropzone-hover-bg: $hovered-bg !default;

$upload-item-padding-x: $cell-padding !default;
$upload-item-padding-y: $cell-padding !default;

$upload-multiple-items-spacing: 12px !default;

$upload-validation-font-size: 11px !default;
$upload-icon-spacing: $upload-dropzone-padding-x !default;

$upload-item-image-width: 24px !default;
$upload-item-image-height: 34px !default;
$upload-item-image-border: 2px !default;
$upload-item-image-width: 30px !default;
$upload-item-image-height: 30px !default;
$upload-item-image-border: 0 !default; // TODO: remove

$upload-group-icon-size: $icon-size-lg !default;

Expand Down
Loading

0 comments on commit 553a69e

Please sign in to comment.