From 4c03380fdb24163b5493fb1c010e4a6c53bdf7d2 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Tue, 7 May 2019 01:53:17 +0200
Subject: [PATCH] Re-add markdown, useful for export and editing, remove dirty
CSS fix
---
pica-etherpad/Dockerfile | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/pica-etherpad/Dockerfile b/pica-etherpad/Dockerfile
index 4244635e..c37ddc6d 100644
--- a/pica-etherpad/Dockerfile
+++ b/pica-etherpad/Dockerfile
@@ -45,6 +45,7 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
ep_font_family \
ep_headings2 \
ep_hide_referrer \
+ ep_markdown \
ep_pad_activity_nofication_in_title \
ep_pads_stats \
ep_page_view \
@@ -58,12 +59,6 @@ RUN curl -SL https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.
git --git-dir=src/templates/picasoft-etherpad-landing-page/.git checkout ${ETHERPAD_LANDING_PAGE_VERSION} && \
cp src/templates/picasoft-etherpad-landing-page/index.html src/templates/index.html && \
cp src/templates/picasoft-etherpad-landing-page/static/* src/static/ -r && \
- # Enlarge writing zone
- sed -i "s|calc(100% - 110px)|100%|g" src/static/skins/colibris/src/layout.css && \
- # Less margin for comment zone
- sed -i 's|calc(100% - 150px)|calc(100% - 10px)|g' src/static/skins/colibris/src/layout.css && \
- # Enlarge lines
- echo '#innerdocbody > div { margin-right: 0 !important; }' >> src/static/skins/colibris/src/pad-editor.css && \
# Change default hard-coded pad title
sed -i 's|Untitled Pad|Nouveau pad|g' node_modules/ep_set_title_on_pad/templates/title.ejs && \
sed -i 's|Untitled Pad|Nouveau pad|g' node_modules/ep_set_title_on_pad/static/tests/frontend/specs/atest.js
--
GitLab