ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sushidave-updated-main-readme

Browse Source
This commit is contained in:
Wolfgang Huß 2023-03-06 18:50:34 +01:00 committed by GitHub
commit b959a555d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/assets/_new/styles/tokens.scss
View File

@ -375,4 +375,21 @@ $color-footer-link: $color-primary;
* @tokens Locale Menu Color * @tokens Locale Menu Color
*/ */
$color-locale-menu: $text-color-soft; $color-locale-menu: $text-color-soft;
/**
* @tokens Donation Bar Color
*/
$color-donation-bar: $color-primary;
$color-donation-bar-light: $color-primary-light;
/**
* @tokens Toast Color
*/
$color-toast-red: $color-danger;
$color-toast-orange: $color-warning;
$color-toast-yellow: $color-yellow;
$color-toast-blue: $color-secondary;
$color-toast-green: $color-success;

20
webapp/assets/styles/imports/_toast.scss
View File

@ -11,22 +11,22 @@
} }
.iziToast.iziToast-color-red { .iziToast.iziToast-color-red {
background: $color-danger !important; background: $color-toast-red !important;
border-color: $color-danger !important; border-color: $color-toast-red !important;
} }
.iziToast.iziToast-color-orange { .iziToast.iziToast-color-orange {
background: $color-warning !important; background: $color-toast-orange !important;
border-color: $color-warning !important; border-color: $color-toast-orange !important;
} }
.iziToast.iziToast-color-yellow { .iziToast.iziToast-color-yellow {
background: $color-yellow !important; background: $color-toast-yellow !important;
border-color: $color-yellow !important; border-color: $color-toast-yellow !important;
} }
.iziToast.iziToast-color-blue { .iziToast.iziToast-color-blue {
background: $color-secondary !important; background: $color-toast-blue !important;
border-color: $color-secondary !important; border-color: $color-toast-blue !important;
} }
.iziToast.iziToast-color-green { .iziToast.iziToast-color-green {
background: $color-success !important; background: $color-toast-green !important;
border-color: $color-success !important; border-color: $color-toast-green !important;
} }

8
webapp/components/PageFooter/PageFooter.vue
View File

@ -5,7 +5,7 @@
<page-params-link :pageParams="pageParams"> <page-params-link :pageParams="pageParams">
{{ $t(pageParams.internalPage.footerIdent) }} {{ $t(pageParams.internalPage.footerIdent) }}
</page-params-link> </page-params-link>
<span class="division-line">-</span> <span class="division-space">&nbsp;</span>
</span> </span>
<!-- version --> <!-- version -->
<a <a
@ -46,8 +46,8 @@ export default {
.ds-footer a { .ds-footer a {
color: $color-footer-link; color: $color-footer-link;
} }
.division-line { .division-space {
margin-left: 0.2rem; margin-left: 0.4rem;
margin-right: 0.2rem; margin-right: 0.4rem;
} }
</style> </style>

12
webapp/components/ProgressBar/ProgressBar.vue
View File

@ -79,17 +79,17 @@ export default {
border-radius: $border-radius-base; border-radius: $border-radius-base;
&.color-uni { &.color-uni {
background: $color-primary-light; background: $color-donation-bar;
} }
&.color-repeating-linear-gradient { &.color-repeating-linear-gradient {
background: repeating-linear-gradient( background: repeating-linear-gradient(
120deg, 120deg,
$color-primary 0px, $color-donation-bar 0px,
$color-primary 30px, $color-donation-bar 30px,
$color-primary-light 50px, $color-donation-bar-light 50px,
$color-primary-light 75px, $color-donation-bar-light 75px,
$color-primary 95px $color-donation-bar 95px
); );
} }
} }

2
webapp/pages/group/_id/_slug.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div v-if="isGroupVisible"> <div class="group-profile" v-if="isGroupVisible">
<ds-space /> <ds-space />
<ds-flex v-if="group" :width="{ base: '100%' }" gutter="base"> <ds-flex v-if="group" :width="{ base: '100%' }" gutter="base">
<ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }"> <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">