Skip to content

Commit

Permalink
Merge pull request #48 from mig-frankfurt/feature/47_Design_makeover
Browse files Browse the repository at this point in the history 
#47 - design makeover
  • Loading branch information
@vabishaa
vabishaa authored Jun 29, 2022
2 parents b7f809a + 5a4ce16 commit f538cdd
Show file tree
Hide file tree
Showing 19 changed files with 843 additions and 317 deletions.
Binary file added assets/images/logo/1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/logo/2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/logo/3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/logo/4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/logo/5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/startpage/dots.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/startpage/symbol-bg1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/startpage/symbol-bg2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 34 additions & 27 deletions components/views/data-element-detail-view.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
justify="center"
>
<v-progress-circular
:size="500"
:size="400"
color="primary"
indeterminate
>
</v-progress-circular>
/>
</v-col>
</v-row>
</v-container>
Expand All @@ -36,30 +35,30 @@
<v-container class="text-center">
<v-row no-gutters>
<v-col v-for="item in elementPath" :key="item.urn">
<v-row no-gutters style="width: 100%;">
<v-col v-if="!item.urn.includes('namespace')" cols="3">
<v-icon>
mdi-slash-forward
</v-icon>
</v-col>
<v-col cols="9">
<v-btn
color="grey lighten-4"
rounded
:disabled="!activatePathNavigation"
@click="showDetailViewDialog(item.urn)"
>
<div
v-if="item.urn === urn"
>
{{ item.designation }}
</div>
<a v-if="item.urn !== urn">
{{ item.designation }}
</a>
</v-btn>
</v-col>
</v-row>
<v-icon v-if="!item.urn.includes('namespace')">
mdi-slash-forward
</v-icon>
<v-btn
width="130"
class="designationButton"
color="grey lighten-4"
rounded
:disabled="!activatePathNavigation"
@click="showDetailViewDialog(item.urn)"
>
<div
v-if="item.urn === urn"
style="text-align: center; width: 100%; white-space: normal;"
>
{{ item.designation }}
</div>
<a
v-if="item.urn !== urn"
style="text-align: center; width: 100%; white-space: normal;"
>
{{ item.designation }}
</a>
</v-btn>
</v-col>
</v-row>
</v-container>
Expand Down Expand Up @@ -320,4 +319,12 @@ export default {
.detailViewCard {
margin-bottom: 30px;
}
.designationButton {
min-width: 150px;
max-width: 150px;
width: 150px;
overflow: hidden;
text-overflow: fade;
}
</style>
55 changes: 34 additions & 21 deletions components/views/groups-records-detail-view.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
justify="center"
>
<v-progress-circular
:size="500"
:size="400"
color="primary"
indeterminate
>
Expand Down Expand Up @@ -37,26 +37,30 @@
<v-container class="text-center">
<v-row no-gutters>
<v-col v-for="item in elementPath" :key="item.urn">
<v-row no-gutters style="width: 100%;">
<v-col v-if="!item.urn.includes('namespace')" cols="3">
<v-icon>
mdi-slash-forward
</v-icon>
</v-col>
<v-col cols="9">
<v-btn
color="grey lighten-4"
rounded
:disabled="!activatePathNavigation"
@click="showDetailViewDialog(item.urn)"
>
<div v-if="item.urn === urn">
{{ item.designation }}
</div>
<a v-if="item.urn !== urn">{{ item.designation }}</a>
</v-btn>
</v-col>
</v-row>
<v-icon v-if="!item.urn.includes('namespace')">
mdi-slash-forward
</v-icon>
<v-btn
width="130"
class="designationButton"
color="grey lighten-4"
rounded
:disabled="!activatePathNavigation"
@click="showDetailViewDialog(item.urn)"
>
<div
v-if="item.urn === urn"
style="text-align: center; width: 100%; white-space: normal;"
>
{{ item.designation }}
</div>
<a
v-if="item.urn !== urn"
style="text-align: center; width: 100%; white-space: normal;"
>
{{ item.designation }}
</a>
</v-btn>
</v-col>
</v-row>
</v-container>
Expand Down Expand Up @@ -297,4 +301,13 @@ export default {
.detailViewCard {
margin-bottom: 30px;
}
.designationButton {
min-width: 50px;
width: 40px;
display: inline-block;
overflow-wrap: break-word;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
20 changes: 18 additions & 2 deletions components/views/namespace-detail-view.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
justify="center"
>
<v-progress-circular
:size="500"
:size="400"
color="primary"
indeterminate
>
Expand All @@ -31,10 +31,16 @@
<!-- Namespace Toolbar TODO: Check of this could be outsourced ...-->
<v-toolbar>
<v-btn
width="140"
class="designationButton"
color="grey lighten-4"
rounded
>
{{ namespace.definitions[0].designation }}
<div
style="text-align: center; width: 100%; white-space: normal;"
>
{{ namespace.definitions[0].designation }}
</div>
</v-btn>
<v-spacer />
<v-btn
Expand Down Expand Up @@ -184,3 +190,13 @@ export default {
}
}
</script>
<style>
.designationButton {
min-width: 50px;
width: 40px;
display: inline-block;
overflow-wrap: break-word;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
19 changes: 17 additions & 2 deletions components/views/permitted-value-detail-view.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
color="grey lighten-4"
flat
>
<!-- Namespace Toolbar TODO: Check of this could be outsourced ...-->
<v-toolbar>
<v-toolbar-title>{{ $t('global.properties') }} {{ $t('global.of') }} <b>{{ urn }}</b></v-toolbar-title>
<v-btn
class="designationButton"
color="grey lighten-4"
rounded
>
{{ permittedValue.definitions[0].designation }}
</v-btn>
<v-spacer />
<v-btn
v-if="editable"
Expand Down Expand Up @@ -124,3 +129,13 @@ export default {
}
}
</script>
<style>
.designationButton {
min-width: 50px;
width: 40px;
display: inline-block;
overflow-wrap: break-word;
overflow: hidden;
text-overflow: ellipsis;
}
</style>
Loading

0 comments on commit f538cdd

Please sign in to comment.