Merge hj's css overhaul and fix conflicts
This commit is contained in:
commit
8835c98529
47 changed files with 1494 additions and 1026 deletions
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="timeline panel panel-default">
|
||||
<div class="panel-heading base02-background base04 base03-border conversation-heading">
|
||||
<div class="panel-heading conversation-heading">
|
||||
{{ $t('timeline.conversation') }}
|
||||
<span v-if="collapsable" style="float:right;">
|
||||
<small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue