IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2332-mark-contribution-as-rejected

Browse Source
This commit is contained in:
Hannes Heine 2023-01-19 12:09:55 +01:00 committed by GitHub
commit 0bf61e1b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/App.vue
View File

@ -30,7 +30,7 @@ export default {
font-family: 'WorkSans', sans-serif !important; font-family: 'WorkSans', sans-serif !important;
} }
.appContent { .appContent {
min-width: 360px; min-width: 330px;
max-width: 1320px; max-width: 1320px;
margin-right: auto; margin-right: auto;
margin-left: auto; margin-left: auto;

12
frontend/src/components/Auth/AuthNavbar.vue
View File

@ -53,6 +53,7 @@ export default {
.auth-header { .auth-header {
font-family: 'Open Sans', sans-serif !important; font-family: 'Open Sans', sans-serif !important;
height: 150px;
} }
.sheet-img { .sheet-img {
@ -61,6 +62,17 @@ export default {
max-width: 64%; max-width: 64%;
} }
@media screen and (max-width: 1024px) {
.auth-header {
height: 100px;
}
}
@media screen and (max-width: 768px) {
.auth-header {
height: 70px;
}
}
@media screen and (max-width: 450px) { @media screen and (max-width: 450px) {
.sheet-img { .sheet-img {
top: -15px; top: -15px;

2
frontend/src/components/Contributions/ContributionListItem.vue
View File

@ -26,7 +26,7 @@
{{ $t('contribution.alert.answerQuestion') }} {{ $t('contribution.alert.answerQuestion') }}
</div> </div>
</b-col> </b-col>
<b-col cols="12" lg="3" offset="3" offset-md="0" offset-lg="0"> <b-col cols="9" lg="3" offset="3" offset-md="0" offset-lg="0">
<div class="small"> <div class="small">
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }} {{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
</div> </div>

2
frontend/src/components/Menu/Navbar.vue
View File

@ -30,7 +30,7 @@
<div> <div>
<div data-test="navbar-item-username">{{ username.username }}</div> <div data-test="navbar-item-username">{{ username.username }}</div>
<div class="text-right" data-test="navbar-item-email"> <div data-test="navbar-item-email">
{{ $store.state.email }} {{ $store.state.email }}
</div> </div>
</div> </div>

2
frontend/src/layouts/DashboardLayout.vue
View File

@ -3,7 +3,7 @@
<div v-if="skeleton"> <div v-if="skeleton">
<skeleton-overview /> <skeleton-overview />
</div> </div>
<div v-else class="mx--3 mx-lg-0"> <div v-else class="mx-lg-0">
<!-- navbar --> <!-- navbar -->
<b-row> <b-row>
<b-col> <b-col>