From b50a9a250ce40f5fcc81c1bd2d872353c2520c28 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 1 Mar 2019 01:00:03 +0100 Subject: [PATCH] fix description style --- app/controller/bot.js | 2 -- app/controller/export.js | 2 +- client/src/assets/main.css | 7 +++++++ client/src/components/EventDetail.vue | 3 ++- client/src/main.js | 2 ++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controller/bot.js b/app/controller/bot.js index 59cc8e04..eaed5dac 100644 --- a/app/controller/bot.js +++ b/app/controller/bot.js @@ -1,7 +1,5 @@ -const jwt = require('jsonwebtoken') const { User, Event, Comment, Tag } = require('../model') const config = require('../config') -const mail = require('../mail') const Mastodon = require('mastodon-api') const Sequelize = require('sequelize') const Op = Sequelize.Op diff --git a/app/controller/export.js b/app/controller/export.js index 56055673..effde999 100644 --- a/app/controller/export.js +++ b/app/controller/export.js @@ -30,7 +30,7 @@ const exportController = { }) switch (type) { case 'feed': - return exportController.feed(res, events) + return exportController.feed(res, events.slice(0, 20)) case 'ics': return exportController.ics(res, events) } diff --git a/client/src/assets/main.css b/client/src/assets/main.css index ea7e1da3..fead2671 100644 --- a/client/src/assets/main.css +++ b/client/src/assets/main.css @@ -3,3 +3,10 @@ overflow: hidden; } */ +pre { + display: inline-block; + color: unset; + white-space: pre-line; + font-family: unset; + font-size: 1em; +} \ No newline at end of file diff --git a/client/src/components/EventDetail.vue b/client/src/components/EventDetail.vue index 8c931369..87182766 100644 --- a/client/src/components/EventDetail.vue +++ b/client/src/components/EventDetail.vue @@ -12,7 +12,8 @@ v-icon(name='map-marker-alt') span {{event.place.name}} - {{event.place.address}} br - b-card-footer(v-if='event.description || event.tags') {{event.description}} + b-card-body(v-if='event.description || event.tags') + pre {{event.description}} br b-badge(:style='{backgroundColor: tag.color}' v-for='tag in event.tags') {{tag.tag}} b-navbar(v-if='mine' type="dark" variant="dark" toggleable='lg') diff --git a/client/src/main.js b/client/src/main.js index 9abec843..91ee5ddf 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -23,6 +23,8 @@ import App from './App.vue' import router from './router' import store from './store' +import './assets/main.css' + import itLocale from '@/locale/it' import enLocale from '@/locale/en'