mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component
This commit is contained in:
commit
acda06cc6e
@ -6,7 +6,7 @@
|
||||
>
|
||||
<ds-text>
|
||||
<hc-image
|
||||
:image-props="{ src: `/img/empty/${this.icon}.svg` }"
|
||||
:image-props="{ src: imgSrc }"
|
||||
width="80"
|
||||
class="hc-empty-icon"
|
||||
style="margin-bottom: 5px"
|
||||
@ -56,6 +56,11 @@ export default {
|
||||
type: [String, Object],
|
||||
default: 'x-large'
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
imgSrc() {
|
||||
return `/img/empty/${this.icon}.svg`
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils'
|
||||
import RelativeDateTime from './index'
|
||||
import RelativeDateTime from './'
|
||||
|
||||
const localVue = createLocalVue()
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils'
|
||||
import Styleguide from '@human-connection/styleguide'
|
||||
import Tag from './index'
|
||||
import Tag from './'
|
||||
|
||||
const localVue = createLocalVue()
|
||||
localVue.use(Styleguide)
|
||||
@ -30,11 +30,11 @@
|
||||
margin-bottom="xxx-small"
|
||||
centered
|
||||
>
|
||||
<hc-image
|
||||
<img
|
||||
class="login-image"
|
||||
alt="Human Connection"
|
||||
:image-props="{ src: '/img/sign-up/humanconnection.svg' }"
|
||||
/>
|
||||
src="/img/sign-up/humanconnection.svg"
|
||||
>
|
||||
</ds-space>
|
||||
</ds-flex-item>
|
||||
<ds-flex-item
|
||||
@ -96,14 +96,12 @@
|
||||
|
||||
<script>
|
||||
import LocaleSwitch from '~/components/LocaleSwitch'
|
||||
import HcImage from '~/components/Image'
|
||||
|
||||
import gql from 'graphql-tag'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
LocaleSwitch,
|
||||
HcImage
|
||||
LocaleSwitch
|
||||
},
|
||||
layout: 'blank',
|
||||
data() {
|
||||
|
||||
@ -10,7 +10,10 @@
|
||||
v-for="link in socialMediaLinks"
|
||||
:key="link.id"
|
||||
>
|
||||
<a :href="link.url">
|
||||
<a
|
||||
:href="link.url"
|
||||
target="_blank"
|
||||
>
|
||||
<hc-image
|
||||
:image-props="{ src: link.favicon }"
|
||||
alt="Social Media link"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user