Browse Source

DIV-1148 visual design updates part 2 - error states & padding

pull/170/head
Michael Olund 5 years ago
parent
commit
b97a538272
3 changed files with 29 additions and 13 deletions
  1. +1
    -6
      vue/README.md
  2. +25
    -4
      vue/src/components/Uploader/ItemTile.vue
  3. +3
    -3
      vue/src/components/Uploader/Uploader.vue

+ 1
- 6
vue/README.md View File

@ -5,12 +5,7 @@
npm install npm install
``` ```
### Compiles and hot-reloads for development
```
npm run serve
```
### Compiles and minifies for production
### Compile and minify
``` ```
npm run build npm run build
``` ```


+ 25
- 4
vue/src/components/Uploader/ItemTile.vue View File

@ -1,5 +1,5 @@
<template> <template>
<div class="item-tile" v-if="file.progress === '100.00' || file.error">
<div :class="['item-tile', file.error ? 'error': '']" v-if="file.progress === '100.00' || file.error">
<uploaded-image :file="file" :image-style="imageStyle" @imageclick="showPreview" @removeclick="$emit('remove')" /> <uploaded-image :file="file" :image-style="imageStyle" @imageclick="showPreview" @removeclick="$emit('remove')" />
<div class="bottom-wrapper"> <div class="bottom-wrapper">
<div class="item-text"> <div class="item-text">
@ -73,11 +73,11 @@ export default {
.item-tile { .item-tile {
margin-bottom: 5px; margin-bottom: 5px;
position: relative; position: relative;
border: none !important;
.item-text { .item-text {
text-align: center; text-align: center;
padding: 10px;
padding-bottom: 4px;
padding: 7px 10px;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 24px;
min-height: 87px; min-height: 87px;
@ -102,18 +102,33 @@ export default {
.button-wrapper { .button-wrapper {
margin-top: -4px; margin-top: -4px;
text-align: center; text-align: center;
min-height: 32px;
} }
.bottom-wrapper { .bottom-wrapper {
border-bottom-left-radius: 6px; border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px; border-bottom-right-radius: 6px;
border: 1px solid silver; border: 1px solid silver;
border-top: none;
background-color: #F2F2F2; background-color: #F2F2F2;
margin-bottom: 10px; margin-bottom: 10px;
.alert-danger { .alert-danger {
background-color: inherit;
border: none;
margin-bottom: 0; margin-bottom: 0;
padding: 0;
padding: 2px 0 0 0;
font-weight: 700;
font-size: 16px;
line-height: 24px;
}
}
&.error {
.bottom-wrapper {
background-color: #F7D4D5;
border: 1px solid #D8292F;
border-top: none;
} }
} }
} }
@ -154,5 +169,11 @@ export default {
margin-right: 32px; margin-right: 32px;
} }
} }
&.error {
button.btn-remove i.fa {
color: #D8292F;
}
}
} }
</style> </style>

+ 3
- 3
vue/src/components/Uploader/Uploader.vue View File

@ -407,7 +407,7 @@ export default {
text-align: left; text-align: left;
border: 2px #365EBE dashed; border: 2px #365EBE dashed;
border-radius: 6px; border-radius: 6px;
padding: 18px 32px 18px 18px;
padding: 18px 32px 0 18px;
margin-bottom: 5px; margin-bottom: 5px;
&.dragging { &.dragging {
@ -429,8 +429,8 @@ export default {
.upload-button { .upload-button {
position: absolute; position: absolute;
right: 18px;
top: 18px;
right: 16px;
top: 17px;
} }
.fa-plus-circle { .fa-plus-circle {


Loading…
Cancel
Save