Skip to content

Commit

Permalink
Edit components nayarahilton#1
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasjs committed Nov 27, 2017
1 parent c2bdfc1 commit e5cfad4
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 44 deletions.
10 changes: 3 additions & 7 deletions src/components/MainTextarea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
:name="name"
:id="id"
:placeholder="placeholder"
:required="required"
:class="textareaStyle"
class="textarea"
rows="4"
rows="4"
/>
</template>

Expand All @@ -23,9 +22,6 @@ export default {
required: true,
type: String,
},
required: {
type: Boolean,
},
design: {
type: String,
},
Expand All @@ -48,7 +44,7 @@ export default {
background transparent
font-size 12pt
margin-bottom 20px
padding 15px
padding 15px
width 100%
&:focus
Expand All @@ -59,4 +55,4 @@ export default {
border 1px solid $gray
border-radius 15px
color $dark-gray
</style>
</style>
18 changes: 14 additions & 4 deletions src/components/PhotoUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
accept="image/*"
class="input-file"
capture="camera"

/>
<label for="photo-upload-button">{{ labelText }}</label>
</div>
Expand All @@ -17,7 +18,10 @@
v-if="imageData.length > 0"
>
<img
ref="input"
:src="imageData"
v-bind:value="imageData"
@change="updateValue($event.target.imageData)"
class="image-preview__img"
>
</div>
Expand All @@ -26,7 +30,7 @@

<script>
export default {
data: function returnImageData() {
data() {
return {
imageData: '',
};
Expand All @@ -36,6 +40,9 @@ export default {
required: true,
type: String,
},
src: {
type: String,
},
},
methods: {
previewThumbnail: function getPreview(event) {
Expand All @@ -48,6 +55,9 @@ export default {
reader.readAsDataURL(input.files[0]);
}
},
updateValue(imageData) {
this.$emit('input', imageData);
},
},
};
</script>
Expand All @@ -74,7 +84,7 @@ export default {
z-index -1
&:focus + label
border-color $dark-blue
border-color $dark-blue
& + label
background transparent
Expand All @@ -94,7 +104,7 @@ export default {
border-color $dark-blue
cursor pointer
.image-preview
.image-preview
border-radius 50%
height 150px
left 0
Expand All @@ -112,4 +122,4 @@ export default {
object-fit cover
object-position center
width 150px
</style>
</style>
4 changes: 2 additions & 2 deletions src/components/ProfileResume.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export default {
border-radius 50%
overflow hidden
position relative
border 2px solid $blue
box-shadow 2px 1px 5px 0px rgba(0, 132, 250, 0.6)
border 2px solid $pink
box-shadow 2px 1px 5px 0px alpha($dark-gray, 0.6)
img
height 50px
Expand Down
2 changes: 1 addition & 1 deletion src/components/QuestionBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default {
.question
&-box
border 2px solid $pink
border 1px solid $pink
border-radius 10px
box-sizing border-box
padding 15px 0
Expand Down
2 changes: 1 addition & 1 deletion src/components/SliderItems.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
.slider
padding 20px 0
box-sizing border-box
background #eee
background #fff
&_list
nowrap-list()
Expand Down
36 changes: 7 additions & 29 deletions src/components/TabsBottom.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,52 +22,30 @@
export default {
data() {
return {
linksTop: [
{
class: 'minha-area',
url: '/',
name: 'minha área',
},
{
class: 'todas-areas',
url: '#',
name: 'todas as áreas',
},
{
class: 'hashtags',
url: '#',
name: '#hashtags',
},
],
linksBottom: [
links: [
{
class: 'home',
url: '/',
url: '/home',
name: 'home',
},
{
class: 'buscar',
url: '#',
url: '/buscar',
name: 'buscar',
},
{
class: 'postar',
url: '#',
url: '/postar',
name: 'postar',
},
{
class: 'perfil',
url: '#',
name: 'perfil',
class: 'responder',
url: '/perguntas',
name: 'perguntas',
},
],
};
},
props: {
links: {
type: String,
},
},
};
</script>

Expand Down

0 comments on commit e5cfad4

Please sign in to comment.