wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 4797-worker-notification-selector

This commit is contained in:
Alex Moreno 2023-05-15 09:37:49 +00:00
parent ecb83f24dc 502f550a41
commit 725e8db7d8
7 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@ -12,3 +12,6 @@ services:
placement:
constraints:
- node.role == worker
resources:
limits:
memory: 1G

14
src/components/LeftMenu.vue
View File

@ -127,7 +127,7 @@ async function togglePinned(item, event) {
<QBtn
v-if="item.isPinned === true"
@click="togglePinned(item, $event)"
icon="vn:pin_off"
icon="remove_circle"
size="xs"
flat
round
@ -139,7 +139,7 @@ async function togglePinned(item, event) {
<QBtn
v-if="item.isPinned === false"
@click="togglePinned(item, $event)"
icon="vn:pin"
icon="push_pin"
size="xs"
flat
round
@ -163,7 +163,7 @@ async function togglePinned(item, event) {
<QBtn
v-if="item.isPinned === true"
@click="togglePinned(item, $event)"
icon="vn:pin_off"
icon="remove_circle"
size="xs"
flat
round
@ -175,7 +175,7 @@ async function togglePinned(item, event) {
<QBtn
v-if="item.isPinned === false"
@click="togglePinned(item, $event)"
icon="vn:pin"
icon="push_pin"
size="xs"
flat
round
@ -200,13 +200,11 @@ async function togglePinned(item, event) {
</template>
<style>
.pinned .icon-pin,
.pinned .icon-pin_off {
.pinned .q-btn {
visibility: hidden;
}
.pinned:hover .icon-pin,
.pinned:hover .icon-pin_off {
.pinned:hover .q-btn {
visibility: visible;
}
</style>

BIN
src/css/fonts/icomoon.eot
View File

Binary file not shown.

6
src/css/fonts/icomoon.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 173 KiB

BIN
src/css/fonts/icomoon.ttf
View File

Binary file not shown.

BIN
src/css/fonts/icomoon.woff
View File

Binary file not shown.

23
src/css/icons.scss
View File

@ -26,12 +26,6 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-pin:before {
content: '\e950';
}
.icon-pin_off:before {
content: '\e95b';
}
.icon-frozen:before {
content: '\e900';
}
@ -56,7 +50,7 @@
.icon-greenery:before {
content: '\e907';
}
.icon-planta:before {
.icon-plant:before {
content: '\e908';
}
.icon-handmade:before {
@ -401,3 +395,18 @@
.icon-trolley:before {
content: '\e95c';
}
.icon-agency-term:before {
content: '\e950';
}
.icon-client-unpaid:before {
content: '\e95b';
}
.icon-trolley:before {
content: '\e95c';
}
.icon-grafana:before {
content: '\e965';
}
.icon-troncales:before {
content: '\e967';
}