Skip to content

Commit

Permalink
Merge pull request #531 from Quetzacoalt91/update-features-icons
Browse files Browse the repository at this point in the history
Update features icons
  • Loading branch information
Quetzacoalt91 authored Feb 1, 2024
2 parents 13a587c + 2ad5717 commit 962195c
Show file tree
Hide file tree
Showing 19 changed files with 75 additions and 59 deletions.
Binary file removed _dev/src/assets/ig_shopping.png
Binary file not shown.
6 changes: 6 additions & 0 deletions _dev/src/assets/ig_shopping.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _dev/src/assets/ig_shopping_disabled.png
Binary file not shown.
Binary file removed _dev/src/assets/messenger_chat.png
Binary file not shown.
6 changes: 6 additions & 0 deletions _dev/src/assets/messenger_chat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _dev/src/assets/messenger_chat_disabled.png
Binary file not shown.
Binary file removed _dev/src/assets/page_cta.png
Binary file not shown.
9 changes: 9 additions & 0 deletions _dev/src/assets/page_cta.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _dev/src/assets/page_cta_disabled.png
Binary file not shown.
Binary file removed _dev/src/assets/page_shop.png
Binary file not shown.
12 changes: 12 additions & 0 deletions _dev/src/assets/page_shop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed _dev/src/assets/page_shop_disabled.png
Binary file not shown.
4 changes: 4 additions & 0 deletions _dev/src/assets/scss/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,8 @@ $custom-control-indicator-focus-border-color: $primary-600;
$font-family-sans-serif: "IBM Plex Sans","Open Sans",Helvetica,Arial,sans-serif;
$headings-font-family: $font-family-sans-serif;

$h1-font-size: 2rem;
$h2-font-size: 1.5rem;
$h3-font-size: 1.125rem;

$ps-modal-padding: 1.5rem;
1 change: 1 addition & 0 deletions _dev/src/assets/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
@import './components/categorymatching';
@import './components/categorymatchingdropdown';
@import './components/faq';
@import './components/features';
@import './components/forms';
@import './components/modal';
@import './components/nav';
Expand Down
23 changes: 23 additions & 0 deletions _dev/src/assets/scss/components/_features.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.ps_fb_featurecard {
list-style: none;
padding-bottom: 15px;

.logo {
max-height: 80px;
max-width: 80px;

&-disabled {
-webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */
filter: grayscale(100%);
}

&-sm {
max-height: 40px;
max-width: 40px;
}
}

.description {
display: table-cell;
}
}
24 changes: 3 additions & 21 deletions _dev/src/components/features/available-feature.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<li>
<li class="ps_fb_featurecard">
<b-card no-body>
<b-card-body
class="p-3"
Expand All @@ -9,7 +9,6 @@
class="mr-2 align-self-center logo d-none d-md-block"
:src="imageUrl"
:alt="$t(`integrate.features.${name}.name`)"
width="80"
>
<div class="description align-self-top flex-grow-1 pl-3 pr-2">
<h3>
Expand Down Expand Up @@ -39,7 +38,7 @@
import {defineComponent} from 'vue';
export default defineComponent({
name: 'DisabledFeature',
name: 'AvailableFeature',
mixins: [],
props: {
name: {
Expand All @@ -59,7 +58,7 @@ export default defineComponent({
},
computed: {
imageUrl(): string {
return new URL(`/src/assets/${this.name}.png`, import.meta.url).href;
return new URL(`/src/assets/${this.name}.svg`, import.meta.url).href;
},
},
methods: {
Expand Down Expand Up @@ -91,20 +90,3 @@ export default defineComponent({
},
});
</script>

<style lang="scss" scoped>
.logo {
float: left;
display: block;
width: 80px;
height: 80px;
}
.description {
display: table-cell;
}
.flex-grow-1 {
flex-grow:1
}
</style>
14 changes: 7 additions & 7 deletions _dev/src/components/features/enabled-feature.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<template>
<li :class="switchActivated ? null : 'disabled'">
<li
class="ps_fb_featurecard"
:class="switchActivated ? null : 'disabled'"
>
<b-card no-body>
<b-card-body
class="p-3"
Expand All @@ -8,9 +11,8 @@
<div class="description align-self-center flex-grow-1 pl-3 pr-2">
<span class="h1">
<img
class="mr-1"
class="mr-1 logo-sm"
:src="imageUrl"
width="40"
>
{{ $t(`integrate.features.${name}.name`) }}
</span>
Expand Down Expand Up @@ -148,7 +150,7 @@ export default defineComponent({
return this.$t('configuration.app.activated');
},
imageUrl(): string {
return new URL(`/src/assets/${this.name}.png`, import.meta.url).href;
return new URL(`/src/assets/${this.name}.svg`, import.meta.url).href;
},
},
methods: {
Expand Down Expand Up @@ -236,9 +238,7 @@ export default defineComponent({
border: none !important;
border-radius: 3px;
}
.flex-grow-1 {
flex-grow:1
}
.switch-input {
&.disabled {
background: #eee !important;
Expand Down
11 changes: 1 addition & 10 deletions _dev/src/components/features/feature-list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,10 @@
</ul>
</template>

<script>
<script lang="ts">
import {defineComponent} from 'vue';
export default defineComponent({
name: 'FeatureList',
});
</script>

<style lang="scss" scoped>
ul {
li {
list-style: none;
padding-bottom: 15px;
}
}
</style>
24 changes: 3 additions & 21 deletions _dev/src/components/features/unavailable-feature.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<template>
<li>
<li class="ps_fb_featurecard">
<b-card no-body>
<b-card-body
class="p-3"
>
<div class="d-flex">
<img
class="mr-2 align-self-center logo d-none d-md-block"
class="mr-2 align-self-center logo logo-disabled d-none d-md-block"
:src="imageUrl"
width="80"
>
<div class="description align-self-top flex-grow-1 pl-3 pr-2">
<h3>
Expand Down Expand Up @@ -42,7 +41,7 @@ export default defineComponent({
},
computed: {
imageUrl(): string {
return new URL(`/src/assets/${this.name}_disabled.png`, import.meta.url).href;
return new URL(`/src/assets/${this.name}.svg`, import.meta.url).href;
},
},
props: {
Expand All @@ -54,20 +53,3 @@ export default defineComponent({
},
});
</script>

<style lang="scss" scoped>
.logo {
float: left;
display: block;
height: 80px;
width: 80px;
}
.description {
display: table-cell;
}
.flex-grow-1 {
flex-grow:1
}
</style>

0 comments on commit 962195c

Please sign in to comment.