Skip to content
Snippets Groups Projects
Commit e786f72c authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issue/13534' into 'develop'

parents 7fe24dbc 77a20dc0
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
> >
<div <div
v-if="user_permissions[project.slug].can_view_project" v-if="user_permissions[project.slug].can_view_project"
class="item-content-wrapper"
> >
<div class="ui tiny image"> <div class="ui tiny image">
<img <img
...@@ -207,13 +208,17 @@ export default { ...@@ -207,13 +208,17 @@ export default {
.item { .item {
div { .item-content-wrapper {
width: 100%; width: 100%;
display: flex;
align-items: flex-start;
.content { .middle.aligned.content {
width: 100%;
.header { .header {
font-size: 1.1em; font-size: 1.28571429em;
font-weight: 600; font-weight: 600;
color: rgb(31, 31, 31)
} }
} }
} }
......
...@@ -452,7 +452,8 @@ export default { ...@@ -452,7 +452,8 @@ export default {
computed: { computed: {
...mapState([ ...mapState([
'configuration', 'configuration',
'isOnline' 'isOnline',
'user_permissions'
]), ]),
...mapState('feature-type', [ ...mapState('feature-type', [
'feature_types', 'feature_types',
......
...@@ -229,6 +229,10 @@ export default { ...@@ -229,6 +229,10 @@ export default {
type: Boolean, type: Boolean,
default: true default: true
}, },
featuresCount: {
type: Number,
default: 0
},
pagination: { pagination: {
type: Object, type: Object,
default: () => { default: () => {
...@@ -241,7 +245,6 @@ export default { ...@@ -241,7 +245,6 @@ export default {
data() { data() {
return { return {
featuresCount: 0,
form: { form: {
type: { type: {
selected: '', selected: '',
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
> >
<div <div
v-if="currentFeature" v-if="currentFeature"
class="ui grid" class="ui grid stackable"
> >
<div class="row"> <div class="row">
<div class="sixteen wide column"> <div class="sixteen wide column">
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<div class="column"> <div class="column">
<FeaturesListAndMapFilters <FeaturesListAndMapFilters
:show-map="showMap" :show-map="showMap"
:features-count="featuresCount"
:pagination="pagination" :pagination="pagination"
@set-filter="setFilters" @set-filter="setFilters"
@reset-pagination="resetPagination" @reset-pagination="resetPagination"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment